@theia/scm 1.45.1 → 1.46.0-next.72

package/src/browser/scm-frontend-module.ts

@@ -1,149 +1,149 @@
-// *****************************************************************************
-// Copyright (C) 2019 Red Hat, Inc. 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 '../../src/browser/style/index.css';
-
-import { interfaces, ContainerModule, Container } from '@theia/core/shared/inversify';
-import {
-    bindViewContribution, FrontendApplicationContribution,
-    WidgetFactory, ViewContainer,
-    WidgetManager, ApplicationShellLayoutMigration,
-    createTreeContainer, TreeModel, TreeModelImpl, StylingParticipant
-} from '@theia/core/lib/browser';
-import { ScmService } from './scm-service';
-import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution';
-import { ScmWidget } from './scm-widget';
-import { ScmTreeWidget } from './scm-tree-widget';
-import { ScmCommitWidget } from './scm-commit-widget';
-import { ScmAmendWidget } from './scm-amend-widget';
-import { ScmNoRepositoryWidget } from './scm-no-repository-widget';
-import { ScmTreeModelProps } from './scm-tree-model';
-import { ScmGroupsTreeModel } from './scm-groups-tree-model';
-import { ScmQuickOpenService } from './scm-quick-open-service';
-import { bindDirtyDiff } from './dirty-diff/dirty-diff-module';
-import { ScmDecorationsService } from './decorations/scm-decorations-service';
-import { ScmAvatarService } from './scm-avatar-service';
-import { ScmContextKeyService } from './scm-context-key-service';
-import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations';
-import { ScmTreeLabelProvider } from './scm-tree-label-provider';
-import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
-import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
-import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
-import { bindScmPreferences } from './scm-preferences';
-import { ScmTabBarDecorator } from './decorations/scm-tab-bar-decorator';
-import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
-export default new ContainerModule(bind => {
-    bind(ScmContextKeyService).toSelf().inSingletonScope();
-    bind(ScmService).toSelf().inSingletonScope();
-
-    bind(ScmWidget).toSelf();
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: SCM_WIDGET_FACTORY_ID,
-        createWidget: () => {
-            const child = createScmWidgetContainer(container);
-            return child.get(ScmWidget);
-        }
-    })).inSingletonScope();
-
-    bind(ScmCommitWidget).toSelf();
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: ScmCommitWidget.ID,
-        createWidget: () => container.get(ScmCommitWidget)
-    })).inSingletonScope();
-
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: ScmTreeWidget.ID,
-        createWidget: () => container.get(ScmTreeWidget)
-    })).inSingletonScope();
-
-    bind(ScmAmendWidget).toSelf();
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: ScmAmendWidget.ID,
-        createWidget: () => container.get(ScmAmendWidget)
-    })).inSingletonScope();
-
-    bind(ScmNoRepositoryWidget).toSelf();
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: ScmNoRepositoryWidget.ID,
-        createWidget: () => container.get(ScmNoRepositoryWidget)
-    })).inSingletonScope();
-
-    bind(WidgetFactory).toDynamicValue(({ container }) => ({
-        id: SCM_VIEW_CONTAINER_ID,
-        createWidget: async () => {
-            const viewContainer = container.get<ViewContainer.Factory>(ViewContainer.Factory)({
-                id: SCM_VIEW_CONTAINER_ID,
-                progressLocationId: 'scm'
-            });
-            viewContainer.setTitleOptions(SCM_VIEW_CONTAINER_TITLE_OPTIONS);
-            const widget = await container.get(WidgetManager).getOrCreateWidget(SCM_WIDGET_FACTORY_ID);
-            viewContainer.addWidget(widget, {
-                canHide: false,
-                initiallyCollapsed: false
-            });
-            return viewContainer;
-        }
-    })).inSingletonScope();
-    bind(ApplicationShellLayoutMigration).to(ScmLayoutVersion3Migration).inSingletonScope();
-    bind(ApplicationShellLayoutMigration).to(ScmLayoutVersion5Migration).inSingletonScope();
-
-    bind(ScmQuickOpenService).toSelf().inSingletonScope();
-    bindViewContribution(bind, ScmContribution);
-    bind(FrontendApplicationContribution).toService(ScmContribution);
-    bind(TabBarToolbarContribution).toService(ScmContribution);
-    bind(ColorContribution).toService(ScmContribution);
-    bind(StylingParticipant).toService(ScmContribution);
-
-    bind(ScmDecorationsService).toSelf().inSingletonScope();
-
-    bind(ScmAvatarService).toSelf().inSingletonScope();
-
-    bindDirtyDiff(bind);
-
-    bind(ScmTreeLabelProvider).toSelf().inSingletonScope();
-    bind(LabelProviderContribution).toService(ScmTreeLabelProvider);
-
-    bindScmPreferences(bind);
-
-    bind(ScmTabBarDecorator).toSelf().inSingletonScope();
-    bind(TabBarDecorator).toService(ScmTabBarDecorator);
-});
-
-export function createScmTreeContainer(parent: interfaces.Container): Container {
-    const child = createTreeContainer(parent, {
-        props: {
-            virtualized: true,
-            search: true,
-            multiSelect: true,
-        },
-        widget: ScmTreeWidget,
-    });
-
-    child.unbind(TreeModel);
-    child.unbind(TreeModelImpl);
-
-    child.bind(ScmTreeModelProps).toConstantValue({
-        defaultExpansion: 'expanded',
-    });
-    return child;
-}
-
-export function createScmWidgetContainer(parent: interfaces.Container): Container {
-    const child = createScmTreeContainer(parent);
-    child.bind(ScmGroupsTreeModel).toSelf();
-    child.bind(TreeModel).toService(ScmGroupsTreeModel);
-    return child;
-}
+// *****************************************************************************
+// Copyright (C) 2019 Red Hat, Inc. 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 '../../src/browser/style/index.css';
+
+import { interfaces, ContainerModule, Container } from '@theia/core/shared/inversify';
+import {
+    bindViewContribution, FrontendApplicationContribution,
+    WidgetFactory, ViewContainer,
+    WidgetManager, ApplicationShellLayoutMigration,
+    createTreeContainer, TreeModel, TreeModelImpl, StylingParticipant
+} from '@theia/core/lib/browser';
+import { ScmService } from './scm-service';
+import { SCM_WIDGET_FACTORY_ID, ScmContribution, SCM_VIEW_CONTAINER_ID, SCM_VIEW_CONTAINER_TITLE_OPTIONS } from './scm-contribution';
+import { ScmWidget } from './scm-widget';
+import { ScmTreeWidget } from './scm-tree-widget';
+import { ScmCommitWidget } from './scm-commit-widget';
+import { ScmAmendWidget } from './scm-amend-widget';
+import { ScmNoRepositoryWidget } from './scm-no-repository-widget';
+import { ScmTreeModelProps } from './scm-tree-model';
+import { ScmGroupsTreeModel } from './scm-groups-tree-model';
+import { ScmQuickOpenService } from './scm-quick-open-service';
+import { bindDirtyDiff } from './dirty-diff/dirty-diff-module';
+import { ScmDecorationsService } from './decorations/scm-decorations-service';
+import { ScmAvatarService } from './scm-avatar-service';
+import { ScmContextKeyService } from './scm-context-key-service';
+import { ScmLayoutVersion3Migration, ScmLayoutVersion5Migration } from './scm-layout-migrations';
+import { ScmTreeLabelProvider } from './scm-tree-label-provider';
+import { TabBarToolbarContribution } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
+import { ColorContribution } from '@theia/core/lib/browser/color-application-contribution';
+import { LabelProviderContribution } from '@theia/core/lib/browser/label-provider';
+import { bindScmPreferences } from './scm-preferences';
+import { ScmTabBarDecorator } from './decorations/scm-tab-bar-decorator';
+import { TabBarDecorator } from '@theia/core/lib/browser/shell/tab-bar-decorator';
+export default new ContainerModule(bind => {
+    bind(ScmContextKeyService).toSelf().inSingletonScope();
+    bind(ScmService).toSelf().inSingletonScope();
+
+    bind(ScmWidget).toSelf();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: SCM_WIDGET_FACTORY_ID,
+        createWidget: () => {
+            const child = createScmWidgetContainer(container);
+            return child.get(ScmWidget);
+        }
+    })).inSingletonScope();
+
+    bind(ScmCommitWidget).toSelf();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: ScmCommitWidget.ID,
+        createWidget: () => container.get(ScmCommitWidget)
+    })).inSingletonScope();
+
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: ScmTreeWidget.ID,
+        createWidget: () => container.get(ScmTreeWidget)
+    })).inSingletonScope();
+
+    bind(ScmAmendWidget).toSelf();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: ScmAmendWidget.ID,
+        createWidget: () => container.get(ScmAmendWidget)
+    })).inSingletonScope();
+
+    bind(ScmNoRepositoryWidget).toSelf();
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: ScmNoRepositoryWidget.ID,
+        createWidget: () => container.get(ScmNoRepositoryWidget)
+    })).inSingletonScope();
+
+    bind(WidgetFactory).toDynamicValue(({ container }) => ({
+        id: SCM_VIEW_CONTAINER_ID,
+        createWidget: async () => {
+            const viewContainer = container.get<ViewContainer.Factory>(ViewContainer.Factory)({
+                id: SCM_VIEW_CONTAINER_ID,
+                progressLocationId: 'scm'
+            });
+            viewContainer.setTitleOptions(SCM_VIEW_CONTAINER_TITLE_OPTIONS);
+            const widget = await container.get(WidgetManager).getOrCreateWidget(SCM_WIDGET_FACTORY_ID);
+            viewContainer.addWidget(widget, {
+                canHide: false,
+                initiallyCollapsed: false
+            });
+            return viewContainer;
+        }
+    })).inSingletonScope();
+    bind(ApplicationShellLayoutMigration).to(ScmLayoutVersion3Migration).inSingletonScope();
+    bind(ApplicationShellLayoutMigration).to(ScmLayoutVersion5Migration).inSingletonScope();
+
+    bind(ScmQuickOpenService).toSelf().inSingletonScope();
+    bindViewContribution(bind, ScmContribution);
+    bind(FrontendApplicationContribution).toService(ScmContribution);
+    bind(TabBarToolbarContribution).toService(ScmContribution);
+    bind(ColorContribution).toService(ScmContribution);
+    bind(StylingParticipant).toService(ScmContribution);
+
+    bind(ScmDecorationsService).toSelf().inSingletonScope();
+
+    bind(ScmAvatarService).toSelf().inSingletonScope();
+
+    bindDirtyDiff(bind);
+
+    bind(ScmTreeLabelProvider).toSelf().inSingletonScope();
+    bind(LabelProviderContribution).toService(ScmTreeLabelProvider);
+
+    bindScmPreferences(bind);
+
+    bind(ScmTabBarDecorator).toSelf().inSingletonScope();
+    bind(TabBarDecorator).toService(ScmTabBarDecorator);
+});
+
+export function createScmTreeContainer(parent: interfaces.Container): Container {
+    const child = createTreeContainer(parent, {
+        props: {
+            virtualized: true,
+            search: true,
+            multiSelect: true,
+        },
+        widget: ScmTreeWidget,
+    });
+
+    child.unbind(TreeModel);
+    child.unbind(TreeModelImpl);
+
+    child.bind(ScmTreeModelProps).toConstantValue({
+        defaultExpansion: 'expanded',
+    });
+    return child;
+}
+
+export function createScmWidgetContainer(parent: interfaces.Container): Container {
+    const child = createScmTreeContainer(parent);
+    child.bind(ScmGroupsTreeModel).toSelf();
+    child.bind(TreeModel).toService(ScmGroupsTreeModel);
+    return child;
+}

package/src/browser/scm-groups-tree-model.ts

@@ -1,78 +1,78 @@
-// *****************************************************************************
-// 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
-// *****************************************************************************
-
-import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
-import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { ScmService } from './scm-service';
-import { ScmTreeModel } from './scm-tree-model';
-import { ScmResourceGroup, ScmProvider } from './scm-provider';
-
-@injectable()
-export class ScmGroupsTreeModel extends ScmTreeModel {
-
-    @inject(ScmService) protected readonly scmService: ScmService;
-
-    protected readonly toDisposeOnRepositoryChange = new DisposableCollection();
-
-    @postConstruct()
-    protected override init(): void {
-        super.init();
-        this.refreshOnRepositoryChange();
-        this.toDispose.push(this.scmService.onDidChangeSelectedRepository(() => {
-            this.refreshOnRepositoryChange();
-        }));
-    }
-
-    protected refreshOnRepositoryChange(): void {
-        const repository = this.scmService.selectedRepository;
-        if (repository) {
-            this.changeRepository(repository.provider);
-        } else {
-            this.changeRepository(undefined);
-        }
-    }
-
-    protected changeRepository(provider: ScmProvider | undefined): void {
-        this.toDisposeOnRepositoryChange.dispose();
-        this.contextKeys.scmProvider.set(provider ? provider.id : undefined);
-        this.provider = provider;
-        if (provider) {
-            this.toDisposeOnRepositoryChange.push(provider.onDidChange(() => this.root = this.createTree()));
-            if (provider.onDidChangeResources) {
-                this.toDisposeOnRepositoryChange.push(provider.onDidChangeResources(() => this.root = this.createTree()));
-            }
-            this.root = this.createTree();
-        }
-    }
-
-    get rootUri(): string | undefined {
-        if (this.provider) {
-            return this.provider.rootUri;
-        }
-    };
-
-    get groups(): ScmResourceGroup[] {
-        if (this.provider) {
-            return this.provider.groups;
-        } else {
-            return [];
-        }
-    };
-
-    canTabToWidget(): boolean {
-        return !!this.provider;
-    }
-}
+// *****************************************************************************
+// 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
+// *****************************************************************************
+
+import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
+import { DisposableCollection } from '@theia/core/lib/common/disposable';
+import { ScmService } from './scm-service';
+import { ScmTreeModel } from './scm-tree-model';
+import { ScmResourceGroup, ScmProvider } from './scm-provider';
+
+@injectable()
+export class ScmGroupsTreeModel extends ScmTreeModel {
+
+    @inject(ScmService) protected readonly scmService: ScmService;
+
+    protected readonly toDisposeOnRepositoryChange = new DisposableCollection();
+
+    @postConstruct()
+    protected override init(): void {
+        super.init();
+        this.refreshOnRepositoryChange();
+        this.toDispose.push(this.scmService.onDidChangeSelectedRepository(() => {
+            this.refreshOnRepositoryChange();
+        }));
+    }
+
+    protected refreshOnRepositoryChange(): void {
+        const repository = this.scmService.selectedRepository;
+        if (repository) {
+            this.changeRepository(repository.provider);
+        } else {
+            this.changeRepository(undefined);
+        }
+    }
+
+    protected changeRepository(provider: ScmProvider | undefined): void {
+        this.toDisposeOnRepositoryChange.dispose();
+        this.contextKeys.scmProvider.set(provider ? provider.id : undefined);
+        this.provider = provider;
+        if (provider) {
+            this.toDisposeOnRepositoryChange.push(provider.onDidChange(() => this.root = this.createTree()));
+            if (provider.onDidChangeResources) {
+                this.toDisposeOnRepositoryChange.push(provider.onDidChangeResources(() => this.root = this.createTree()));
+            }
+            this.root = this.createTree();
+        }
+    }
+
+    get rootUri(): string | undefined {
+        if (this.provider) {
+            return this.provider.rootUri;
+        }
+    };
+
+    get groups(): ScmResourceGroup[] {
+        if (this.provider) {
+            return this.provider.groups;
+        } else {
+            return [];
+        }
+    };
+
+    canTabToWidget(): boolean {
+        return !!this.provider;
+    }
+}