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

Update F1 Keywords to differentiate between semantics of default keyword #48500

Merged
merged 11 commits into from
Oct 13, 2020
Merged

Update F1 Keywords to differentiate between semantics of default keyword #48500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
cbdee66
Add test cases
TheSench Oct 11, 2020
93e5d20
Add F1_help test cases for default keyword
TheSench Oct 11, 2020
e743fa7
Identify default switch case
TheSench Oct 11, 2020
748ba17
Identify default expression
TheSench Oct 11, 2020
5eba082
Identify default literal expression
TheSench Oct 11, 2020
0b0afdc
Proper C# curly placement
TheSench Oct 11, 2020
e00dd92
Simplify with Pattern Combinator
TheSench Oct 11, 2020
e6c49c5
Simplify matching of `default` cases
TheSench Oct 12, 2020
245c6f8
Simply let normal Keyword case fall through
TheSench Oct 12, 2020
214b82d
Fix test expectations
TheSench Oct 12, 2020
eb2e257
Fix curly placement
TheSench Oct 13, 2020
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
6 changes: 6 additions & 0 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 @@ -352,6 +352,12 @@ private static bool TryGetTextForKeyword(SyntaxToken token, ISyntaxFactsService
}
}

if (token.IsKind(SyntaxKind.DefaultKeyword) && token.Parent is DefaultSwitchLabelSyntax)
{
text = Keyword("defaultcase");
return true;
}

if (token.IsKeyword())
{
text = Keyword(token.Text);
Expand Down
126 changes: 126 additions & 0 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 @@ -817,5 +817,131 @@ bool goo(bool x)
}
}", "!");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultSwitchCase()
{
await Test_KeywordAsync(
@"class C
{
void M1(int parameter)
{
switch(parameter) {
defa[||]ult:
parameter = default;
break;
}
}
}", "defaultcase");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultLiteralExpressionInsideSwitch()
{
await Test_KeywordAsync(
@"class C
{
void M1(int parameter)
{
switch(parameter) {
default:
parameter = defa[||]ult;
break;
}
}
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultExpressionInsideSwitch()
{
await Test_KeywordAsync(
@"class C
{
void M1(int parameter)
{
switch(parameter) {
default:
parameter = defa[||]ult(int);
break;
}
}
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultLiteralExpression()
{
await Test_KeywordAsync(
@"class C
{
int field = defa[||]ult;
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultExpression()
{
await Test_KeywordAsync(
@"class C
{
int field = defa[||]ult(int);
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultLiteralExpressionInOptionalParameter()
{
await Test_KeywordAsync(
@"class C
{
void M1(int parameter = defa[||]ult) {
}
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultExpressionInOptionalParameter()
{
await Test_KeywordAsync(
@"class C
{
void M1(int parameter = defa[||]ult(int)) {
}
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultLiteralExpressionInMethodCall()
{
await Test_KeywordAsync(
@"class C
{
void M1() {
M2(defa[||]ult);
}
}", "default");
}

[WorkItem(48392, "https://github.com/dotnet/roslyn/issues/48392")]
[Fact, Trait(Traits.Feature, Traits.Features.F1Help)]
public async Task TestDefaultExpressionInMethodCall()
{
await Test_KeywordAsync(
@"class C
{
void M1() {
M2(defa[||]ult(int));
}
}", "default");
}
}
}