@theia/scm 1.45.0 → 1.46.0-next.72

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

@@ -1,838 +1,838 @@
-// *****************************************************************************
-// Copyright (C) 2020 Arm 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 no-null/no-null, @typescript-eslint/no-explicit-any */
-
-import * as React from '@theia/core/shared/react';
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import URI from '@theia/core/lib/common/uri';
-import { isOSX } from '@theia/core/lib/common/os';
-import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
-import { TreeWidget, TreeNode, SelectableTreeNode, TreeModel, TreeProps, NodeProps, TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
-import { ScmTreeModel, ScmFileChangeRootNode, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model';
-import { MenuCommandExecutor, MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
-import { ScmResource } from './scm-provider';
-import { ContextMenuRenderer, LabelProvider, CorePreferences, DiffUris, ACTION_ITEM } from '@theia/core/lib/browser';
-import { ScmContextKeyService } from './scm-context-key-service';
-import { EditorWidget, EditorManager, DiffNavigatorProvider } from '@theia/editor/lib/browser';
-import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
-import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
-import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorations-service';
-import { FileStat } from '@theia/filesystem/lib/common/files';
-import { ThemeService } from '@theia/core/lib/browser/theming';
-
-@injectable()
-export class ScmTreeWidget extends TreeWidget {
-
-    static ID = 'scm-resource-widget';
-
-    static RESOURCE_GROUP_CONTEXT_MENU = ['RESOURCE_GROUP_CONTEXT_MENU'];
-    static RESOURCE_GROUP_INLINE_MENU = ['RESOURCE_GROUP_CONTEXT_MENU', 'inline'];
-
-    static RESOURCE_FOLDER_CONTEXT_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU'];
-    static RESOURCE_FOLDER_INLINE_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU', 'inline'];
-
-    static RESOURCE_CONTEXT_MENU = ['RESOURCE_CONTEXT_MENU'];
-    static RESOURCE_INLINE_MENU = ['RESOURCE_CONTEXT_MENU', 'inline'];
-
-    @inject(MenuCommandExecutor) protected readonly menuCommandExecutor: MenuCommandExecutor;
-    @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
-    @inject(ScmContextKeyService) protected readonly contextKeys: ScmContextKeyService;
-    @inject(EditorManager) protected readonly editorManager: EditorManager;
-    @inject(DiffNavigatorProvider) protected readonly diffNavigatorProvider: DiffNavigatorProvider;
-    @inject(IconThemeService) protected readonly iconThemeService: IconThemeService;
-    @inject(DecorationsService) protected readonly decorationsService: DecorationsService;
-    @inject(ColorRegistry) protected readonly colors: ColorRegistry;
-    @inject(ThemeService) protected readonly themeService: ThemeService;
-
-    // TODO: Make TreeWidget generic to better type those fields.
-    override readonly model: ScmTreeModel;
-
-    constructor(
-        @inject(TreeProps) props: TreeProps,
-        @inject(TreeModel) treeModel: ScmTreeModel,
-        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer,
-    ) {
-        super(props, treeModel, contextMenuRenderer);
-        this.id = ScmTreeWidget.ID;
-        this.addClass('groups-outer-container');
-    }
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.toDispose.push(this.themeService.onDidColorThemeChange(() => this.update()));
-    }
-
-    set viewMode(id: 'tree' | 'list') {
-        // Close the search box because the structure of the tree will change dramatically
-        // and the search results will be out of date.
-        this.searchBox.hide();
-        this.model.viewMode = id;
-    }
-    get viewMode(): 'tree' | 'list' {
-        return this.model.viewMode;
-    }
-
-    /**
-     * Render the node given the tree node and node properties.
-     * @param node the tree node.
-     * @param props the node properties.
-     */
-    protected override renderNode(node: TreeNode, props: NodeProps): React.ReactNode {
-        if (!TreeNode.isVisible(node)) {
-            return undefined;
-        }
-
-        const attributes = this.createNodeAttributes(node, props);
-        const label = this.labelProvider.getName(node);
-        const searchHighlights = this.searchHighlights?.get(node.id);
-        // The group nodes should not be subject to highlighting.
-        const caption = (searchHighlights && !ScmFileChangeGroupNode.is(node)) ? this.toReactNode(label, searchHighlights) : label;
-
-        if (ScmFileChangeGroupNode.is(node)) {
-            const content = <ScmResourceGroupElement
-                key={`${node.groupId}`}
-                model={this.model}
-                treeNode={node}
-                renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
-                commandExecutor={this.menuCommandExecutor}
-                contextMenuRenderer={this.contextMenuRenderer}
-                menus={this.menus}
-                contextKeys={this.contextKeys}
-                labelProvider={this.labelProvider}
-                corePreferences={this.corePreferences}
-                caption={caption}
-            />;
-
-            return React.createElement('div', attributes, content);
-
-        }
-        if (ScmFileChangeFolderNode.is(node)) {
-            const content = <ScmResourceFolderElement
-                key={String(node.sourceUri)}
-                model={this.model}
-                treeNode={node}
-                sourceUri={node.sourceUri}
-                renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
-                commandExecutor={this.menuCommandExecutor}
-                contextMenuRenderer={this.contextMenuRenderer}
-                menus={this.menus}
-                contextKeys={this.contextKeys}
-                labelProvider={this.labelProvider}
-                corePreferences={this.corePreferences}
-                caption={caption}
-            />;
-
-            return React.createElement('div', attributes, content);
-        }
-        if (ScmFileChangeNode.is(node)) {
-            const parentPath =
-                (node.parent && ScmFileChangeFolderNode.is(node.parent))
-                    ? new URI(node.parent.sourceUri) : new URI(this.model.rootUri);
-
-            const content = <ScmResourceComponent
-                key={node.sourceUri}
-                model={this.model}
-                treeNode={node}
-                contextMenuRenderer={this.contextMenuRenderer}
-                commandExecutor={this.menuCommandExecutor}
-                menus={this.menus}
-                contextKeys={this.contextKeys}
-                labelProvider={this.labelProvider}
-                corePreferences={this.corePreferences}
-                caption={caption}
-                {...{
-                    ...this.props,
-                    parentPath,
-                    sourceUri: node.sourceUri,
-                    decoration: this.decorationsService.getDecoration(new URI(node.sourceUri), true)[0],
-                    colors: this.colors,
-                    isLightTheme: this.isCurrentThemeLight(),
-                    renderExpansionToggle: () => this.renderExpansionToggle(node, props),
-                }}
-            />;
-            return React.createElement('div', attributes, content);
-        }
-        return super.renderNode(node, props);
-    }
-
-    protected override createContainerAttributes(): React.HTMLAttributes<HTMLElement> {
-        if (this.model.canTabToWidget()) {
-            return {
-                ...super.createContainerAttributes(),
-                tabIndex: 0
-            };
-        }
-        return super.createContainerAttributes();
-    }
-
-    /**
-     * The ARROW_LEFT key controls both the movement around the file tree and also
-     * the movement through the change chunks within a file.
-     *
-     * If the selected tree node is a folder then the ARROW_LEFT key behaves exactly
-     * as it does in explorer.  It collapses the tree node if the folder is expanded and
-     * it moves the selection up to the parent folder if the folder is collapsed (no-op if no parent folder, as
-     * group headers are not selectable).  This behavior is the default behavior implemented
-     * in the TreeWidget super class.
-     *
-     * If the selected tree node is a file then the ARROW_LEFT key moves up through the
-     * change chunks within each file.  If the selected chunk is the first chunk in the file
-     * then the file selection is moved to the previous file (no-op if no previous file).
-     *
-     * Note that when cursoring through change chunks, the ARROW_LEFT key cannot be used to
-     * move up through the parent folders of the file tree.  If users want to do this, using
-     * keys only, then they must press ARROW_UP repeatedly until the selected node is the folder
-     * node and then press ARROW_LEFT.
-     */
-    protected override async handleLeft(event: KeyboardEvent): Promise<void> {
-        if (this.model.selectedNodes.length === 1) {
-            const selectedNode = this.model.selectedNodes[0];
-            if (ScmFileChangeNode.is(selectedNode)) {
-                const selectedResource = this.model.getResourceFromNode(selectedNode);
-                if (!selectedResource) {
-                    return super.handleLeft(event);
-                }
-                const widget = await this.openResource(selectedResource);
-
-                if (widget) {
-                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
-                    if (diffNavigator.hasPrevious()) {
-                        diffNavigator.previous();
-                    } else {
-                        const previousNode = this.moveToPreviousFileNode();
-                        if (previousNode) {
-                            const previousResource = this.model.getResourceFromNode(previousNode);
-                            if (previousResource) {
-                                this.openResource(previousResource);
-                            }
-                        }
-                    }
-                    return;
-                }
-            }
-        }
-        return super.handleLeft(event);
-    }
-
-    /**
-     * The ARROW_RIGHT key controls both the movement around the file tree and also
-     * the movement through the change chunks within a file.
-     *
-     * If the selected tree node is a folder then the ARROW_RIGHT key behaves exactly
-     * as it does in explorer.  It expands the tree node if the folder is collapsed and
-     * it moves the selection to the first child node if the folder is expanded.
-     * This behavior is the default behavior implemented
-     * in the TreeWidget super class.
-     *
-     * If the selected tree node is a file then the ARROW_RIGHT key moves down through the
-     * change chunks within each file.  If the selected chunk is the last chunk in the file
-     * then the file selection is moved to the next file (no-op if no next file).
-     */
-    protected override async handleRight(event: KeyboardEvent): Promise<void> {
-        if (this.model.selectedNodes.length === 0) {
-            const firstNode = this.getFirstSelectableNode();
-            // Selects the first visible resource as none are selected.
-            if (!firstNode) {
-                return;
-            }
-            this.model.selectNode(firstNode);
-            return;
-        }
-        if (this.model.selectedNodes.length === 1) {
-            const selectedNode = this.model.selectedNodes[0];
-            if (ScmFileChangeNode.is(selectedNode)) {
-                const selectedResource = this.model.getResourceFromNode(selectedNode);
-                if (!selectedResource) {
-                    return super.handleRight(event);
-                }
-                const widget = await this.openResource(selectedResource);
-
-                if (widget) {
-                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
-                    if (diffNavigator.hasNext()) {
-                        diffNavigator.next();
-                    } else {
-                        const nextNode = this.moveToNextFileNode();
-                        if (nextNode) {
-                            const nextResource = this.model.getResourceFromNode(nextNode);
-                            if (nextResource) {
-                                this.openResource(nextResource);
-                            }
-                        }
-                    }
-                }
-                return;
-            }
-        }
-        return super.handleRight(event);
-    }
-
-    protected override handleEnter(event: KeyboardEvent): void {
-        if (this.model.selectedNodes.length === 1) {
-            const selectedNode = this.model.selectedNodes[0];
-            if (ScmFileChangeNode.is(selectedNode)) {
-                const selectedResource = this.model.getResourceFromNode(selectedNode);
-                if (selectedResource) {
-                    this.openResource(selectedResource);
-                }
-                return;
-            }
-        }
-        super.handleEnter(event);
-    }
-
-    async goToPreviousChange(): Promise<void> {
-        if (this.model.selectedNodes.length === 1) {
-            const selectedNode = this.model.selectedNodes[0];
-            if (ScmFileChangeNode.is(selectedNode)) {
-                if (ScmFileChangeNode.is(selectedNode)) {
-                    const selectedResource = this.model.getResourceFromNode(selectedNode);
-                    if (!selectedResource) {
-                        return;
-                    }
-                    const widget = await this.openResource(selectedResource);
-
-                    if (widget) {
-                        const diffNavigator = this.diffNavigatorProvider(widget.editor);
-                        if (diffNavigator.hasPrevious()) {
-                            diffNavigator.previous();
-                        } else {
-                            const previousNode = this.moveToPreviousFileNode();
-                            if (previousNode) {
-                                const previousResource = this.model.getResourceFromNode(previousNode);
-                                if (previousResource) {
-                                    this.openResource(previousResource);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    async goToNextChange(): Promise<void> {
-        if (this.model.selectedNodes.length === 0) {
-            const firstNode = this.getFirstSelectableNode();
-            // Selects the first visible resource as none are selected.
-            if (!firstNode) {
-                return;
-            }
-            this.model.selectNode(firstNode);
-            return;
-        }
-        if (this.model.selectedNodes.length === 1) {
-            const selectedNode = this.model.selectedNodes[0];
-            if (ScmFileChangeNode.is(selectedNode)) {
-                const selectedResource = this.model.getResourceFromNode(selectedNode);
-                if (!selectedResource) {
-                    return;
-                }
-                const widget = await this.openResource(selectedResource);
-
-                if (widget) {
-                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
-                    if (diffNavigator.hasNext()) {
-                        diffNavigator.next();
-                    } else {
-                        const nextNode = this.moveToNextFileNode();
-                        if (nextNode) {
-                            const nextResource = this.model.getResourceFromNode(nextNode);
-                            if (nextResource) {
-                                this.openResource(nextResource);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    selectNodeByUri(uri: URI): void {
-        for (const group of this.model.groups) {
-            const sourceUri = new URI(uri.path.toString());
-            const id = `${group.id}:${sourceUri.toString()}`;
-            const node = this.model.getNode(id);
-            if (SelectableTreeNode.is(node)) {
-                this.model.selectNode(node);
-                return;
-            }
-        }
-    }
-
-    protected getFirstSelectableNode(): SelectableTreeNode | undefined {
-        if (this.model.root) {
-            const root = this.model.root as ScmFileChangeRootNode;
-            const groupNode = root.children[0];
-            return groupNode.children[0];
-        }
-    }
-
-    protected moveToPreviousFileNode(): ScmFileChangeNode | undefined {
-        let previousNode = this.model.getPrevSelectableNode();
-        while (previousNode) {
-            if (ScmFileChangeNode.is(previousNode)) {
-                this.model.selectNode(previousNode);
-                return previousNode;
-            }
-            previousNode = this.model.getPrevSelectableNode(previousNode);
-        };
-    }
-
-    protected moveToNextFileNode(): ScmFileChangeNode | undefined {
-        let nextNode = this.model.getNextSelectableNode();
-        while (nextNode) {
-            if (ScmFileChangeNode.is(nextNode)) {
-                this.model.selectNode(nextNode);
-                return nextNode;
-            }
-            nextNode = this.model.getNextSelectableNode(nextNode);
-        };
-    }
-
-    protected async openResource(resource: ScmResource): Promise<EditorWidget | undefined> {
-        try {
-            await resource.open();
-        } catch (e) {
-            console.error('Failed to open a SCM resource', e);
-            return undefined;
-        }
-
-        let standaloneEditor: EditorWidget | undefined;
-        const resourcePath = resource.sourceUri.path.toString();
-
-        for (const widget of this.editorManager.all) {
-            const resourceUri = widget.editor.document.uri;
-            const editorResourcePath = new URI(resourceUri).path.toString();
-            if (resourcePath === editorResourcePath) {
-                if (widget.editor.uri.scheme === DiffUris.DIFF_SCHEME) {
-                    // prefer diff editor
-                    return widget;
-                } else {
-                    standaloneEditor = widget;
-                }
-            }
-            if (widget.editor.uri.scheme === DiffUris.DIFF_SCHEME
-                && resourceUri === resource.sourceUri.toString()) {
-                return widget;
-            }
-        }
-        // fallback to standalone editor
-        return standaloneEditor;
-    }
-
-    protected override getPaddingLeft(node: TreeNode, props: NodeProps): number {
-        if (this.viewMode === 'list') {
-            if (props.depth === 1) {
-                return this.props.expansionTogglePadding;
-            }
-        }
-        return super.getPaddingLeft(node, props);
-    }
-
-    protected override getDepthPadding(depth: number): number {
-        return super.getDepthPadding(depth) + 5;
-    }
-
-    protected isCurrentThemeLight(): boolean {
-        const type = this.themeService.getCurrentTheme().type;
-        return type.toLocaleLowerCase().includes('light');
-    }
-
-    protected override needsExpansionTogglePadding(node: TreeNode): boolean {
-        const theme = this.iconThemeService.getDefinition(this.iconThemeService.current);
-        if (theme && (theme.hidesExplorerArrows || (theme.hasFileIcons && !theme.hasFolderIcons))) {
-            return false;
-        }
-        return super.needsExpansionTogglePadding(node);
-    }
-
-}
-
-export namespace ScmTreeWidget {
-    export namespace Styles {
-        export const NO_SELECT = 'no-select';
-    }
-    // This is an 'abstract' base interface for all the element component props.
-    export interface Props {
-        treeNode: TreeNode;
-        model: ScmTreeModel;
-        menus: MenuModelRegistry;
-        contextKeys: ScmContextKeyService;
-        labelProvider: LabelProvider;
-        contextMenuRenderer: ContextMenuRenderer;
-        corePreferences?: CorePreferences;
-        caption: React.ReactNode;
-    }
-}
-
-export abstract class ScmElement<P extends ScmElement.Props = ScmElement.Props> extends React.Component<P, ScmElement.State> {
-
-    constructor(props: P) {
-        super(props);
-        this.state = {
-            hover: false
-        };
-
-        const setState = this.setState.bind(this);
-        this.setState = newState => {
-            if (!this.toDisposeOnUnmount.disposed) {
-                setState(newState);
-            }
-        };
-    }
-
-    protected readonly toDisposeOnUnmount = new DisposableCollection();
-    override componentDidMount(): void {
-        this.toDisposeOnUnmount.push(Disposable.create(() => { /* mark as mounted */ }));
-    }
-    override componentWillUnmount(): void {
-        this.toDisposeOnUnmount.dispose();
-    }
-
-    protected detectHover = (element: HTMLElement | null) => {
-        if (element) {
-            window.requestAnimationFrame(() => {
-                const hover = element.matches(':hover');
-                this.setState({ hover });
-            });
-        }
-    };
-    protected showHover = () => this.setState({ hover: true });
-    protected hideHover = () => this.setState({ hover: false });
-
-    protected renderContextMenu = (event: React.MouseEvent<HTMLElement>) => {
-        event.preventDefault();
-        const { treeNode: node, contextMenuRenderer } = this.props;
-        this.props.model.execInNodeContext(node, () => {
-            contextMenuRenderer.render({
-                menuPath: this.contextMenuPath,
-                anchor: event.nativeEvent,
-                args: this.contextMenuArgs
-            });
-        });
-    };
-
-    protected abstract get contextMenuPath(): MenuPath;
-    protected abstract get contextMenuArgs(): any[];
-
-}
-export namespace ScmElement {
-    export interface Props extends ScmTreeWidget.Props {
-        renderExpansionToggle: () => React.ReactNode;
-        commandExecutor: MenuCommandExecutor;
-    }
-    export interface State {
-        hover: boolean
-    }
-}
-
-export class ScmResourceComponent extends ScmElement<ScmResourceComponent.Props> {
-
-    override render(): JSX.Element | undefined {
-        const { hover } = this.state;
-        const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider, commandExecutor, menus, contextKeys, caption, isLightTheme } = this.props;
-        const resourceUri = new URI(sourceUri);
-
-        const decorationIcon = treeNode.decorations;
-        const themedIcon = isLightTheme ? decorationIcon?.icon : decorationIcon?.iconDark;
-        const classNames: string[] = themedIcon ? ['decoration-icon', themedIcon] : ['decoration-icon', 'status'];
-
-        const icon = labelProvider.getIcon(resourceUri);
-        const color = decoration && decoration.colorId && !themedIcon ? `var(${colors.toCssVariableName(decoration.colorId)})` : '';
-        const letter = decoration && decoration.letter && !themedIcon ? decoration.letter : '';
-        const tooltip = decoration && decoration.tooltip || '';
-        const textDecoration = treeNode.decorations?.strikeThrough === true ? 'line-through' : 'normal';
-        const relativePath = parentPath.relative(resourceUri.parent);
-        const path = relativePath ? relativePath.fsPath() : labelProvider.getLongName(resourceUri.parent);
-        const title = tooltip.length !== 0
-            ? `${resourceUri.path.fsPath()} • ${tooltip}`
-            : resourceUri.path.fsPath();
-
-        return <div key={sourceUri}
-            className={`scmItem ${TREE_NODE_SEGMENT_CLASS} ${TREE_NODE_SEGMENT_GROW_CLASS}`}
-            onContextMenu={this.renderContextMenu}
-            onMouseEnter={this.showHover}
-            onMouseLeave={this.hideHover}
-            ref={this.detectHover}
-            title={title}
-            onClick={this.handleClick}
-            onDoubleClick={this.handleDoubleClick} >
-            <span className={icon + ' file-icon'} />
-            {this.props.renderExpansionToggle()}
-            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
-                <span className='name' style={{ textDecoration }}>{caption}</span>
-                <span className='path' style={{ textDecoration }}>{path}</span>
-            </div>
-            <ScmInlineActions {...{
-                hover,
-                menu: menus.getMenu(ScmTreeWidget.RESOURCE_INLINE_MENU),
-                menuPath: ScmTreeWidget.RESOURCE_INLINE_MENU,
-                commandExecutor,
-                args: this.contextMenuArgs,
-                contextKeys,
-                model,
-                treeNode
-            }}>
-                <div title={tooltip} className={classNames.join(' ')} style={{ color }}>
-                    {letter}
-                </div>
-            </ScmInlineActions>
-        </div >;
-    }
-
-    protected open = () => {
-        const resource = this.props.model.getResourceFromNode(this.props.treeNode);
-        if (resource) {
-            resource.open();
-        }
-    };
-
-    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_CONTEXT_MENU;
-    protected get contextMenuArgs(): any[] {
-        if (!this.props.model.selectedNodes.some(node => ScmFileChangeNode.is(node) && node.sourceUri === this.props.sourceUri)) {
-            // Clicked node is not in selection, so ignore selection and action on just clicked node
-            return this.singleNodeArgs;
-        } else {
-            return this.props.model.getSelectionArgs(this.props.model.selectedNodes);
-        }
-    }
-    protected get singleNodeArgs(): any[] {
-        const selectedResource = this.props.model.getResourceFromNode(this.props.treeNode);
-        if (selectedResource) {
-            return [selectedResource];
-        } else {
-            // Repository status not yet available. Empty args disables the action.
-            return [];
-        }
-    }
-
-    protected hasCtrlCmdOrShiftMask(event: TreeWidget.ModifierAwareEvent): boolean {
-        const { metaKey, ctrlKey, shiftKey } = event;
-        return (isOSX && metaKey) || ctrlKey || shiftKey;
-    }
-
-    /**
-     * Handle the single clicking of nodes present in the widget.
-     */
-    protected handleClick = (event: React.MouseEvent) => {
-        if (!this.hasCtrlCmdOrShiftMask(event)) {
-            // Determine the behavior based on the preference value.
-            const isSingle = this.props.corePreferences && this.props.corePreferences['workbench.list.openMode'] === 'singleClick';
-            if (isSingle) {
-                this.open();
-            }
-        }
-    };
-
-    /**
-     * Handle the double clicking of nodes present in the widget.
-     */
-    protected handleDoubleClick = () => {
-        // Determine the behavior based on the preference value.
-        const isDouble = this.props.corePreferences && this.props.corePreferences['workbench.list.openMode'] === 'doubleClick';
-        // Nodes should only be opened through double clicking if the correct preference is set.
-        if (isDouble) {
-            this.open();
-        }
-    };
-}
-
-export namespace ScmResourceComponent {
-    export interface Props extends ScmElement.Props {
-        treeNode: ScmFileChangeNode;
-        parentPath: URI;
-        sourceUri: string;
-        decoration: Decoration | undefined;
-        colors: ColorRegistry;
-        isLightTheme: boolean
-    }
-}
-
-export class ScmResourceGroupElement extends ScmElement<ScmResourceGroupComponent.Props> {
-
-    override render(): JSX.Element {
-        const { hover } = this.state;
-        const { model, treeNode, menus, commandExecutor, contextKeys, caption } = this.props;
-        return <div className={`theia-header scm-theia-header ${TREE_NODE_SEGMENT_GROW_CLASS}`}
-            onContextMenu={this.renderContextMenu}
-            onMouseEnter={this.showHover}
-            onMouseLeave={this.hideHover}
-            ref={this.detectHover}>
-            {this.props.renderExpansionToggle()}
-            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`}>{caption}</div>
-            <ScmInlineActions {...{
-                hover,
-                args: this.contextMenuArgs,
-                menu: menus.getMenu(ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU),
-                menuPath: ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU,
-                commandExecutor,
-                contextKeys,
-                model,
-                treeNode
-            }}>
-                {this.renderChangeCount()}
-            </ScmInlineActions>
-        </div>;
-    }
-
-    protected renderChangeCount(): React.ReactNode {
-        const group = this.props.model.getResourceGroupFromNode(this.props.treeNode);
-        return <div className='notification-count-container scm-change-count'>
-            <span className='notification-count'>{group ? group.resources.length : 0}</span>
-        </div>;
-    }
-
-    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU;
-    protected get contextMenuArgs(): any[] {
-        const group = this.props.model.getResourceGroupFromNode(this.props.treeNode);
-        if (group) {
-            return [group];
-        } else {
-            // Repository status not yet available. Empty args disables the action.
-            return [];
-        }
-    }
-}
-export namespace ScmResourceGroupComponent {
-    export interface Props extends ScmElement.Props {
-        treeNode: ScmFileChangeGroupNode;
-    }
-}
-
-export class ScmResourceFolderElement extends ScmElement<ScmResourceFolderElement.Props> {
-
-    override render(): JSX.Element {
-        const { hover } = this.state;
-        const { model, treeNode, sourceUri, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
-        const sourceFileStat = FileStat.dir(sourceUri);
-        const icon = labelProvider.getIcon(sourceFileStat);
-        const title = new URI(sourceUri).path.fsPath();
-
-        return <div key={sourceUri}
-            className={`scmItem  ${TREE_NODE_SEGMENT_CLASS} ${TREE_NODE_SEGMENT_GROW_CLASS} ${ScmTreeWidget.Styles.NO_SELECT}`}
-            title={title}
-            onContextMenu={this.renderContextMenu}
-            onMouseEnter={this.showHover}
-            onMouseLeave={this.hideHover}
-            ref={this.detectHover}
-        >
-            {this.props.renderExpansionToggle()}
-            <span className={icon + ' file-icon'} />
-            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
-                <span className='name'>{caption}</span>
-            </div>
-            <ScmInlineActions {...{
-                hover,
-                menu: menus.getMenu(ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU),
-                menuPath: ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU,
-                commandExecutor,
-                args: this.contextMenuArgs,
-                contextKeys,
-                model,
-                treeNode
-            }}>
-            </ScmInlineActions>
-        </div >;
-
-    }
-
-    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU;
-    protected get contextMenuArgs(): any[] {
-        if (!this.props.model.selectedNodes.some(node => ScmFileChangeFolderNode.is(node) && node.sourceUri === this.props.sourceUri)) {
-            // Clicked node is not in selection, so ignore selection and action on just clicked node
-            return this.singleNodeArgs;
-        } else {
-            return this.props.model.getSelectionArgs(this.props.model.selectedNodes);
-        }
-    }
-    protected get singleNodeArgs(): any[] {
-        return this.props.model.getResourcesFromFolderNode(this.props.treeNode);
-    }
-
-}
-
-export namespace ScmResourceFolderElement {
-    export interface Props extends ScmElement.Props {
-        treeNode: ScmFileChangeFolderNode;
-        sourceUri: string;
-    }
-}
-
-export class ScmInlineActions extends React.Component<ScmInlineActions.Props> {
-    override render(): React.ReactNode {
-        const { hover, menu, menuPath, args, commandExecutor, model, treeNode, contextKeys, children } = this.props;
-        return <div className='theia-scm-inline-actions-container'>
-            <div className='theia-scm-inline-actions'>
-                {hover && menu.children
-                    .map((node, index) => node instanceof ActionMenuNode &&
-                        <ScmInlineAction key={index} {...{ node, menuPath, args, commandExecutor, model, treeNode, contextKeys }} />)}
-            </div>
-            {children}
-        </div>;
-    }
-}
-export namespace ScmInlineActions {
-    export interface Props {
-        hover: boolean;
-        menu: CompoundMenuNode;
-        menuPath: MenuPath;
-        commandExecutor: MenuCommandExecutor;
-        model: ScmTreeModel;
-        treeNode: TreeNode;
-        contextKeys: ScmContextKeyService;
-        args: any[];
-        children?: React.ReactNode;
-    }
-}
-
-export class ScmInlineAction extends React.Component<ScmInlineAction.Props> {
-    override render(): React.ReactNode {
-        const { node, model, treeNode, args, commandExecutor, menuPath, contextKeys } = this.props;
-
-        let isActive: boolean = false;
-        model.execInNodeContext(treeNode, () => {
-            isActive = contextKeys.match(node.when);
-        });
-
-        if (!commandExecutor.isVisible(menuPath, node.command, ...args) || !isActive) {
-            return false;
-        }
-        return <div className='theia-scm-inline-action'>
-            <a className={`${node.icon} ${ACTION_ITEM}`} title={node.label} onClick={this.execute} />
-        </div>;
-    }
-
-    protected execute = (event: React.MouseEvent) => {
-        event.stopPropagation();
-
-        const { commandExecutor, menuPath, node, args } = this.props;
-        commandExecutor.executeCommand([menuPath[0]], node.command, ...args);
-    };
-}
-export namespace ScmInlineAction {
-    export interface Props {
-        node: ActionMenuNode;
-        commandExecutor: MenuCommandExecutor;
-        menuPath: MenuPath;
-        model: ScmTreeModel;
-        treeNode: TreeNode;
-        contextKeys: ScmContextKeyService;
-        args: any[];
-    }
-}
+// *****************************************************************************
+// Copyright (C) 2020 Arm 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 no-null/no-null, @typescript-eslint/no-explicit-any */
+
+import * as React from '@theia/core/shared/react';
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import URI from '@theia/core/lib/common/uri';
+import { isOSX } from '@theia/core/lib/common/os';
+import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposable';
+import { TreeWidget, TreeNode, SelectableTreeNode, TreeModel, TreeProps, NodeProps, TREE_NODE_SEGMENT_CLASS, TREE_NODE_SEGMENT_GROW_CLASS } from '@theia/core/lib/browser/tree';
+import { ScmTreeModel, ScmFileChangeRootNode, ScmFileChangeGroupNode, ScmFileChangeFolderNode, ScmFileChangeNode } from './scm-tree-model';
+import { MenuCommandExecutor, MenuModelRegistry, ActionMenuNode, CompoundMenuNode, MenuPath } from '@theia/core/lib/common/menu';
+import { ScmResource } from './scm-provider';
+import { ContextMenuRenderer, LabelProvider, CorePreferences, DiffUris, ACTION_ITEM } from '@theia/core/lib/browser';
+import { ScmContextKeyService } from './scm-context-key-service';
+import { EditorWidget, EditorManager, DiffNavigatorProvider } from '@theia/editor/lib/browser';
+import { IconThemeService } from '@theia/core/lib/browser/icon-theme-service';
+import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
+import { Decoration, DecorationsService } from '@theia/core/lib/browser/decorations-service';
+import { FileStat } from '@theia/filesystem/lib/common/files';
+import { ThemeService } from '@theia/core/lib/browser/theming';
+
+@injectable()
+export class ScmTreeWidget extends TreeWidget {
+
+    static ID = 'scm-resource-widget';
+
+    static RESOURCE_GROUP_CONTEXT_MENU = ['RESOURCE_GROUP_CONTEXT_MENU'];
+    static RESOURCE_GROUP_INLINE_MENU = ['RESOURCE_GROUP_CONTEXT_MENU', 'inline'];
+
+    static RESOURCE_FOLDER_CONTEXT_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU'];
+    static RESOURCE_FOLDER_INLINE_MENU = ['RESOURCE_FOLDER_CONTEXT_MENU', 'inline'];
+
+    static RESOURCE_CONTEXT_MENU = ['RESOURCE_CONTEXT_MENU'];
+    static RESOURCE_INLINE_MENU = ['RESOURCE_CONTEXT_MENU', 'inline'];
+
+    @inject(MenuCommandExecutor) protected readonly menuCommandExecutor: MenuCommandExecutor;
+    @inject(MenuModelRegistry) protected readonly menus: MenuModelRegistry;
+    @inject(ScmContextKeyService) protected readonly contextKeys: ScmContextKeyService;
+    @inject(EditorManager) protected readonly editorManager: EditorManager;
+    @inject(DiffNavigatorProvider) protected readonly diffNavigatorProvider: DiffNavigatorProvider;
+    @inject(IconThemeService) protected readonly iconThemeService: IconThemeService;
+    @inject(DecorationsService) protected readonly decorationsService: DecorationsService;
+    @inject(ColorRegistry) protected readonly colors: ColorRegistry;
+    @inject(ThemeService) protected readonly themeService: ThemeService;
+
+    // TODO: Make TreeWidget generic to better type those fields.
+    override readonly model: ScmTreeModel;
+
+    constructor(
+        @inject(TreeProps) props: TreeProps,
+        @inject(TreeModel) treeModel: ScmTreeModel,
+        @inject(ContextMenuRenderer) contextMenuRenderer: ContextMenuRenderer,
+    ) {
+        super(props, treeModel, contextMenuRenderer);
+        this.id = ScmTreeWidget.ID;
+        this.addClass('groups-outer-container');
+    }
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.toDispose.push(this.themeService.onDidColorThemeChange(() => this.update()));
+    }
+
+    set viewMode(id: 'tree' | 'list') {
+        // Close the search box because the structure of the tree will change dramatically
+        // and the search results will be out of date.
+        this.searchBox.hide();
+        this.model.viewMode = id;
+    }
+    get viewMode(): 'tree' | 'list' {
+        return this.model.viewMode;
+    }
+
+    /**
+     * Render the node given the tree node and node properties.
+     * @param node the tree node.
+     * @param props the node properties.
+     */
+    protected override renderNode(node: TreeNode, props: NodeProps): React.ReactNode {
+        if (!TreeNode.isVisible(node)) {
+            return undefined;
+        }
+
+        const attributes = this.createNodeAttributes(node, props);
+        const label = this.labelProvider.getName(node);
+        const searchHighlights = this.searchHighlights?.get(node.id);
+        // The group nodes should not be subject to highlighting.
+        const caption = (searchHighlights && !ScmFileChangeGroupNode.is(node)) ? this.toReactNode(label, searchHighlights) : label;
+
+        if (ScmFileChangeGroupNode.is(node)) {
+            const content = <ScmResourceGroupElement
+                key={`${node.groupId}`}
+                model={this.model}
+                treeNode={node}
+                renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
+                commandExecutor={this.menuCommandExecutor}
+                contextMenuRenderer={this.contextMenuRenderer}
+                menus={this.menus}
+                contextKeys={this.contextKeys}
+                labelProvider={this.labelProvider}
+                corePreferences={this.corePreferences}
+                caption={caption}
+            />;
+
+            return React.createElement('div', attributes, content);
+
+        }
+        if (ScmFileChangeFolderNode.is(node)) {
+            const content = <ScmResourceFolderElement
+                key={String(node.sourceUri)}
+                model={this.model}
+                treeNode={node}
+                sourceUri={node.sourceUri}
+                renderExpansionToggle={() => this.renderExpansionToggle(node, props)}
+                commandExecutor={this.menuCommandExecutor}
+                contextMenuRenderer={this.contextMenuRenderer}
+                menus={this.menus}
+                contextKeys={this.contextKeys}
+                labelProvider={this.labelProvider}
+                corePreferences={this.corePreferences}
+                caption={caption}
+            />;
+
+            return React.createElement('div', attributes, content);
+        }
+        if (ScmFileChangeNode.is(node)) {
+            const parentPath =
+                (node.parent && ScmFileChangeFolderNode.is(node.parent))
+                    ? new URI(node.parent.sourceUri) : new URI(this.model.rootUri);
+
+            const content = <ScmResourceComponent
+                key={node.sourceUri}
+                model={this.model}
+                treeNode={node}
+                contextMenuRenderer={this.contextMenuRenderer}
+                commandExecutor={this.menuCommandExecutor}
+                menus={this.menus}
+                contextKeys={this.contextKeys}
+                labelProvider={this.labelProvider}
+                corePreferences={this.corePreferences}
+                caption={caption}
+                {...{
+                    ...this.props,
+                    parentPath,
+                    sourceUri: node.sourceUri,
+                    decoration: this.decorationsService.getDecoration(new URI(node.sourceUri), true)[0],
+                    colors: this.colors,
+                    isLightTheme: this.isCurrentThemeLight(),
+                    renderExpansionToggle: () => this.renderExpansionToggle(node, props),
+                }}
+            />;
+            return React.createElement('div', attributes, content);
+        }
+        return super.renderNode(node, props);
+    }
+
+    protected override createContainerAttributes(): React.HTMLAttributes<HTMLElement> {
+        if (this.model.canTabToWidget()) {
+            return {
+                ...super.createContainerAttributes(),
+                tabIndex: 0
+            };
+        }
+        return super.createContainerAttributes();
+    }
+
+    /**
+     * The ARROW_LEFT key controls both the movement around the file tree and also
+     * the movement through the change chunks within a file.
+     *
+     * If the selected tree node is a folder then the ARROW_LEFT key behaves exactly
+     * as it does in explorer.  It collapses the tree node if the folder is expanded and
+     * it moves the selection up to the parent folder if the folder is collapsed (no-op if no parent folder, as
+     * group headers are not selectable).  This behavior is the default behavior implemented
+     * in the TreeWidget super class.
+     *
+     * If the selected tree node is a file then the ARROW_LEFT key moves up through the
+     * change chunks within each file.  If the selected chunk is the first chunk in the file
+     * then the file selection is moved to the previous file (no-op if no previous file).
+     *
+     * Note that when cursoring through change chunks, the ARROW_LEFT key cannot be used to
+     * move up through the parent folders of the file tree.  If users want to do this, using
+     * keys only, then they must press ARROW_UP repeatedly until the selected node is the folder
+     * node and then press ARROW_LEFT.
+     */
+    protected override async handleLeft(event: KeyboardEvent): Promise<void> {
+        if (this.model.selectedNodes.length === 1) {
+            const selectedNode = this.model.selectedNodes[0];
+            if (ScmFileChangeNode.is(selectedNode)) {
+                const selectedResource = this.model.getResourceFromNode(selectedNode);
+                if (!selectedResource) {
+                    return super.handleLeft(event);
+                }
+                const widget = await this.openResource(selectedResource);
+
+                if (widget) {
+                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
+                    if (diffNavigator.hasPrevious()) {
+                        diffNavigator.previous();
+                    } else {
+                        const previousNode = this.moveToPreviousFileNode();
+                        if (previousNode) {
+                            const previousResource = this.model.getResourceFromNode(previousNode);
+                            if (previousResource) {
+                                this.openResource(previousResource);
+                            }
+                        }
+                    }
+                    return;
+                }
+            }
+        }
+        return super.handleLeft(event);
+    }
+
+    /**
+     * The ARROW_RIGHT key controls both the movement around the file tree and also
+     * the movement through the change chunks within a file.
+     *
+     * If the selected tree node is a folder then the ARROW_RIGHT key behaves exactly
+     * as it does in explorer.  It expands the tree node if the folder is collapsed and
+     * it moves the selection to the first child node if the folder is expanded.
+     * This behavior is the default behavior implemented
+     * in the TreeWidget super class.
+     *
+     * If the selected tree node is a file then the ARROW_RIGHT key moves down through the
+     * change chunks within each file.  If the selected chunk is the last chunk in the file
+     * then the file selection is moved to the next file (no-op if no next file).
+     */
+    protected override async handleRight(event: KeyboardEvent): Promise<void> {
+        if (this.model.selectedNodes.length === 0) {
+            const firstNode = this.getFirstSelectableNode();
+            // Selects the first visible resource as none are selected.
+            if (!firstNode) {
+                return;
+            }
+            this.model.selectNode(firstNode);
+            return;
+        }
+        if (this.model.selectedNodes.length === 1) {
+            const selectedNode = this.model.selectedNodes[0];
+            if (ScmFileChangeNode.is(selectedNode)) {
+                const selectedResource = this.model.getResourceFromNode(selectedNode);
+                if (!selectedResource) {
+                    return super.handleRight(event);
+                }
+                const widget = await this.openResource(selectedResource);
+
+                if (widget) {
+                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
+                    if (diffNavigator.hasNext()) {
+                        diffNavigator.next();
+                    } else {
+                        const nextNode = this.moveToNextFileNode();
+                        if (nextNode) {
+                            const nextResource = this.model.getResourceFromNode(nextNode);
+                            if (nextResource) {
+                                this.openResource(nextResource);
+                            }
+                        }
+                    }
+                }
+                return;
+            }
+        }
+        return super.handleRight(event);
+    }
+
+    protected override handleEnter(event: KeyboardEvent): void {
+        if (this.model.selectedNodes.length === 1) {
+            const selectedNode = this.model.selectedNodes[0];
+            if (ScmFileChangeNode.is(selectedNode)) {
+                const selectedResource = this.model.getResourceFromNode(selectedNode);
+                if (selectedResource) {
+                    this.openResource(selectedResource);
+                }
+                return;
+            }
+        }
+        super.handleEnter(event);
+    }
+
+    async goToPreviousChange(): Promise<void> {
+        if (this.model.selectedNodes.length === 1) {
+            const selectedNode = this.model.selectedNodes[0];
+            if (ScmFileChangeNode.is(selectedNode)) {
+                if (ScmFileChangeNode.is(selectedNode)) {
+                    const selectedResource = this.model.getResourceFromNode(selectedNode);
+                    if (!selectedResource) {
+                        return;
+                    }
+                    const widget = await this.openResource(selectedResource);
+
+                    if (widget) {
+                        const diffNavigator = this.diffNavigatorProvider(widget.editor);
+                        if (diffNavigator.hasPrevious()) {
+                            diffNavigator.previous();
+                        } else {
+                            const previousNode = this.moveToPreviousFileNode();
+                            if (previousNode) {
+                                const previousResource = this.model.getResourceFromNode(previousNode);
+                                if (previousResource) {
+                                    this.openResource(previousResource);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    async goToNextChange(): Promise<void> {
+        if (this.model.selectedNodes.length === 0) {
+            const firstNode = this.getFirstSelectableNode();
+            // Selects the first visible resource as none are selected.
+            if (!firstNode) {
+                return;
+            }
+            this.model.selectNode(firstNode);
+            return;
+        }
+        if (this.model.selectedNodes.length === 1) {
+            const selectedNode = this.model.selectedNodes[0];
+            if (ScmFileChangeNode.is(selectedNode)) {
+                const selectedResource = this.model.getResourceFromNode(selectedNode);
+                if (!selectedResource) {
+                    return;
+                }
+                const widget = await this.openResource(selectedResource);
+
+                if (widget) {
+                    const diffNavigator = this.diffNavigatorProvider(widget.editor);
+                    if (diffNavigator.hasNext()) {
+                        diffNavigator.next();
+                    } else {
+                        const nextNode = this.moveToNextFileNode();
+                        if (nextNode) {
+                            const nextResource = this.model.getResourceFromNode(nextNode);
+                            if (nextResource) {
+                                this.openResource(nextResource);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    selectNodeByUri(uri: URI): void {
+        for (const group of this.model.groups) {
+            const sourceUri = new URI(uri.path.toString());
+            const id = `${group.id}:${sourceUri.toString()}`;
+            const node = this.model.getNode(id);
+            if (SelectableTreeNode.is(node)) {
+                this.model.selectNode(node);
+                return;
+            }
+        }
+    }
+
+    protected getFirstSelectableNode(): SelectableTreeNode | undefined {
+        if (this.model.root) {
+            const root = this.model.root as ScmFileChangeRootNode;
+            const groupNode = root.children[0];
+            return groupNode.children[0];
+        }
+    }
+
+    protected moveToPreviousFileNode(): ScmFileChangeNode | undefined {
+        let previousNode = this.model.getPrevSelectableNode();
+        while (previousNode) {
+            if (ScmFileChangeNode.is(previousNode)) {
+                this.model.selectNode(previousNode);
+                return previousNode;
+            }
+            previousNode = this.model.getPrevSelectableNode(previousNode);
+        };
+    }
+
+    protected moveToNextFileNode(): ScmFileChangeNode | undefined {
+        let nextNode = this.model.getNextSelectableNode();
+        while (nextNode) {
+            if (ScmFileChangeNode.is(nextNode)) {
+                this.model.selectNode(nextNode);
+                return nextNode;
+            }
+            nextNode = this.model.getNextSelectableNode(nextNode);
+        };
+    }
+
+    protected async openResource(resource: ScmResource): Promise<EditorWidget | undefined> {
+        try {
+            await resource.open();
+        } catch (e) {
+            console.error('Failed to open a SCM resource', e);
+            return undefined;
+        }
+
+        let standaloneEditor: EditorWidget | undefined;
+        const resourcePath = resource.sourceUri.path.toString();
+
+        for (const widget of this.editorManager.all) {
+            const resourceUri = widget.editor.document.uri;
+            const editorResourcePath = new URI(resourceUri).path.toString();
+            if (resourcePath === editorResourcePath) {
+                if (widget.editor.uri.scheme === DiffUris.DIFF_SCHEME) {
+                    // prefer diff editor
+                    return widget;
+                } else {
+                    standaloneEditor = widget;
+                }
+            }
+            if (widget.editor.uri.scheme === DiffUris.DIFF_SCHEME
+                && resourceUri === resource.sourceUri.toString()) {
+                return widget;
+            }
+        }
+        // fallback to standalone editor
+        return standaloneEditor;
+    }
+
+    protected override getPaddingLeft(node: TreeNode, props: NodeProps): number {
+        if (this.viewMode === 'list') {
+            if (props.depth === 1) {
+                return this.props.expansionTogglePadding;
+            }
+        }
+        return super.getPaddingLeft(node, props);
+    }
+
+    protected override getDepthPadding(depth: number): number {
+        return super.getDepthPadding(depth) + 5;
+    }
+
+    protected isCurrentThemeLight(): boolean {
+        const type = this.themeService.getCurrentTheme().type;
+        return type.toLocaleLowerCase().includes('light');
+    }
+
+    protected override needsExpansionTogglePadding(node: TreeNode): boolean {
+        const theme = this.iconThemeService.getDefinition(this.iconThemeService.current);
+        if (theme && (theme.hidesExplorerArrows || (theme.hasFileIcons && !theme.hasFolderIcons))) {
+            return false;
+        }
+        return super.needsExpansionTogglePadding(node);
+    }
+
+}
+
+export namespace ScmTreeWidget {
+    export namespace Styles {
+        export const NO_SELECT = 'no-select';
+    }
+    // This is an 'abstract' base interface for all the element component props.
+    export interface Props {
+        treeNode: TreeNode;
+        model: ScmTreeModel;
+        menus: MenuModelRegistry;
+        contextKeys: ScmContextKeyService;
+        labelProvider: LabelProvider;
+        contextMenuRenderer: ContextMenuRenderer;
+        corePreferences?: CorePreferences;
+        caption: React.ReactNode;
+    }
+}
+
+export abstract class ScmElement<P extends ScmElement.Props = ScmElement.Props> extends React.Component<P, ScmElement.State> {
+
+    constructor(props: P) {
+        super(props);
+        this.state = {
+            hover: false
+        };
+
+        const setState = this.setState.bind(this);
+        this.setState = newState => {
+            if (!this.toDisposeOnUnmount.disposed) {
+                setState(newState);
+            }
+        };
+    }
+
+    protected readonly toDisposeOnUnmount = new DisposableCollection();
+    override componentDidMount(): void {
+        this.toDisposeOnUnmount.push(Disposable.create(() => { /* mark as mounted */ }));
+    }
+    override componentWillUnmount(): void {
+        this.toDisposeOnUnmount.dispose();
+    }
+
+    protected detectHover = (element: HTMLElement | null) => {
+        if (element) {
+            window.requestAnimationFrame(() => {
+                const hover = element.matches(':hover');
+                this.setState({ hover });
+            });
+        }
+    };
+    protected showHover = () => this.setState({ hover: true });
+    protected hideHover = () => this.setState({ hover: false });
+
+    protected renderContextMenu = (event: React.MouseEvent<HTMLElement>) => {
+        event.preventDefault();
+        const { treeNode: node, contextMenuRenderer } = this.props;
+        this.props.model.execInNodeContext(node, () => {
+            contextMenuRenderer.render({
+                menuPath: this.contextMenuPath,
+                anchor: event.nativeEvent,
+                args: this.contextMenuArgs
+            });
+        });
+    };
+
+    protected abstract get contextMenuPath(): MenuPath;
+    protected abstract get contextMenuArgs(): any[];
+
+}
+export namespace ScmElement {
+    export interface Props extends ScmTreeWidget.Props {
+        renderExpansionToggle: () => React.ReactNode;
+        commandExecutor: MenuCommandExecutor;
+    }
+    export interface State {
+        hover: boolean
+    }
+}
+
+export class ScmResourceComponent extends ScmElement<ScmResourceComponent.Props> {
+
+    override render(): JSX.Element | undefined {
+        const { hover } = this.state;
+        const { model, treeNode, colors, parentPath, sourceUri, decoration, labelProvider, commandExecutor, menus, contextKeys, caption, isLightTheme } = this.props;
+        const resourceUri = new URI(sourceUri);
+
+        const decorationIcon = treeNode.decorations;
+        const themedIcon = isLightTheme ? decorationIcon?.icon : decorationIcon?.iconDark;
+        const classNames: string[] = themedIcon ? ['decoration-icon', themedIcon] : ['decoration-icon', 'status'];
+
+        const icon = labelProvider.getIcon(resourceUri);
+        const color = decoration && decoration.colorId && !themedIcon ? `var(${colors.toCssVariableName(decoration.colorId)})` : '';
+        const letter = decoration && decoration.letter && !themedIcon ? decoration.letter : '';
+        const tooltip = decoration && decoration.tooltip || '';
+        const textDecoration = treeNode.decorations?.strikeThrough === true ? 'line-through' : 'normal';
+        const relativePath = parentPath.relative(resourceUri.parent);
+        const path = relativePath ? relativePath.fsPath() : labelProvider.getLongName(resourceUri.parent);
+        const title = tooltip.length !== 0
+            ? `${resourceUri.path.fsPath()} • ${tooltip}`
+            : resourceUri.path.fsPath();
+
+        return <div key={sourceUri}
+            className={`scmItem ${TREE_NODE_SEGMENT_CLASS} ${TREE_NODE_SEGMENT_GROW_CLASS}`}
+            onContextMenu={this.renderContextMenu}
+            onMouseEnter={this.showHover}
+            onMouseLeave={this.hideHover}
+            ref={this.detectHover}
+            title={title}
+            onClick={this.handleClick}
+            onDoubleClick={this.handleDoubleClick} >
+            <span className={icon + ' file-icon'} />
+            {this.props.renderExpansionToggle()}
+            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
+                <span className='name' style={{ textDecoration }}>{caption}</span>
+                <span className='path' style={{ textDecoration }}>{path}</span>
+            </div>
+            <ScmInlineActions {...{
+                hover,
+                menu: menus.getMenu(ScmTreeWidget.RESOURCE_INLINE_MENU),
+                menuPath: ScmTreeWidget.RESOURCE_INLINE_MENU,
+                commandExecutor,
+                args: this.contextMenuArgs,
+                contextKeys,
+                model,
+                treeNode
+            }}>
+                <div title={tooltip} className={classNames.join(' ')} style={{ color }}>
+                    {letter}
+                </div>
+            </ScmInlineActions>
+        </div >;
+    }
+
+    protected open = () => {
+        const resource = this.props.model.getResourceFromNode(this.props.treeNode);
+        if (resource) {
+            resource.open();
+        }
+    };
+
+    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_CONTEXT_MENU;
+    protected get contextMenuArgs(): any[] {
+        if (!this.props.model.selectedNodes.some(node => ScmFileChangeNode.is(node) && node.sourceUri === this.props.sourceUri)) {
+            // Clicked node is not in selection, so ignore selection and action on just clicked node
+            return this.singleNodeArgs;
+        } else {
+            return this.props.model.getSelectionArgs(this.props.model.selectedNodes);
+        }
+    }
+    protected get singleNodeArgs(): any[] {
+        const selectedResource = this.props.model.getResourceFromNode(this.props.treeNode);
+        if (selectedResource) {
+            return [selectedResource];
+        } else {
+            // Repository status not yet available. Empty args disables the action.
+            return [];
+        }
+    }
+
+    protected hasCtrlCmdOrShiftMask(event: TreeWidget.ModifierAwareEvent): boolean {
+        const { metaKey, ctrlKey, shiftKey } = event;
+        return (isOSX && metaKey) || ctrlKey || shiftKey;
+    }
+
+    /**
+     * Handle the single clicking of nodes present in the widget.
+     */
+    protected handleClick = (event: React.MouseEvent) => {
+        if (!this.hasCtrlCmdOrShiftMask(event)) {
+            // Determine the behavior based on the preference value.
+            const isSingle = this.props.corePreferences && this.props.corePreferences['workbench.list.openMode'] === 'singleClick';
+            if (isSingle) {
+                this.open();
+            }
+        }
+    };
+
+    /**
+     * Handle the double clicking of nodes present in the widget.
+     */
+    protected handleDoubleClick = () => {
+        // Determine the behavior based on the preference value.
+        const isDouble = this.props.corePreferences && this.props.corePreferences['workbench.list.openMode'] === 'doubleClick';
+        // Nodes should only be opened through double clicking if the correct preference is set.
+        if (isDouble) {
+            this.open();
+        }
+    };
+}
+
+export namespace ScmResourceComponent {
+    export interface Props extends ScmElement.Props {
+        treeNode: ScmFileChangeNode;
+        parentPath: URI;
+        sourceUri: string;
+        decoration: Decoration | undefined;
+        colors: ColorRegistry;
+        isLightTheme: boolean
+    }
+}
+
+export class ScmResourceGroupElement extends ScmElement<ScmResourceGroupComponent.Props> {
+
+    override render(): JSX.Element {
+        const { hover } = this.state;
+        const { model, treeNode, menus, commandExecutor, contextKeys, caption } = this.props;
+        return <div className={`theia-header scm-theia-header ${TREE_NODE_SEGMENT_GROW_CLASS}`}
+            onContextMenu={this.renderContextMenu}
+            onMouseEnter={this.showHover}
+            onMouseLeave={this.hideHover}
+            ref={this.detectHover}>
+            {this.props.renderExpansionToggle()}
+            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`}>{caption}</div>
+            <ScmInlineActions {...{
+                hover,
+                args: this.contextMenuArgs,
+                menu: menus.getMenu(ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU),
+                menuPath: ScmTreeWidget.RESOURCE_GROUP_INLINE_MENU,
+                commandExecutor,
+                contextKeys,
+                model,
+                treeNode
+            }}>
+                {this.renderChangeCount()}
+            </ScmInlineActions>
+        </div>;
+    }
+
+    protected renderChangeCount(): React.ReactNode {
+        const group = this.props.model.getResourceGroupFromNode(this.props.treeNode);
+        return <div className='notification-count-container scm-change-count'>
+            <span className='notification-count'>{group ? group.resources.length : 0}</span>
+        </div>;
+    }
+
+    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_GROUP_CONTEXT_MENU;
+    protected get contextMenuArgs(): any[] {
+        const group = this.props.model.getResourceGroupFromNode(this.props.treeNode);
+        if (group) {
+            return [group];
+        } else {
+            // Repository status not yet available. Empty args disables the action.
+            return [];
+        }
+    }
+}
+export namespace ScmResourceGroupComponent {
+    export interface Props extends ScmElement.Props {
+        treeNode: ScmFileChangeGroupNode;
+    }
+}
+
+export class ScmResourceFolderElement extends ScmElement<ScmResourceFolderElement.Props> {
+
+    override render(): JSX.Element {
+        const { hover } = this.state;
+        const { model, treeNode, sourceUri, labelProvider, commandExecutor, menus, contextKeys, caption } = this.props;
+        const sourceFileStat = FileStat.dir(sourceUri);
+        const icon = labelProvider.getIcon(sourceFileStat);
+        const title = new URI(sourceUri).path.fsPath();
+
+        return <div key={sourceUri}
+            className={`scmItem  ${TREE_NODE_SEGMENT_CLASS} ${TREE_NODE_SEGMENT_GROW_CLASS} ${ScmTreeWidget.Styles.NO_SELECT}`}
+            title={title}
+            onContextMenu={this.renderContextMenu}
+            onMouseEnter={this.showHover}
+            onMouseLeave={this.hideHover}
+            ref={this.detectHover}
+        >
+            {this.props.renderExpansionToggle()}
+            <span className={icon + ' file-icon'} />
+            <div className={`noWrapInfo ${TREE_NODE_SEGMENT_GROW_CLASS}`} >
+                <span className='name'>{caption}</span>
+            </div>
+            <ScmInlineActions {...{
+                hover,
+                menu: menus.getMenu(ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU),
+                menuPath: ScmTreeWidget.RESOURCE_FOLDER_INLINE_MENU,
+                commandExecutor,
+                args: this.contextMenuArgs,
+                contextKeys,
+                model,
+                treeNode
+            }}>
+            </ScmInlineActions>
+        </div >;
+
+    }
+
+    protected readonly contextMenuPath = ScmTreeWidget.RESOURCE_FOLDER_CONTEXT_MENU;
+    protected get contextMenuArgs(): any[] {
+        if (!this.props.model.selectedNodes.some(node => ScmFileChangeFolderNode.is(node) && node.sourceUri === this.props.sourceUri)) {
+            // Clicked node is not in selection, so ignore selection and action on just clicked node
+            return this.singleNodeArgs;
+        } else {
+            return this.props.model.getSelectionArgs(this.props.model.selectedNodes);
+        }
+    }
+    protected get singleNodeArgs(): any[] {
+        return this.props.model.getResourcesFromFolderNode(this.props.treeNode);
+    }
+
+}
+
+export namespace ScmResourceFolderElement {
+    export interface Props extends ScmElement.Props {
+        treeNode: ScmFileChangeFolderNode;
+        sourceUri: string;
+    }
+}
+
+export class ScmInlineActions extends React.Component<ScmInlineActions.Props> {
+    override render(): React.ReactNode {
+        const { hover, menu, menuPath, args, commandExecutor, model, treeNode, contextKeys, children } = this.props;
+        return <div className='theia-scm-inline-actions-container'>
+            <div className='theia-scm-inline-actions'>
+                {hover && menu.children
+                    .map((node, index) => node instanceof ActionMenuNode &&
+                        <ScmInlineAction key={index} {...{ node, menuPath, args, commandExecutor, model, treeNode, contextKeys }} />)}
+            </div>
+            {children}
+        </div>;
+    }
+}
+export namespace ScmInlineActions {
+    export interface Props {
+        hover: boolean;
+        menu: CompoundMenuNode;
+        menuPath: MenuPath;
+        commandExecutor: MenuCommandExecutor;
+        model: ScmTreeModel;
+        treeNode: TreeNode;
+        contextKeys: ScmContextKeyService;
+        args: any[];
+        children?: React.ReactNode;
+    }
+}
+
+export class ScmInlineAction extends React.Component<ScmInlineAction.Props> {
+    override render(): React.ReactNode {
+        const { node, model, treeNode, args, commandExecutor, menuPath, contextKeys } = this.props;
+
+        let isActive: boolean = false;
+        model.execInNodeContext(treeNode, () => {
+            isActive = contextKeys.match(node.when);
+        });
+
+        if (!commandExecutor.isVisible(menuPath, node.command, ...args) || !isActive) {
+            return false;
+        }
+        return <div className='theia-scm-inline-action'>
+            <a className={`${node.icon} ${ACTION_ITEM}`} title={node.label} onClick={this.execute} />
+        </div>;
+    }
+
+    protected execute = (event: React.MouseEvent) => {
+        event.stopPropagation();
+
+        const { commandExecutor, menuPath, node, args } = this.props;
+        commandExecutor.executeCommand([menuPath[0]], node.command, ...args);
+    };
+}
+export namespace ScmInlineAction {
+    export interface Props {
+        node: ActionMenuNode;
+        commandExecutor: MenuCommandExecutor;
+        menuPath: MenuPath;
+        model: ScmTreeModel;
+        treeNode: TreeNode;
+        contextKeys: ScmContextKeyService;
+        args: any[];
+    }
+}