Fix caret affinity in GetReferencedSymbolsToLeftOfCaretAsync

dotnet · Mar 30, 2021 · d10df88 · d10df88
1 parent fb2d906
commit d10df88
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs b/src/VisualStudio/Core/Def/Implementation/Snippets/AbstractSnippetExpansionClient.cs
@@ -722,7 +722,13 @@ private static async Task<ImmutableArray<ISymbol>> GetReferencedSymbolsToLeftOfC
  CancellationToken cancellationToken)
  {
  var semanticModel = await document.GetRequiredSemanticModelAsync(cancellationToken).ConfigureAwait(false);
- var token = await semanticModel.SyntaxTree.GetTouchingTokenAsync(caretPosition.Position, cancellationToken).ConfigureAwait(false);
+
+ // GetTouchingTokenAsync prefers to return tokens to the right of the caret. Adjust the caret position one
+ // to the left to avoid this.
+ if (caretPosition.Position == 0)
+ return ImmutableArray<ISymbol>.Empty;
+
+ var token = await semanticModel.SyntaxTree.GetTouchingTokenAsync(caretPosition.Position - 1, cancellationToken).ConfigureAwait(false);
  var semanticInfo = semanticModel.GetSemanticInfo(token, document.Project.Solution.Workspace, cancellationToken);
  return semanticInfo.ReferencedSymbols;
  }

diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpArgumentProvider.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpArgumentProvider.cs
@@ -57,6 +57,34 @@ public void Method()
  VisualStudio.Editor.Verify.CurrentLineText("f.ToString()$$", assertCaretPosition: true);
  }
 
+ [WpfFact]
+ public void TabTabBeforeSemicolon()
+ {
+ SetUpEditor(@"
+public class Test
+{
+ private object f;
+
+ public void Method()
+ {
+ $$;
+ }
+}
+");
+
+ VisualStudio.Editor.SendKeys("f.ToSt");
+
+ VisualStudio.Editor.SendKeys(VirtualKey.Tab);
+ VisualStudio.Editor.Verify.CurrentLineText("f.ToString$$;", assertCaretPosition: true);
+
+ VisualStudio.Editor.SendKeys(VirtualKey.Tab);
+ VisualStudio.Workspace.WaitForAllAsyncOperations(Helper.HangMitigatingTimeout, FeatureAttribute.SignatureHelp);
+ VisualStudio.Editor.Verify.CurrentLineText("f.ToString($$);", assertCaretPosition: true);
+
+ VisualStudio.Editor.SendKeys(VirtualKey.Tab);
+ VisualStudio.Editor.Verify.CurrentLineText("f.ToString()$$;", assertCaretPosition: true);
+ }
+
  [WpfFact]
  public void TabTabCompletionWithArguments()
  {