Skip to content
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

Jump to bottom

Handle more cases in F1 help service #60156

Merged
merged 11 commits into from
Mar 16, 2022
Merged

Handle more cases in F1 help service #60156

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3240340
Handle '<' and '>' tokens in generic context for F1 service
Youssef1313 Mar 14, 2022
9893c7b
Add tests for predefined operators
Youssef1313 Mar 14, 2022
f5dee38
Rename tests
Youssef1313 Mar 14, 2022
c871a14
Handle different contexts of EqualsToken
Youssef1313 Mar 14, 2022
30c8800
Redirect to 'no match was found page' in F1 service
Youssef1313 Mar 14, 2022
ef13a2a
Handle yield return and yield break
Youssef1313 Mar 14, 2022
ebad005
More EqualsToken cases
Youssef1313 Mar 14, 2022
daf77ef
More cases
Youssef1313 Mar 14, 2022
64c5fd1
More cases
Youssef1313 Mar 14, 2022
c2d06c9
Update CSharpHelpContextService.cs
Youssef1313 Mar 15, 2022
86979da
Update F1HelpTests.cs
Youssef1313 Mar 15, 2022
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
15 changes: 7 additions & 8 deletions src/VisualStudio/CSharp/Impl/LanguageService/CSharpHelpContextService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,15 +201,8 @@ private static bool TryGetTextForOperator(SyntaxToken token, Document document,
return true;
}

// Workaround IsPredefinedOperator returning true for '<' in generics.
if (token is { RawKind: (int)SyntaxKind.LessThanToken, Parent: not BinaryExpressionSyntax })
{
text = null;
return false;
}

var syntaxFacts = document.GetRequiredLanguageService<ISyntaxFactsService>();
if (syntaxFacts.IsOperator(token) || syntaxFacts.IsPredefinedOperator(token) || SyntaxFacts.IsAssignmentExpressionOperatorToken(token.Kind()))
if (syntaxFacts.IsOperator(token) || SyntaxFacts.IsAssignmentExpressionOperatorToken(token.Kind()))
{
text = Keyword(syntaxFacts.GetText(token.RawKind));
return true;
Expand Down Expand Up @@ -239,6 +232,12 @@ private static bool TryGetTextForOperator(SyntaxToken token, Document document,
return true;
}

if (token.IsKind(SyntaxKind.LessThanToken, SyntaxKind.GreaterThanToken) && token.Parent.IsKind(SyntaxKind.TypeParameterList, SyntaxKind.TypeArgumentList))
Copy link
Member Author

@Youssef1313 Youssef1313 Mar 14, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self:

TODO:

< and > in:

  • FunctionPointerParameterListSyntax
  • RelationalPatternSyntax
  • XML doc comments (OperatorMemberCrefSyntax, XmlElementStartTagSyntax, XmlEmptyElementSyntax)

@davidwengier @CyrusNajmabadi Is it worth handling < and > in XML doc comments?

{
text = Keyword("generics");
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm using the Keyword call for consistency, but let me know if I shouldn't use it in this case.

return true;
}

text = null;
return false;
}
Expand Down
136 changes: 127 additions & 9 deletions src/VisualStudio/CSharp/Test/F1Help/F1HelpTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,19 +314,98 @@ void goo<T, U, V>(T t, U u, V v)
}", "N.C`1.goo``3");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestOperator()
[Theory, Trait(Traits.Feature, Traits.Features.F1Help)]
[InlineData("+")]
[InlineData("-")]
[InlineData("&")]
[InlineData("|")]
[InlineData("/")]
[InlineData("^")]
[InlineData(">")]
[InlineData(">=")]
[InlineData("!=")]
[InlineData("<")]
[InlineData("<=")]
[InlineData("<<")]
[InlineData(">>")]
[InlineData("*")]
[InlineData("%")]
[InlineData("&&")]
[InlineData("||")]
[InlineData("==")]
public async Task TestBinaryOperator(string operatorText)
{
await TestAsync(
@"namespace N
{
$@"namespace N
{{
class C
{
{{
void goo()
{{
var two = 1 [|{operatorText}|] 1;
}}
}}", $"{operatorText}_CSharpKeyword");
}

[Theory, Trait(Traits.Feature, Traits.Features.F1Help)]
[InlineData("+=")]
[InlineData("-=")]
[InlineData("/=")]
[InlineData("*=")]
[InlineData("%=")]
[InlineData("&=")]
[InlineData("|=")]
[InlineData("^=")]
[InlineData("<<=")]
[InlineData(">>=")]
public async Task TestCompoundOperator(string operatorText)
{
var two = 1 [|+|] 1;
await TestAsync(
$@"namespace N
{{
class C
{{
void goo(int x)
{{
x [|{operatorText}|] x;
}}
}}", $"{operatorText}_CSharpKeyword");
}

[Theory, Trait(Traits.Feature, Traits.Features.F1Help)]
[InlineData("++")]
[InlineData("--")]
[InlineData("!")]
[InlineData("~")]
public async Task TestPrefixOperator(string operatorText)
{
await TestAsync(
$@"namespace N
{{
class C
{{
void goo(int x)
{{
x = [|{operatorText}|]x;
}}
}}", $"{operatorText}_CSharpKeyword");
}
}", "+_CSharpKeyword");

[Theory, Trait(Traits.Feature, Traits.Features.F1Help)]
[InlineData("++")]
[InlineData("--")]
public async Task TestPostfixOperator(string operatorText)
{
await TestAsync(
$@"namespace N
{{
class C
{{
void goo(int x)
{{
x = x[|{operatorText}|];
}}
}}", $"{operatorText}_CSharpKeyword");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
Expand Down Expand Up @@ -440,7 +519,7 @@ static void Main(string[] args)
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestGenericAngle()
public async Task TestGenericAngle_LessThanToken_TypeArgument()
{
await TestAsync(
@"class Program
Expand All @@ -449,7 +528,46 @@ static void generic<T>(T t)
{
generic[||]<int>(0);
}
}", "Program.generic``1");
}", "generics_CSharpKeyword");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestGenericAngle_GreaterThanToken_TypeArgument()
{
await TestAsync(
@"class Program
{
static void generic<T>(T t)
{
generic<int[|>|](0);
}
}", "generics_CSharpKeyword");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestGenericAngle_LessThanToken_TypeParameter()
{
await TestAsync(
@"class Program
{
static void generic[|<|]T>(T t)
{
generic<int>(0);
}
}", "generics_CSharpKeyword");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestGenericAngle_GreaterThanToken_TypeParameter()
{
await TestAsync(
@"class Program
{
static void generic<T[|>|](T t)
{
generic<int>(0);
}
}", "generics_CSharpKeyword");
}

[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
Expand Down