Skip to content

Fix issue where goto-def wouldn't go to the right place after invokining twice in a MAS file. #77405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CyrusNajmabadi merged 1 commit into from
Mar 4, 2025
Merged

Fix issue where goto-def wouldn't go to the right place after invokining twice in a MAS file. #77405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/EditorFeatures/Core/GoToDefinition/GoToDefinitionCommandHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,11 @@ namespace Microsoft.CodeAnalysis.GoToDefinition;
[method: ImportingConstructor]
[method: SuppressMessage("RoslynDiagnosticsReliability", "RS0033:Importing constructor should be [Obsolete]", Justification = "Used in test code: https://github.com/dotnet/roslyn/issues/42814")]
internal class GoToDefinitionCommandHandler(
IGlobalOptionService globalOptionService,
IThreadingContext threadingContext,
IUIThreadOperationExecutor executor,
IAsynchronousOperationListenerProvider listenerProvider) :
ICommandHandler<GoToDefinitionCommandArgs>
{
private readonly IGlobalOptionService _globalOptionService = globalOptionService;
private readonly IThreadingContext _threadingContext = threadingContext;
private readonly IUIThreadOperationExecutor _executor = executor;
private readonly IAsynchronousOperationListener _listener = listenerProvider.GetListener(FeatureAttribute.GoToDefinition);

public string DisplayName => EditorFeaturesResources.Go_to_Definition;
Expand Down
6 changes: 0 additions & 6 deletions src/EditorFeatures/Test2/GoToDefinition/GoToDefinitionCommandHandlerTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ class C
Dim provider = workspace.GetService(Of IAsynchronousOperationListenerProvider)()
Dim waiter = provider.GetWaiter(FeatureAttribute.GoToDefinition)
Dim handler = New GoToDefinitionCommandHandler(
workspace.GetService(Of IGlobalOptionService),
workspace.GetService(Of IThreadingContext),
workspace.GetService(Of IUIThreadOperationExecutor),
provider)

handler.ExecuteCommand(New GoToDefinitionCommandArgs(view, baseDocument.GetTextBuffer()), TestCommandExecutionContext.Create())
Expand Down Expand Up @@ -98,9 +96,7 @@ int y = x$$</Document>
Dim provider = workspace.GetService(Of IAsynchronousOperationListenerProvider)()
Dim waiter = provider.GetWaiter(FeatureAttribute.GoToDefinition)
Dim handler = New GoToDefinitionCommandHandler(
workspace.GetService(Of IGlobalOptionService),
workspace.GetService(Of IThreadingContext),
workspace.GetService(Of IUIThreadOperationExecutor),
provider)

handler.ExecuteCommand(New GoToDefinitionCommandArgs(view, document.GetTextBuffer()), TestCommandExecutionContext.Create())
Expand Down Expand Up @@ -143,9 +139,7 @@ class C
Dim provider = workspace.GetService(Of IAsynchronousOperationListenerProvider)()
Dim waiter = provider.GetWaiter(FeatureAttribute.GoToDefinition)
Dim handler = New GoToDefinitionCommandHandler(
workspace.GetService(Of IGlobalOptionService),
workspace.GetService(Of IThreadingContext),
workspace.GetService(Of IUIThreadOperationExecutor),
provider)

Dim snapshot = document.GetTextBuffer().CurrentSnapshot
Expand Down
6 changes: 6 additions & 0 deletions src/VisualStudio/Core/Def/Workspace/VisualStudioSymbolNavigationService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,13 @@ internal sealed partial class VisualStudioSymbolNavigationService(
ErrorHandler.ThrowOnFailure(windowFrame.SetProperty((int)__VSFPROPID5.VSFPROPID_OverrideToolTip, result.DocumentTooltip));
}

// Subtle issue. We may already be in a provisional-tab. 'Showing' the window frame here will cause it to
// to take over the curren provisional-tab, cause a wait-indicators in the original to be dismissed (causing
// cancellation). To avoid that problem, we disable cancellation from this point. While not ideal, it is
// not problematic as we already forced the document to be opened here. So actually navigating to the
// location in it is effectively free.
windowFrame.Show();
cancellationToken = default;

var openedDocument = textBuffer?.AsTextContainer().GetRelatedDocuments().FirstOrDefault();
if (openedDocument != null)
Expand Down
Loading