[SCM] Fix SCM status bar commands

packages/plugin-ext/src/common/plugin-api-rpc.ts

@@ -70,7 +70,6 @@ import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-sch
 import { DebuggerDescription } from '@theia/debug/lib/common/debug-service';
 import { DebugProtocol } from 'vscode-debugprotocol';
 import { SymbolInformation } from 'vscode-languageserver-types';
-import { ScmCommand } from '@theia/scm/lib/browser/scm-provider';
 import { ArgumentProcessor } from '../plugin/command-registry';
 import { MaybePromise } from '@theia/core/lib/common/types';
 import { QuickOpenItem, QuickOpenItemOptions } from '@theia/core/lib/common/quick-open-model';
@@ -607,8 +606,8 @@ export interface SourceControlProviderFeatures {
     hasQuickDiffProvider?: boolean;
     count?: number;
     commitTemplate?: string;
-    acceptInputCommand?: ScmCommand;
-    statusBarCommands?: ScmCommand[];
+    acceptInputCommand?: Command;
+    statusBarCommands?: Command[];
 }
 
 export interface SourceControlGroupFeatures {

packages/plugin-ext/src/main/browser/scm-main.ts

@@ -189,11 +189,23 @@ export class PluginScmProvider implements ScmProvider {
     }
 
     get acceptInputCommand(): ScmCommand | undefined {
-        return this.features.acceptInputCommand;
+        const command = this.features.acceptInputCommand;
+        if (command) {
+            const scmCommand: ScmCommand = command;
+            scmCommand.command = command.id;
+            return command;
+        }
     }
 
     get statusBarCommands(): ScmCommand[] | undefined {
-        return this.features.statusBarCommands;
+        const commands = this.features.statusBarCommands;
+        if (commands) {
+            return commands.map(command => {
+                const scmCommand: ScmCommand = command;
+                scmCommand.command = command.id;
+                return scmCommand;
+            });
+        }
     }
 
     get count(): number | undefined {

packages/plugin-ext/src/plugin/scm.ts

@@ -22,8 +22,8 @@ import { DisposableCollection, Disposable } from '@theia/core/lib/common/disposa
 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';
+import { Command } from '../common/plugin-api-rpc-model';
 
 export class ScmExtImpl implements ScmExt {
     private handle: number = 0;
@@ -254,7 +254,7 @@ class SourceControlImpl implements theia.SourceControl {
 
         this._statusBarCommands = statusBarCommands;
 
-        let safeStatusBarCommands: ScmCommand[] | undefined;
+        let safeStatusBarCommands: Command[] | undefined;
         if (statusBarCommands) {
             safeStatusBarCommands = statusBarCommands.map(statusBarCommand => this.commands.converter.toSafeCommand(statusBarCommand, this.toDisposeOnStatusBarCommands));
         }

packages/scm/src/browser/scm-contribution.ts

@@ -169,6 +169,7 @@ export class ScmContribution extends AbstractViewContribution<ScmWidget> impleme
             text: value.title,
             tooltip: label + (value.tooltip ? ` - ${value.tooltip}` : ''),
             command: value.command,
+            arguments: value.arguments,
             alignment: StatusBarAlignment.LEFT,
             priority: 100
         }));