From 00be1b7a4defc60db1b3c6096d3e2f4924203e84 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 29 Jun 2016 14:27:34 +0200 Subject: [PATCH] fixes #6685 --- .../parts/git/browser/gitActions.contribution.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts index 71fefe50a2f..7b7d2894291 100644 --- a/src/vs/workbench/parts/git/browser/gitActions.contribution.ts +++ b/src/vs/workbench/parts/git/browser/gitActions.contribution.ts @@ -97,10 +97,11 @@ class OpenInDiffAction extends baseeditor.EditorInputAction { return getStatus(this.gitService, this.contextService, this.input); } - public run(event?: any): TPromise { - var sideBySide = !!(event && (event.ctrlKey || event.metaKey)); - var editor = this.editorService.getActiveEditor().getControl(); - var viewState = editor ? editor.saveViewState() : null; + public run(context?: WorkbenchEditorCommon.IEditorContext): TPromise { + const event = context ? context.event : null; + const sideBySide = !!(event && (event.ctrlKey || event.metaKey)); + const editor = this.editorService.getActiveEditor().getControl(); + const viewState = editor ? editor.saveViewState() : null; return this.gitService.getInput(this.getStatus()).then((input) => { var promise = TPromise.as(null); @@ -176,9 +177,10 @@ class OpenInEditorAction extends baseeditor.EditorInputAction { return true; } - public run(event?: any): TPromise { + public run(context?: WorkbenchEditorCommon.IEditorContext): TPromise { const model = this.gitService.getModel(); const resource = URI.file(paths.join(model.getRepositoryRoot(), this.getRepositoryRelativePath())); + const event = context ? context.event : null; const sideBySide = !!(event && (event.ctrlKey || event.metaKey)); const modifiedViewState = this.saveTextViewState(); -- GitLab