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

Fix symbol completions after required keyword #64593

Merged
merged 2 commits into from
Oct 10, 2022
Merged

Fix symbol completions after required keyword #64593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f298dc0
Fix colpletions after required keyword
DoctorKrolic Oct 9, 2022
02df45c
Keyword tests
DoctorKrolic Oct 9, 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
11 changes: 11 additions & 0 deletions ...EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11893,6 +11893,17 @@ public async Task ParameterAvailableInDelegateParameterAttributeNameof()
await VerifyItemExistsAsync(MakeMarkup(source, languageVersion: "10"), "parameter", skipSpeculation: true);
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task AfterRequired()
{
var source = @"
class C
{
required $$
}";
await VerifyAnyItemExistsAsync(source);
DoctorKrolic marked this conversation as resolved.
Show resolved Hide resolved
}

private static string MakeMarkup(string source, string languageVersion = "Preview")
{
return $$"""
Expand Down
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,5 +789,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,5 +790,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/CharKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -829,5 +829,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/DecimalKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -781,5 +781,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/DoubleKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/FloatKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,5 +740,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/IntKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,5 +854,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/LongKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/NativeIntegerKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,5 +373,15 @@ public async Task TestNotInPreprocessorDirective()
await VerifyAbsenceAsync(
@"#$$");
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/ObjectKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,5 +788,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/SByteKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/ShortKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/StringKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -803,5 +803,15 @@ class C
{
delegate*$$");
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/UIntKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/ULongKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
10 changes: 10 additions & 0 deletions src/EditorFeatures/CSharpTest2/Recommendations/UShortKeywordRecommenderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key
await VerifyAbsenceAsync(AddInsideMethod($@"
{keyword} $$"));
}

[Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]
public async Task TestAfterRequired()
{
await VerifyKeywordAsync(@"
class C
{
required $$
}");
}
}
}
1 change: 1 addition & 0 deletions ...orkspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxTreeExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public static ISet<SyntaxKind> GetPrecedingModifiers(
case SyntaxKind.RefKeyword:
case SyntaxKind.OutKeyword:
case SyntaxKind.InKeyword:
case SyntaxKind.RequiredKeyword:
result.Add(token.Kind());
positionBeforeModifiers = token.FullSpan.Start;
token = token.GetPreviousToken(includeSkipped: true);
Expand Down