diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2019-07-19 11:17:48 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-19 11:17:48 +0300 |
| commit | 95d1b28b02ac6f0f56cd285ad70e6cc06d7fff0e (patch) | |
| tree | beb40b422082a7425dcfba5ce0d374e28cf2eee4 | |
| parent | cb6fd80caf76e8896383d7a0383960dd8eac8401 (diff) | |
| parent | c8bf8c6416beab7bcc61841629ac4a61f58716fa (diff) | |
Merge pull request #8195 from mono/master-vsts943824
Fixes VSTS FeedbackTicket 943824: Diff Incorrect
2 files changed, 12 insertions, 2 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs index ca53d8f23d..3d337b01d3 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/BlameCommand.cs @@ -26,6 +26,7 @@ using System.Linq; using System.Threading.Tasks; +using Microsoft.VisualStudio.Text.Editor; using Mono.Addins; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; @@ -53,7 +54,11 @@ namespace MonoDevelop.VersionControl foreach (var item in items) { var document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer); - document?.GetContent<VersionControlDocumentController> ()?.ShowBlameView (); + if (document == null) + continue; + document.RunWhenContentAdded<ITextView> (tv => { + document.GetContent<VersionControlDocumentController> ()?.ShowBlameView (); + }); } return true; diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs index 8044332165..262e303734 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/DiffCommand.cs @@ -26,6 +26,7 @@ using System.Linq; using System.Threading.Tasks; +using Microsoft.VisualStudio.Text.Editor; using Mono.Addins; using MonoDevelop.Ide; using MonoDevelop.Ide.Gui; @@ -52,7 +53,11 @@ namespace MonoDevelop.VersionControl foreach (var item in items) { var document = await IdeApp.Workbench.OpenDocument (item.Path, item.ContainerProject, OpenDocumentOptions.Default | OpenDocumentOptions.OnlyInternalViewer); - document?.GetContent<VersionControlDocumentController> ()?.ShowDiffView (); + if (document == null) + continue; + document.RunWhenContentAdded<ITextView> (tv => { + document.GetContent<VersionControlDocumentController> ()?.ShowDiffView (); + }); } return true; |