Merge branch 'master' into fixes/1158-merge-base-crash

Author: grokys

src/GitHub.InlineReviews/Commands/InlineCommentNavigationCommand.cs

@@ -5,6 +5,7 @@
 using GitHub.Extensions;
 using GitHub.InlineReviews.Services;
 using GitHub.InlineReviews.Tags;
+using GitHub.VisualStudio;
 using Microsoft.VisualStudio;
 using Microsoft.VisualStudio.ComponentModelHost;
 using Microsoft.VisualStudio.Editor;
@@ -98,72 +99,83 @@ protected int GetCursorPoint(ITextView textView, int lineNumber)
         /// </remarks>
         protected IEnumerable<ITextView> GetCurrentTextViews()
         {
-            var serviceProvider = Package;
-            var monitorSelection = (IVsMonitorSelection)serviceProvider.GetService(typeof(SVsShellMonitorSelection));
-            if (monitorSelection == null)
-            {
-                yield break;
-            }
+            var result = new List<ITextView>();
 
-            object curDocument;
-            if (ErrorHandler.Failed(monitorSelection.GetCurrentElementValue((uint)VSConstants.VSSELELEMID.SEID_DocumentFrame, out curDocument)))
+            try
             {
-                yield break;
-            }
+                var serviceProvider = Package;
+                var monitorSelection = (IVsMonitorSelection)serviceProvider.GetService(typeof(SVsShellMonitorSelection));
+                if (monitorSelection == null)
+                {
+                    return result;
+                }
 
-            IVsWindowFrame frame = curDocument as IVsWindowFrame;
-            if (frame == null)
-            {
-                yield break;
-            }
+                object curDocument;
+                if (ErrorHandler.Failed(monitorSelection.GetCurrentElementValue((uint)VSConstants.VSSELELEMID.SEID_DocumentFrame, out curDocument)))
+                {
+                    return result;
+                }
 
-            object docView = null;
-            if (ErrorHandler.Failed(frame.GetProperty((int)__VSFPROPID.VSFPROPID_DocView, out docView)))
-            {
-                yield break;
-            }
+                IVsWindowFrame frame = curDocument as IVsWindowFrame;
+                if (frame == null)
+                {
+                    return result;
+                }
 
-            if (docView is IVsDifferenceCodeWindow)
-            {
-                var diffWindow = (IVsDifferenceCodeWindow)docView;
-                
-                switch (diffWindow.DifferenceViewer.ViewMode)
+                object docView = null;
+                if (ErrorHandler.Failed(frame.GetProperty((int)__VSFPROPID.VSFPROPID_DocView, out docView)))
                 {
-                    case DifferenceViewMode.Inline:
-                        yield return diffWindow.DifferenceViewer.InlineView;
-                        break;
-                    case DifferenceViewMode.SideBySide:
-                        switch (diffWindow.DifferenceViewer.ActiveViewType)
-                        {
-                            case DifferenceViewType.LeftView:
-                                yield return diffWindow.DifferenceViewer.LeftView;
-                                yield return diffWindow.DifferenceViewer.RightView;
-                                break;
-                            case DifferenceViewType.RightView:
-                                yield return diffWindow.DifferenceViewer.RightView;
-                                yield return diffWindow.DifferenceViewer.LeftView;
-                                break;
-                        }
-                        yield return diffWindow.DifferenceViewer.LeftView;
-                        break;
-                    case DifferenceViewMode.RightViewOnly:
-                        yield return diffWindow.DifferenceViewer.RightView;
-                        break;
+                    return result;
                 }
-            }
-            else if (docView is IVsCodeWindow)
-            {
-                IVsTextView textView;
-                if (ErrorHandler.Failed(((IVsCodeWindow)docView).GetPrimaryView(out textView)))
+
+                if (docView is IVsDifferenceCodeWindow)
                 {
-                    yield break;
+                    var diffWindow = (IVsDifferenceCodeWindow)docView;
+
+                    switch (diffWindow.DifferenceViewer.ViewMode)
+                    {
+                        case DifferenceViewMode.Inline:
+                            result.Add(diffWindow.DifferenceViewer.InlineView);
+                            break;
+                        case DifferenceViewMode.SideBySide:
+                            switch (diffWindow.DifferenceViewer.ActiveViewType)
+                            {
+                                case DifferenceViewType.LeftView:
+                                    result.Add(diffWindow.DifferenceViewer.LeftView);
+                                    result.Add(diffWindow.DifferenceViewer.RightView);
+                                    break;
+                                case DifferenceViewType.RightView:
+                                    result.Add(diffWindow.DifferenceViewer.RightView);
+                                    result.Add(diffWindow.DifferenceViewer.LeftView);
+                                    break;
+                            }
+                            result.Add(diffWindow.DifferenceViewer.LeftView);
+                            break;
+                        case DifferenceViewMode.RightViewOnly:
+                            result.Add(diffWindow.DifferenceViewer.RightView);
+                            break;
+                    }
                 }
+                else if (docView is IVsCodeWindow)
+                {
+                    IVsTextView textView;
+                    if (ErrorHandler.Failed(((IVsCodeWindow)docView).GetPrimaryView(out textView)))
+                    {
+                        return result;
+                    }
 
-                var model = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
-                var adapterFactory = model.GetService<IVsEditorAdaptersFactoryService>();
-                var wpfTextView = adapterFactory.GetWpfTextView(textView);
-                yield return wpfTextView;
+                    var model = (IComponentModel)serviceProvider.GetService(typeof(SComponentModel));
+                    var adapterFactory = model.GetService<IVsEditorAdaptersFactoryService>();
+                    var wpfTextView = adapterFactory.GetWpfTextView(textView);
+                    result.Add(wpfTextView);
+                }
+            }
+            catch (Exception e)
+            {
+                VsOutputLogger.WriteLine("Exception in InlineCommentNavigationCommand.GetCurrentTextViews(): {0}", e);
             }
+
+            return result;
         }
 
         /// <summary>

src/GitHub.VisualStudio/UI/Views/PullRequestDetailView.xaml.cs

@@ -87,7 +87,7 @@ async Task DoOpenFile(IPullRequestFileNode file, bool workingDirectory)
                 var fullPath = ViewModel.GetLocalFilePath(file);
                 var fileName = workingDirectory ? fullPath : await ViewModel.ExtractFile(file, true);
 
-                using (new NewDocumentStateScope(__VSNEWDOCUMENTSTATE.NDS_Provisional, VSConstants.NewDocumentStateReason.SolutionExplorer))
+                using (workingDirectory ? null : OpenInProvisionalTab())
                 {
                     var window = Services.Dte.ItemOperations.OpenFile(fileName);
                     window.Document.ReadOnly = !workingDirectory;
@@ -127,7 +127,7 @@ async Task DoDiffFile(IPullRequestFileNode file, bool workingDirectory)
                 }
 
                 IVsWindowFrame frame;
-                using (new NewDocumentStateScope(__VSNEWDOCUMENTSTATE.NDS_Provisional, VSConstants.NewDocumentStateReason.SolutionExplorer))
+                using (OpenInProvisionalTab())
                 {
                     var tooltip = $"{leftLabel}\nvs.\n{rightLabel}";
 
@@ -315,5 +315,12 @@ void OpenHyperlink(object sender, ExecutedRoutedEventArgs e)
                 VisualStudioBrowser.OpenUrl(uri);
             }
         }
+
+        static IDisposable OpenInProvisionalTab()
+        {
+            return new NewDocumentStateScope
+                (__VSNEWDOCUMENTSTATE.NDS_Provisional,
+                VSConstants.NewDocumentStateReason.SolutionExplorer);
+        }
     }
 }