fixes #3139

src/vs/workbench/parts/git/browser/gitActions.contribution.ts

@@ -28,7 +28,7 @@ import {IFileService} from 'vs/platform/files/common/files';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import wbar = require('vs/workbench/common/actionRegistry');
 import { SyncActionDescriptor } from 'vs/platform/actions/common/actions';
-import { OpenChangeAction, SyncAction, PullAction, PushAction, PublishAction, StartGitBranchAction, StartGitCheckoutAction } from './gitActions';
+import { OpenChangeAction, OpenFileAction, SyncAction, PullAction, PushAction, PublishAction, StartGitBranchAction, StartGitCheckoutAction } from './gitActions';
 import paths = require('vs/base/common/paths');
 import URI from 'vs/base/common/uri';
 
@@ -428,6 +428,39 @@ class GlobalOpenChangeAction extends OpenChangeAction {
 	}
 }
 
+class GlobalOpenInEditorAction extends OpenFileAction {
+
+	static ID = 'workbench.git.action.globalOpenFile';
+	static LABEL = nls.localize('openFile', "Open File");
+
+	constructor(
+		id = GlobalOpenInEditorAction.ID,
+		label = GlobalOpenInEditorAction.LABEL,
+		@IWorkbenchEditorService editorService: IWorkbenchEditorService,
+		@IFileService fileService: IFileService,
+		@IGitService gitService: IGitService,
+		@IWorkspaceContextService contextService: IWorkspaceContextService
+	) {
+		super(editorService, fileService, gitService, contextService);
+	}
+
+	public run(event?: any): TPromise<any> {
+		const input = WorkbenchEditorCommon.asFileEditorInput(this.editorService.getActiveEditorInput(), true);
+
+		if (!input) {
+			return TPromise.as(null);
+		}
+
+		const status = getStatus(this.gitService, this.contextService, input);
+
+		if (!status) {
+			return TPromise.as(null);
+		}
+
+		return super.run(status);
+	}
+}
+
 var actionBarRegistry = <abr.IActionBarRegistry> platform.Registry.as(abr.Extensions.Actionbar);
 actionBarRegistry.registerActionBarContributor(abr.Scope.EDITOR, FileEditorActionContributor);
 actionBarRegistry.registerActionBarContributor(abr.Scope.EDITOR, GitEditorActionContributor);
@@ -438,6 +471,7 @@ let workbenchActionRegistry = (<wbar.IWorkbenchActionRegistry> platform.Registry
 // Register Actions
 const category = nls.localize('git', "Git");
 workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenChangeAction, GlobalOpenChangeAction.ID, GlobalOpenChangeAction.LABEL), category);
+workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(GlobalOpenInEditorAction, GlobalOpenInEditorAction.ID, GlobalOpenInEditorAction.LABEL), category);
 workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PullAction, PullAction.ID, PullAction.LABEL), category);
 workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(PushAction, PushAction.ID, PushAction.LABEL), category);
 workbenchActionRegistry.registerWorkbenchAction(new SyncActionDescriptor(SyncAction, SyncAction.ID, SyncAction.LABEL), category);

src/vs/workbench/parts/git/browser/gitActions.ts

@@ -128,9 +128,9 @@ export class OpenFileAction extends GitAction {
 	private static DELETED_STATES = [Status.BOTH_DELETED, Status.DELETED, Status.DELETED_BY_US, Status.INDEX_DELETED];
 	static ID = 'workbench.action.openFile';
 
-	private fileService: IFileService;
-	private editorService: IWorkbenchEditorService;
-	private contextService: IWorkspaceContextService;
+	protected fileService: IFileService;
+	protected editorService: IWorkbenchEditorService;
+	protected contextService: IWorkspaceContextService;
 
 	constructor(@IWorkbenchEditorService editorService: IWorkbenchEditorService, @IFileService fileService: IFileService, @IGitService gitService: IGitService, @IWorkspaceContextService contextService: IWorkspaceContextService) {
 		super(OpenFileAction.ID, nls.localize('openFile', "Open File"), 'git-action open-file', gitService);