[plugin] Implement SCM Repository selected event

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>
eclipse-theia · Sep 11, 2019 · 219425b · 219425b
1 parent e93b1d4
commit 219425b
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 6 deletions.
diff --git a/packages/plugin-ext/src/common/plugin-api-rpc.ts b/packages/plugin-ext/src/common/plugin-api-rpc.ts
@@ -565,6 +565,7 @@ export interface ScmExt {
     $updateInputBox(sourceControlHandle: number, message: string): Promise<void>;
     $executeResourceCommand(sourceControlHandle: number, groupHandle: number, resourceHandle: number): Promise<void>;
     $provideOriginalResource(sourceControlHandle: number, uri: string, token: CancellationToken): Promise<UriComponents | undefined>;
+    $setSourceControlSelection(sourceControlHandle: number, selected: boolean): Promise<void>;
 }
 
 export interface DecorationsExt {

diff --git a/packages/plugin-ext/src/main/browser/scm-main.ts b/packages/plugin-ext/src/main/browser/scm-main.ts
@@ -37,12 +37,30 @@ export class ScmMainImpl implements ScmMain {
     private readonly scmService: ScmService;
     private readonly scmRepositoryMap: Map<number, ScmRepository>;
     private readonly labelProvider: LabelProvider;
+    private lastSelectedSourceControlHandle: number | undefined;
 
     constructor(rpc: RPCProtocol, container: interfaces.Container) {
         this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.SCM_EXT);
         this.scmService = container.get(ScmService);
         this.scmRepositoryMap = new Map();
         this.labelProvider = container.get(LabelProvider);
+        this.scmService.onDidChangeSelectedRepository(repository => {
+            const sourceControlHandle = repository ? this.getSourceControlHandle(repository) : undefined;
+            if (sourceControlHandle !== undefined) {
+                this.proxy.$setSourceControlSelection(sourceControlHandle, true);
+            }
+            if (this.lastSelectedSourceControlHandle !== undefined && this.lastSelectedSourceControlHandle !== sourceControlHandle) {
+                this.proxy.$setSourceControlSelection(this.lastSelectedSourceControlHandle, false);
+            }
+            this.lastSelectedSourceControlHandle = sourceControlHandle;
+        });
+    }
+
+    getSourceControlHandle(repository: ScmRepository): number | undefined {
+        return Array.from(this.scmRepositoryMap.keys()).find(key => {
+            const scmRepository = this.scmRepositoryMap.get(key);
+            return scmRepository !== undefined && scmRepository.provider.rootUri === repository.provider.rootUri;
+        });
     }
 
     async $registerSourceControl(sourceControlHandle: number, id: string, label: string, rootUri: string): Promise<void> {

diff --git a/packages/plugin-ext/src/plugin/scm.ts b/packages/plugin-ext/src/plugin/scm.ts
@@ -23,6 +23,7 @@ import { UriComponents } from '../common/uri-components';
 import URI from '@theia/core/lib/common/uri';
 import { CommandRegistryImpl } from './command-registry';
 import { ScmCommand } from '@theia/scm/lib/browser/scm-provider';
+import { Emitter } from '@theia/core/lib/common/event';
 
 export class ScmExtImpl implements ScmExt {
     private handle: number = 0;
@@ -97,6 +98,13 @@ export class ScmExtImpl implements ScmExt {
             sourceControl.inputBox.$updateValue(value);
         }
     }
+
+    async $setSourceControlSelection(sourceControlHandle: number, selected: boolean): Promise<void> {
+        const sourceControl = this.sourceControlMap.get(sourceControlHandle);
+        if (sourceControl) {
+            sourceControl.selected = selected;
+        }
+    }
 }
 
 class InputBoxImpl implements theia.SourceControlInputBox {
@@ -142,9 +150,13 @@ class SourceControlImpl implements theia.SourceControl {
     private _commitTemplate: string | undefined;
     private _acceptInputCommand: theia.Command | undefined;
     private _statusBarCommands: theia.Command[] | undefined;
+    private _selected: boolean = false;
 
     private readonly toDispose = new DisposableCollection();
 
+    private readonly onDidChangeSelectionEmitter = new Emitter<boolean>();
+    readonly onDidChangeSelection: theia.Event<boolean> = this.onDidChangeSelectionEmitter.event;
+
     constructor(
         private proxy: ScmMain,
         private commands: CommandRegistryImpl,
@@ -254,6 +266,15 @@ class SourceControlImpl implements theia.SourceControl {
     getResourceGroup(handle: number): SourceControlResourceGroupImpl | undefined {
         return this.resourceGroupsMap.get(handle);
     }
+
+    get selected(): boolean {
+        return this._selected;
+    }
+
+    set selected(selected: boolean) {
+        this._selected = selected;
+        this.onDidChangeSelectionEmitter.fire(selected);
+    }
 }
 
 class SourceControlResourceGroupImpl implements theia.SourceControlResourceGroup {

diff --git a/packages/plugin/src/theia-proposed.d.ts b/packages/plugin/src/theia-proposed.d.ts
@@ -131,12 +131,6 @@ declare module '@theia/plugin' {
         value: string;
     }
 
-    export interface SourceControlResourceDecorations {
-        source?: string;
-        letter?: string;
-        color?: ThemeColor;
-    }
-
     /**
      * Enumeration of the supported operating systems.
      */
@@ -172,6 +166,19 @@ declare module '@theia/plugin' {
         source?: string;
     }
 
+    export interface SourceControl {
+
+        /**
+         * Whether the source control is selected.
+         */
+        readonly selected: boolean;
+
+        /**
+         * An event signaling when the selection state changes.
+         */
+        readonly onDidChangeSelection: Event<boolean>;
+    }
+
     export interface SourceControlResourceDecorations {
         source?: string;
         letter?: string;