Skip to content

Extend InlineVariable to support local variable assignments #647

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 10 commits into from
Jul 22, 2025
Merged

Extend InlineVariable to support local variable assignments #647

merged 10 commits into from
Jul 22, 2025

Conversation

@timtebeek
Copy link
Member

@timtebeek timtebeek commented Jul 21, 2025

@timtebeek timtebeek self-assigned this Jul 21, 2025
@github-project-automation github-project-automation bot moved this to In Progress in OpenRewrite Jul 21, 2025
@timtebeek timtebeek moved this from In Progress to Ready to Review in OpenRewrite Jul 21, 2025
timtebeek
timtebeek commented Jul 21, 2025
View reviewed changes
src/main/java/org/openrewrite/staticanalysis/InlineReturnValue.java Outdated
Comment on lines 49 to 53
public TreeVisitor<?, ExecutionContext> getVisitor() {
return new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.Block visitBlock(J.Block block, ExecutionContext ctx) {
J.Block b = super.visitBlock(block, ctx);
Copy link
Member Author

@timtebeek timtebeek Jul 21, 2025

Choose a reason for hiding this comment

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

This is the part that needs review.

github-actions[bot]
github-actions bot reviewed Jul 21, 2025
View reviewed changes
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Some suggestions could not be made:

  • src/main/java/org/openrewrite/staticanalysis/MinimumSwitchCases.java
    • lines 260-260

@timtebeek timtebeek mentioned this pull request Jul 21, 2025
Merged
3 tasks
@timtebeek timtebeek marked this pull request as draft July 21, 2025 21:21
@timtebeek
Copy link
Member Author

timtebeek commented Jul 21, 2025

Turns out we already have a recipe that does something similar, but with not exactly overlapping coverage:

rewrite-static-analysis/src/main/java/org/openrewrite/staticanalysis/InlineVariable.java

Lines 36 to 46 in a779afa

public class InlineVariable extends Recipe {
@Override
public String getDisplayName() {
return "Inline variable";
}
@Override
public String getDescription() {
return "Inline variables when they are immediately used to return or throw.";
}

@Stephan202
Copy link

Stephan202 commented Jul 22, 2025

For inspiration around possible edge cases, see the DirectReturn Error Prone check and its tests.

@timtebeek timtebeek changed the title Recipe to inline returned value Extend InlineVariable to support local variable assignments Jul 22, 2025
@timtebeek
Copy link
Member Author

timtebeek commented Jul 22, 2025

For inspiration around possible edge cases, see the DirectReturn Error Prone check and its tests.

Thanks! Added a few similar ones just now in 406c195 ; with that I think we're good to merge this PR. 🙏🏻

@timtebeek timtebeek marked this pull request as ready for review July 22, 2025 09:49
greg-at-moderne
greg-at-moderne approved these changes Jul 22, 2025
View reviewed changes
src/test/java/org/openrewrite/staticanalysis/InlineVariableTest.java Outdated
Comment on lines 273 to 274
String result;
return "hello";
Copy link
Contributor

@greg-at-moderne greg-at-moderne Jul 22, 2025

Choose a reason for hiding this comment

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

Maybe we should trigger RemoveUnusedLocalVariables as an after visitor?

@timtebeek timtebeek merged commit 7e5fa84 into main Jul 22, 2025
2 checks passed
@timtebeek timtebeek deleted the inline-returned-value branch July 22, 2025 10:34
@github-project-automation github-project-automation bot moved this from Ready to Review to Done in OpenRewrite Jul 22, 2025
This was referenced Jul 22, 2025
Merged
Closed
mergify bot added a commit to robfrank/linklift that referenced this pull request Aug 15, 2025
@mergify
chore(deps): bump org.openrewrite.recipe:rewrite-static-analysis from…
975e63a 
… 2.11.0 to 2.15.0 [skip ci]

Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.11.0 to 2.15.0.
Release notes

*Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).*

> 2.15.0
> ------
>
> What's Changed
> --------------
>
> * Add parentheses in `CompareEnumsWithEqualityOperator` as needed by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#658](https://github.com/openrewrite/rewrite-static-analysis/pull/658)
> * Recipe to simplify Boolean expressions using De Morgan's laws by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#659](https://github.com/openrewrite/rewrite-static-analysis/pull/659)
> * SimplifyBooleanExpressionWithDeMorgan - Add parens when converting to OR by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#660](https://github.com/openrewrite/rewrite-static-analysis/pull/660)
> * UseForEachLoop recipe by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#651](https://github.com/openrewrite/rewrite-static-analysis/pull/651)
> * Do not remove used private fields after type change by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#648](https://github.com/openrewrite/rewrite-static-analysis/pull/648)
> * UseForEachLoop - not to change in case of array assignment by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#661](https://github.com/openrewrite/rewrite-static-analysis/pull/661)
> * Remove UseForEachLoop by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#662](https://github.com/openrewrite/rewrite-static-analysis/pull/662)
> * Fixing `twoCases` test case in `MinimumSwitchCasesTest` by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#672](https://github.com/openrewrite/rewrite-static-analysis/pull/672)
> * Fixing code suggestions by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#673](https://github.com/openrewrite/rewrite-static-analysis/pull/673)
> * Keep indentation when running `FinalizePrivateFields` by [`@​jevanlingen`](https://github.com/jevanlingen) in [openrewrite/rewrite-static-analysis#675](https://github.com/openrewrite/rewrite-static-analysis/pull/675)
> * PreferIncrementOperator by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#676](https://github.com/openrewrite/rewrite-static-analysis/pull/676)
> * Add MavenJavadocNonAsciiRecipe to remove non-ASCII characters from Ja… by [`@​sfarhaazmi`](https://github.com/sfarhaazmi) in [openrewrite/rewrite-static-analysis#674](https://github.com/openrewrite/rewrite-static-analysis/pull/674)
> * refactor: Static imports for Collections and Collectors by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#678](https://github.com/openrewrite/rewrite-static-analysis/pull/678)
> * PreferIncrementOperator - more coverage - compound assignment operators by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#680](https://github.com/openrewrite/rewrite-static-analysis/pull/680)
> * rename settings.local.json to settings.json by [`@​zieka`](https://github.com/zieka) in [openrewrite/rewrite-static-analysis#690](https://github.com/openrewrite/rewrite-static-analysis/pull/690)
> * Add PreferEqualityComparisonOverDifferenceCheck recipe by [`@​e5LA`](https://github.com/e5LA) in [openrewrite/rewrite-static-analysis#686](https://github.com/openrewrite/rewrite-static-analysis/pull/686)
> * Applying code suggestions by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#693](https://github.com/openrewrite/rewrite-static-analysis/pull/693)
> * Show a failure to remove some semicolons still by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#697](https://github.com/openrewrite/rewrite-static-analysis/pull/697)
> * `MoveConditionsToWhile` recipe by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#698](https://github.com/openrewrite/rewrite-static-analysis/pull/698)
> * Add Claude derived instructions for tests and recipes by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#700](https://github.com/openrewrite/rewrite-static-analysis/pull/700)
> * Fix NPE for new arrays with initializers in `ReplaceCollectionToArrayArgWithEmptyArray` by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#704](https://github.com/openrewrite/rewrite-static-analysis/pull/704)
> * Add `RemoveRedundantNullCheckBeforeLiteralEquals` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#706](https://github.com/openrewrite/rewrite-static-analysis/pull/706)
> * Refactor RewriteTest to use defaults method by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#707](https://github.com/openrewrite/rewrite-static-analysis/pull/707)
>
> New Contributors
> ----------------
>
> * [`@​sfarhaazmi`](https://github.com/sfarhaazmi) made their first contribution in [openrewrite/rewrite-static-analysis#674](https://github.com/openrewrite/rewrite-static-analysis/pull/674)
> * [`@​zieka`](https://github.com/zieka) made their first contribution in [openrewrite/rewrite-static-analysis#690](https://github.com/openrewrite/rewrite-static-analysis/pull/690)
> * [`@​e5LA`](https://github.com/e5LA) made their first contribution in [openrewrite/rewrite-static-analysis#686](https://github.com/openrewrite/rewrite-static-analysis/pull/686)
>
> **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.14.0...v2.15.0>
>
> 2.14.0
> ------
>
> What's Changed
> --------------
>
> * Heap size of 1G for tests by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#653](https://github.com/openrewrite/rewrite-static-analysis/pull/653)
> * UnwrapElseAfterReturn - dealing with trailing comments by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#654](https://github.com/openrewrite/rewrite-static-analysis/pull/654)
> * Dealing with even more kinds of trailing comments in UnwrapElseAfterReturn by [`@​greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#655](https://github.com/openrewrite/rewrite-static-analysis/pull/655)
>
> **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.13.0...v2.14.0>
>
> 2.13.0
> ------
>
> What's Changed
> --------------
>
> * Add CollectionToArrayShouldHaveProperType recipe (RSPEC-S3020) by [`@​jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-static-analysis#635](https://github.com/openrewrite/rewrite-static-analysis/pull/635)
> * Fix `UnnecessaryCatch` Recipe Multi-Catch Handling by [`@​stefanodallapalma`](https://github.com/stefanodallapalma) in [openrewrite/rewrite-static-analysis#638](https://github.com/openrewrite/rewrite-static-analysis/pull/638)
> * Add `OnlyCatchDeclaredExceptions` recipe to address RSPEC-S2221 by [`@​stefanodallapalma`](https://github.com/stefanodallapalma) in [openrewrite/rewrite-static-analysis#601](https://github.com/openrewrite/rewrite-static-analysis/pull/601)
> * RemoveRedundantTypeCast should not remove required downcast by [`@​protocol7`](https://github.com/protocol7) in [openrewrite/rewrite-static-analysis#495](https://github.com/openrewrite/rewrite-static-analysis/pull/495)
> * Unwrap else after return in preceding `if` by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#645](https://github.com/openrewrite/rewrite-static-analysis/pull/645)
> * Extend `InlineVariable` to support local variable assignments by [`@​timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#647](https://github.com/openrewrite/rewrite-static-analysis/pull/647)

... (truncated)


Commits

* [`e5ca752`](openrewrite/rewrite-static-analysis@e5ca752) OpenRewrite recipe best practices
* [`976d366`](openrewrite/rewrite-static-analysis@976d366) Retain `writeReplace` in `RemoveUnusedPrivateMethods`
* [`76322bc`](openrewrite/rewrite-static-analysis@76322bc) Refactor RewriteTest to use defaults method ([#707](https://github.com/openrewrite/rewrite-static-analysis/issues/707))
* [`e5926ef`](openrewrite/rewrite-static-analysis@e5926ef) Add `RemoveRedundantNullCheckBeforeLiteralEquals` ([#706](https://github.com/openrewrite/rewrite-static-analysis/issues/706))
* [`6547c82`](openrewrite/rewrite-static-analysis@6547c82) OpenRewrite recipe best practices
* [`c4c5941`](openrewrite/rewrite-static-analysis@c4c5941) Fix NPE for new arrays with initializers in `ReplaceCollectionToArrayArgWithE...
* [`428d8b0`](openrewrite/rewrite-static-analysis@428d8b0) Add Claude derived instructions for tests and recipes ([#700](https://github.com/openrewrite/rewrite-static-analysis/issues/700))
* [`e775b10`](openrewrite/rewrite-static-analysis@e775b10) Polish `MoveConditionsToWhile`
* [`dbabed5`](openrewrite/rewrite-static-analysis@dbabed5) `MoveConditionsToWhile` recipe ([#698](https://github.com/openrewrite/rewrite-static-analysis/issues/698))
* [`a5a709c`](openrewrite/rewrite-static-analysis@a5a709c) Show a failure to remove some semicolons still ([#697](https://github.com/openrewrite/rewrite-static-analysis/issues/697))
* Additional commits viewable in [compare view](openrewrite/rewrite-static-analysis@v2.11.0...v2.15.0)
  
[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility\_score?dependency-name=org.openrewrite.recipe:rewrite-static-analysis&package-manager=maven&previous-version=2.11.0&new-version=2.15.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@greg-at-moderne greg-at-moderne greg-at-moderne approved these changes

Assignees

@timtebeek timtebeek

Labels

recipe

Projects

OpenRewrite
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@timtebeek @Stephan202 @greg-at-moderne