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

Don't offer generate parameter/field/property for top-level programs #48173

Merged
merged 9 commits into from
Oct 1, 2020
Merged

Don't offer generate parameter/field/property for top-level programs #48173

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e37f4e
Don't offer generate parameter for implicitly declared methods
Youssef1313 Sep 29, 2020
5942c82
Add TestMissingOfferParameterInTopLevel
Youssef1313 Sep 29, 2020
c7dba08
Apply suggestions from code review
Youssef1313 Sep 29, 2020
5f97b78
Fix CanGeneratePropertyOrField
Youssef1313 Sep 30, 2020
bfc3a12
Change IsImplicitClass to IsImplicitlyDeclared
Youssef1313 Sep 30, 2020
bd54730
Pattern matching
Youssef1313 Sep 30, 2020
924a19b
Typo and more pattern matching
Youssef1313 Sep 30, 2020
4278c30
Fix for C#-script
Youssef1313 Oct 1, 2020
fa1e83a
Fix
Youssef1313 Oct 1, 2020
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
7 changes: 7 additions & 0 deletions src/EditorFeatures/CSharpTest/GenerateVariable/GenerateVariableTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9336,5 +9336,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 TestMissingInRegularAndScriptAsync("[|Console|].WriteLine();");
}
}
}
7 changes: 5 additions & 2 deletions ...es/Core/Portable/GenerateMember/GenerateVariable/AbstractGenerateVariableService.State.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ private async Task<bool> TryInitializeAsync(

internal bool CanGeneratePropertyOrField()
{
return !ContainingType.IsImplicitClass;
return ContainingType is { IsImplicitlyDeclared: false, Name: not TopLevelStatementsEntryPointTypeName };
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
}

internal bool CanGenerateLocal()
Expand All @@ -148,7 +148,10 @@ 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;
return ContainingMethod is { IsImplicitlyDeclared: false }
// Workaround: The compiler returns IsImplicitlyDeclared = false for <Main>$.
&& ContainingMethod.Name != WellKnownMemberNames.TopLevelStatementsEntryPointMethodName
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
&& !IsInMemberContext && !IsConstant;
Youssef1313 marked this conversation as resolved.
Show resolved Hide resolved
}

private bool TryInitializeExplicitInterface(
Expand Down