diff options
| author | Vsevolod Kukol <sevoku@microsoft.com> | 2019-08-15 13:15:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-15 13:15:38 +0300 |
| commit | 261b437786899be4239e8990e7a4e2661cacc106 (patch) | |
| tree | d6fd616d5d297b7fcf14d3f6a159fb180469fc18 /main | |
| parent | fc9b1657dce30c6bf2046fcd37e14ace4a0333a8 (diff) | |
| parent | 86a7366187625da65e28087e5bb3d69ac25206f7 (diff) | |
Merge pull request #8196 from mono/backport-pr-8195-to-release-8.2
[release-8.2] Fixes VSTS FeedbackTicket 943824: Diff Incorrect
Diffstat (limited to 'main')
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 d3757a0e81..ca73d7011c 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; @@ -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> ()?.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 408ad6a88f..33aeba3529 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; @@ -51,7 +52,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; |