Merge pull request #69855 from genlu/DoNotCrash

Handle non-member-overriding context in OverrideCompletion
dotnet · Sep 9, 2023 · 7016360 · 7016360
2 parents 8673196 + b77bed4
commit 7016360
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/...itorFeatures/CSharpTest/Completion/CompletionProviders/OverrideCompletionProviderTests.cs b/...itorFeatures/CSharpTest/Completion/CompletionProviders/OverrideCompletionProviderTests.cs
@@ -3508,6 +3508,27 @@ class D : C
                 """, "M()");
         }
 
+        [WpfFact, WorkItem("https://github.com/dotnet/vscode-csharp/issues/6308")]
+        public async Task NoOverrideItemsWhenNotInTypeDeclaration()
+        {
+            await VerifyNoItemsExistAsync("""
+                namespace NS
+                {
+                    override $$
+                }
+                """);
+        }
+
+        [WpfFact, WorkItem("https://github.com/dotnet/vscode-csharp/issues/6308")]
+        public async Task NoOverrideItemsAtTopLevel()
+        {
+            await VerifyNoItemsExistAsync("""
+                System.Console.WriteLine();
+
+                override $$
+                """);
+        }
+
         private Task VerifyItemExistsAsync(string markup, string expectedItem)
         {
             return VerifyItemExistsAsync(markup, expectedItem, isComplexTextEdit: true);

diff --git a/...tures/Core/Portable/Completion/Providers/AbstractOverrideCompletionProvider.ItemGetter.cs b/...tures/Core/Portable/Completion/Providers/AbstractOverrideCompletionProvider.ItemGetter.cs
@@ -8,7 +8,6 @@
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
-using Roslyn.Utilities;
 
 namespace Microsoft.CodeAnalysis.Completion.Providers
 {
@@ -111,7 +110,11 @@ private bool TryDetermineOverridableMembers(
                 out ImmutableArray<ISymbol> overridableMembers)
             {
                 var containingType = semanticModel.GetEnclosingSymbol<INamedTypeSymbol>(startToken.SpanStart, _cancellationToken);
-                Contract.ThrowIfNull(containingType);
+                if (containingType is null)
+                {
+                    overridableMembers = default;
+                    return false;
+                }
 
                 var result = containingType.GetOverridableMembers(_cancellationToken);