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

Fix symbol colpletions after required keyword
dotnet · Oct 10, 2022 · 91a2af3 · 91a2af3
2 parents a8b0ed6 + 02df45c
commit 91a2af3
Show file tree

Hide file tree

Showing 18 changed files with 172 additions and 0 deletions.
diff --git a/...EditorFeatures/CSharpTest/Completion/CompletionProviders/SymbolCompletionProviderTests.cs b/...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/...orkspaces/SharedUtilitiesAndExtensions/Compiler/CSharp/Extensions/SyntaxTreeExtensions.cs b/...orkspaces/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);