Merge pull request #48173 from Youssef1313/patch-42

Don't offer generate parameter/field/property for top-level programs
dotnet · Oct 1, 2020 · afd1030 · afd1030
2 parents 467f6ac + fa1e83a
commit afd1030
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs b/src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
@@ -9342,5 +9342,12 @@ internal MyException(int error, int offset, string message) : base(message)
     string.Format(FeaturesResources.Generate_parameter_0, "Error", "MyException"),
 });
         }
+
+        [WorkItem(48172, "https://github.com/dotnet/roslyn/issues/48172")]
+        [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateVariable)]
+        public async Task TestMissingOfferParameterInTopLevel()
+        {
+            await TestMissingAsync("[|Console|].WriteLine();", new TestParameters(Options.Regular));
+        }
     }
 }
diff --git a/...es/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.State.cs b/...es/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.State.cs
@@ -136,7 +136,7 @@ private async Task<bool> TryInitializeAsync(
 
             internal bool CanGeneratePropertyOrField()
             {
-                return !ContainingType.IsImplicitClass;
+                return ContainingType is { IsImplicitClass: false, Name: not WellKnownMemberNames.TopLevelStatementsEntryPointTypeName };
             }
 
             internal bool CanGenerateLocal()
@@ -148,7 +148,9 @@ internal bool CanGenerateLocal()
             internal bool CanGenerateParameter()
             {
                 // !this.IsInMemberContext prevents us offering this fix for `x.goo` where `goo` does not exist
-                return ContainingMethod != null && !IsInMemberContext && !IsConstant;
+                // Workaround: The compiler returns IsImplicitlyDeclared = false for <Main>$.
+                return ContainingMethod is { IsImplicitlyDeclared: false, Name: not WellKnownMemberNames.TopLevelStatementsEntryPointMethodName }
+                    && !IsInMemberContext && !IsConstant;
             }
 
             private bool TryInitializeExplicitInterface(