Properly support TableEntryNavigateEventArgs.ShouldActivate

dotnet · Nov 19, 2021 · 404a1cd · 404a1cd
1 parent 0433307
commit 404a1cd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/Entries/DocumentSpanEntry.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/Entries/DocumentSpanEntry.cs
@@ -293,7 +293,7 @@ public bool CanNavigateTo()
                 return false;
             }
 
-            public Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken)
+            public Task NavigateToAsync(bool isPreview, bool shouldActivate, CancellationToken cancellationToken)
             {
                 Contract.ThrowIfFalse(CanNavigateTo());
 
@@ -309,7 +309,9 @@ public Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken)
                     workspace,
                     _excerptResult.Document.Id,
                     _excerptResult.Span,
-                    solution.Options.WithChangedOption(NavigationOptions.PreferProvisionalTab, isPreview),
+                    solution.Options
+                        .WithChangedOption(NavigationOptions.PreferProvisionalTab, isPreview)
+                        .WithChangedOption(NavigationOptions.ActivateTab, shouldActivate),
                     cancellationToken);
             }
         }

diff --git a/...isualStudio/Core/Def/Implementation/FindReferences/Entries/MetadataDefinitionItemEntry.cs b/...isualStudio/Core/Def/Implementation/FindReferences/Entries/MetadataDefinitionItemEntry.cs
@@ -37,9 +37,9 @@ public MetadataDefinitionItemEntry(
             public bool CanNavigateTo()
                 => true;
 
-            public Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken)
+            public Task NavigateToAsync(bool isPreview, bool shouldActivate, CancellationToken cancellationToken)
                 => DefinitionBucket.DefinitionItem.TryNavigateToAsync(
-                    Presenter._workspace, showInPreviewTab: isPreview, activateTab: !isPreview, cancellationToken); // Only activate the tab if not opening in preview
+                    Presenter._workspace, showInPreviewTab: isPreview, activateTab: shouldActivate, cancellationToken); // Only activate the tab if requested
 
             protected override IList<Inline> CreateLineTextInlines()
                 => DefinitionBucket.DefinitionItem.DisplayParts

diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/Entries/SimpleMessageEntry.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/Entries/SimpleMessageEntry.cs
@@ -48,11 +48,11 @@ public static Task<Entry> CreateAsync(
             public bool CanNavigateTo()
                 => _navigationBucket != null && _navigationBucket.CanNavigateTo();
 
-            public Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken)
+            public Task NavigateToAsync(bool isPreview, bool shouldActivate, CancellationToken cancellationToken)
             {
                 Contract.ThrowIfFalse(CanNavigateTo());
                 Contract.ThrowIfNull(_navigationBucket);
-                return _navigationBucket.NavigateToAsync(isPreview, cancellationToken);
+                return _navigationBucket.NavigateToAsync(isPreview, shouldActivate, cancellationToken);
             }
         }
     }

diff --git a/...ore/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs b/...ore/Def/Implementation/FindReferences/FindReferencesTableControlEventProcessorProvider.cs
@@ -82,7 +82,7 @@ async static Task ProcessNavigateAsync(
                         allowCancellation: true,
                         showProgress: false);
 
-                    await supportsNavigation.NavigateToAsync(e.IsPreview, context.UserCancellationToken).ConfigureAwait(false);
+                    await supportsNavigation.NavigateToAsync(e.IsPreview, e.ShouldActivate, context.UserCancellationToken).ConfigureAwait(false);
                 }
             }
         }

diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/ISupportsNavigation.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/ISupportsNavigation.cs
@@ -10,6 +10,6 @@ namespace Microsoft.VisualStudio.LanguageServices.FindUsages
     internal interface ISupportsNavigation
     {
         bool CanNavigateTo();
-        Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken);
+        Task NavigateToAsync(bool isPreview, bool shouldActivate, CancellationToken cancellationToken);
     }
 }
diff --git a/src/VisualStudio/Core/Def/Implementation/FindReferences/RoslynDefinitionBucket.cs b/src/VisualStudio/Core/Def/Implementation/FindReferences/RoslynDefinitionBucket.cs
@@ -66,9 +66,9 @@ public static RoslynDefinitionBucket Create(
             public bool CanNavigateTo()
                 => true;
 
-            public Task NavigateToAsync(bool isPreview, CancellationToken cancellationToken)
+            public Task NavigateToAsync(bool isPreview, bool shouldActivate, CancellationToken cancellationToken)
                 => DefinitionItem.TryNavigateToAsync(
-                    _presenter._workspace, showInPreviewTab: isPreview, activateTab: !isPreview, cancellationToken); // Only activate the tab if not opening in preview
+                    _presenter._workspace, showInPreviewTab: isPreview, activateTab: shouldActivate, cancellationToken); // Only activate the tab if requested
 
             public override bool TryGetValue(string key, out object? content)
             {