Skip to content

Refactoring: Consistently use Keyword helper in C# help service #68015

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
merged 1 commit into from
Apr 28, 2023
Merged

Refactoring: Consistently use Keyword helper in C# help service #68015

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
28 changes: 14 additions & 14 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 @@ -370,21 +370,21 @@ private static bool TryGetTextForContextualKeyword(SyntaxToken token, [NotNullWh
case SyntaxKind.PartialKeyword:
if (token.Parent.GetAncestorOrThis<MethodDeclarationSyntax>() != null)
{
text = "partialmethod_CSharpKeyword";
text = Keyword("partialmethod");
return true;
}
else if (token.Parent.GetAncestorOrThis<TypeDeclarationSyntax>() != null)
{
text = "partialtype_CSharpKeyword";
text = Keyword("partialtype");
return true;
}

break;

case SyntaxKind.WhereKeyword:
text = token.Parent.GetAncestorOrThis<TypeParameterConstraintClauseSyntax>() != null
? "whereconstraint_CSharpKeyword"
: "whereclause_CSharpKeyword";
? Keyword("whereconstraint")
: Keyword("whereclause");

return true;

Expand All @@ -411,25 +411,25 @@ private static bool TryGetTextForCombinationKeyword(SyntaxToken token, [NotNullW
{
case SyntaxKind.PrivateKeyword when ModifiersContains(token, SyntaxKind.ProtectedKeyword):
case SyntaxKind.ProtectedKeyword when ModifiersContains(token, SyntaxKind.PrivateKeyword):
text = "privateprotected_CSharpKeyword";
text = Keyword("privateprotected");
return true;

case SyntaxKind.ProtectedKeyword when ModifiersContains(token, SyntaxKind.InternalKeyword):
case SyntaxKind.InternalKeyword when ModifiersContains(token, SyntaxKind.ProtectedKeyword):
text = "protectedinternal_CSharpKeyword";
text = Keyword("protectedinternal");
return true;

case SyntaxKind.UsingKeyword when token.Parent is UsingDirectiveSyntax:
text = token.GetNextToken().IsKind(SyntaxKind.StaticKeyword)
? "using-static_CSharpKeyword"
: "using_CSharpKeyword";
? Keyword("using-static")
: Keyword("using");
return true;
case SyntaxKind.StaticKeyword when token.Parent is UsingDirectiveSyntax:
text = "using-static_CSharpKeyword";
text = Keyword("using-static");
return true;
case SyntaxKind.ReturnKeyword when token.Parent.IsKind(SyntaxKind.YieldReturnStatement):
case SyntaxKind.BreakKeyword when token.Parent.IsKind(SyntaxKind.YieldBreakStatement):
text = "yield_CSharpKeyword";
text = Keyword("yield");
return true;
}

Expand All @@ -448,13 +448,13 @@ private static bool TryGetTextForKeyword(SyntaxToken token, [NotNullWhen(true)]
{
if (token.GetAncestor<FromClauseSyntax>() != null)
{
text = "from_CSharpKeyword";
text = Keyword("from");
return true;
}

if (token.GetAncestor<JoinClauseSyntax>() != null)
{
text = "join_CSharpKeyword";
text = Keyword("join");
return true;
}
}
Expand Down Expand Up @@ -513,13 +513,13 @@ private static bool TryGetTextForKeyword(SyntaxToken token, [NotNullWhen(true)]
if (token.ValueText == "var" && token.IsKind(SyntaxKind.IdentifierToken) &&
token.Parent?.Parent is VariableDeclarationSyntax declaration && token.Parent == declaration.Type)
{
text = "var_CSharpKeyword";
text = Keyword("var");
return true;
}

if (token.IsTypeNamedDynamic())
{
text = "dynamic_CSharpKeyword";
text = Keyword("dynamic");
return true;
}

Expand Down