Skip to content

Improve extract-local-function in the presence of pp directives #76169

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
Merged
merged 1 commit into from
Dec 2, 2024
Merged

Improve extract-local-function in the presence of pp directives #76169

merged 1 commit into from
Dec 2, 2024

Conversation

CyrusNajmabadi
Copy link
Member

Fixes #63917

@CyrusNajmabadi CyrusNajmabadi requested a review from a team as a code owner November 30, 2024 03:10
@ghost ghost added Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead labels Nov 30, 2024
ToddGrun
ToddGrun reviewed Dec 2, 2024
View reviewed changes
.../SharedUtilitiesAndExtensions/Workspace/CSharp/CodeGeneration/CSharpCodeGenerationService.cs
public static BlockSyntax AddStatementsToBlock(BlockSyntax block, IEnumerable<SyntaxNode> statements)
{
var statementsArray = StatementGenerator.GenerateStatements(statements);
if (statementsArray.Count > 0)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if (statementsArray.Count > 0)

nit: could simplify the empty statement case to

if (statementsArray.Count == 0)
return block;

ToddGrun
ToddGrun approved these changes Dec 2, 2024
View reviewed changes
Copy link
Contributor

@ToddGrun ToddGrun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@CyrusNajmabadi CyrusNajmabadi merged commit 490be18 into dotnet:main Dec 2, 2024
25 checks passed
@CyrusNajmabadi CyrusNajmabadi deleted the extractLocalFunctionPP branch December 2, 2024 22:18
@dotnet-policy-service dotnet-policy-service bot added this to the Next milestone Dec 2, 2024
@dotnet-bot dotnet-bot mentioned this pull request Dec 4, 2024
Closed
This was referenced Dec 11, 2024
Closed
Closed
@dibarbet dibarbet modified the milestones: Next, 17.13 P3 Jan 7, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ToddGrun ToddGrun ToddGrun approved these changes

Assignees
No one assigned
Labels
Area-IDE untriaged Issues and PRs which have not yet been triaged by a lead VSCode
Projects
None yet
Milestone
17.13 P3
Development

Successfully merging this pull request may close these issues.

Extract local function puts function in disabled section
3 participants
@CyrusNajmabadi @ToddGrun @dibarbet