Merge pull request #64593 from DoctorKrolic/completions-after-required

CyrusNajmabadi · web-flow · commit 91a2af3e4dfb · 2022-10-10T12:30:49.000-07:00
Fix symbol colpletions after required keyword
diff --git a/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs b/src/EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs
@@ -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);
+        }
+
         private static string MakeMarkup(string source, string languageVersion = "Preview")
         {
             return $$"""
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/BoolKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ByteKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/CharKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/CharKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/DecimalKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/DecimalKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/DoubleKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/DoubleKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/FloatKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/FloatKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/IntKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/IntKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/LongKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/LongKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/NativeIntegerKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/NativeIntegerKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ObjectKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ObjectKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/SByteKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/SByteKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ShortKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ShortKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/StringKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/StringKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/UIntKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/UIntKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/ULongKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/ULongKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/EditorFeatures/CSharpTest2/Recommendations/UShortKeywordRecommenderTests.cs b/src/EditorFeatures/CSharpTest2/Recommendations/UShortKeywordRecommenderTests.cs
@@ -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 $$
+}");
+        }
     }
 }
diff --git a/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxTreeExtensions.cs b/src/Workspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxTreeExtensions.cs
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -789,5 +789,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`789`	`789`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`790`	`790`	`{keyword} $$"));`
`791`	`791`	`}`
	`792`	`+`
	`793`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`794`	`+ public async Task TestAfterRequired()`
	`795`	`+ {`
	`796`	`+ await VerifyKeywordAsync(@"`
	`797`	`+class C`
	`798`	`+{`
	`799`	`+ required $$`
	`800`	`+}");`
	`801`	`+ }`
`792`	`802`	`}`
`793`	`803`	`}`
Original file line number	Diff line number	Diff line change
`@@ -790,5 +790,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`790`	`790`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`791`	`791`	`{keyword} $$"));`
`792`	`792`	`}`
	`793`	`+`
	`794`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`795`	`+ public async Task TestAfterRequired()`
	`796`	`+ {`
	`797`	`+ await VerifyKeywordAsync(@"`
	`798`	`+class C`
	`799`	`+{`
	`800`	`+ required $$`
	`801`	`+}");`
	`802`	`+ }`
`793`	`803`	`}`
`794`	`804`	`}`
Original file line number	Diff line number	Diff line change
`@@ -829,5 +829,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`829`	`829`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`830`	`830`	`{keyword} $$"));`
`831`	`831`	`}`
	`832`	`+`
	`833`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`834`	`+ public async Task TestAfterRequired()`
	`835`	`+ {`
	`836`	`+ await VerifyKeywordAsync(@"`
	`837`	`+class C`
	`838`	`+{`
	`839`	`+ required $$`
	`840`	`+}");`
	`841`	`+ }`
`832`	`842`	`}`
`833`	`843`	`}`
Original file line number	Diff line number	Diff line change
`@@ -781,5 +781,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`781`	`781`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`782`	`782`	`{keyword} $$"));`
`783`	`783`	`}`
	`784`	`+`
	`785`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`786`	`+ public async Task TestAfterRequired()`
	`787`	`+ {`
	`788`	`+ await VerifyKeywordAsync(@"`
	`789`	`+class C`
	`790`	`+{`
	`791`	`+ required $$`
	`792`	`+}");`
	`793`	`+ }`
`784`	`794`	`}`
`785`	`795`	`}`
Original file line number	Diff line number	Diff line change
`@@ -767,5 +767,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`767`	`767`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`768`	`768`	`{keyword} $$"));`
`769`	`769`	`}`
	`770`	`+`
	`771`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`772`	`+ public async Task TestAfterRequired()`
	`773`	`+ {`
	`774`	`+ await VerifyKeywordAsync(@"`
	`775`	`+class C`
	`776`	`+{`
	`777`	`+ required $$`
	`778`	`+}");`
	`779`	`+ }`
`770`	`780`	`}`
`771`	`781`	`}`
Original file line number	Diff line number	Diff line change
`@@ -740,5 +740,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`740`	`740`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`741`	`741`	`{keyword} $$"));`
`742`	`742`	`}`
	`743`	`+`
	`744`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`745`	`+ public async Task TestAfterRequired()`
	`746`	`+ {`
	`747`	`+ await VerifyKeywordAsync(@"`
	`748`	`+class C`
	`749`	`+{`
	`750`	`+ required $$`
	`751`	`+}");`
	`752`	`+ }`
`743`	`753`	`}`
`744`	`754`	`}`
Original file line number	Diff line number	Diff line change
`@@ -854,5 +854,15 @@ public async Task TestNotAfterKeywordIndicatingLocalFunctionWithAsync(string key`
`854`	`854`	`await VerifyAbsenceAsync(AddInsideMethod($@"`
`855`	`855`	`{keyword} $$"));`
`856`	`856`	`}`
	`857`	`+`
	`858`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`859`	`+ public async Task TestAfterRequired()`
	`860`	`+ {`
	`861`	`+ await VerifyKeywordAsync(@"`
	`862`	`+class C`
	`863`	`+{`
	`864`	`+ required $$`
	`865`	`+}");`
	`866`	`+ }`
`857`	`867`	`}`
`858`	`868`	`}`
Original file line number	Diff line number	Diff line change
`@@ -373,5 +373,15 @@ public async Task TestNotInPreprocessorDirective()`
`373`	`373`	`await VerifyAbsenceAsync(`
`374`	`374`	`@"#$$");`
`375`	`375`	`}`
	`376`	`+`
	`377`	`+ [Fact, WorkItem(64585, "https://github.com/dotnet/roslyn/issues/64585")]`
	`378`	`+ public async Task TestAfterRequired()`
	`379`	`+ {`
	`380`	`+ await VerifyKeywordAsync(@"`
	`381`	`+class C`
	`382`	`+{`
	`383`	`+ required $$`
	`384`	`+}");`
	`385`	`+ }`
`376`	`386`	`}`
`377`	`387`	`}`