Preserve else-if chains in UnwrapElseAfterReturn recipe#809
Merged
Conversation
- Preserve `else if` structure when unwrapping else blocks after return/throw - Only unwrap the final `else` block in an else-if chain, not intermediate `else if` branches - Add `findInnermostIfWithElse()` helper to locate the last if in a chain - Add `removeInnermostElse()` helper to recursively remove only the innermost else - Update tests to verify else-if preservation while final else is still unwrapped
timtebeek
approved these changes
Jan 27, 2026
mergify bot
added a commit
to robfrank/linklift
that referenced
this pull request
Feb 14, 2026
… 2.26.0 to 2.27.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.26.0 to 2.27.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).* > 2.27.0 > ------ > > What's Changed > -------------- > > * Skip MinimumSwitchCases transformation when type info is missing by [`@jkschneider`](https://github.com/jkschneider) in [openrewrite/rewrite-static-analysis#808](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/808) > * Preserve `else-if` chains in `UnwrapElseAfterReturn` recipe by [`@knutwannheden`](https://github.com/knutwannheden) in [openrewrite/rewrite-static-analysis#809](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/809) > * Followup after the formatting merge by [`@Jenson3210`](https://github.com/Jenson3210) in [openrewrite/rewrite-static-analysis#810](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/810) > * Make declarative recipes singletons by [`@sambsnyd`](https://github.com/sambsnyd) in [openrewrite/rewrite-static-analysis#811](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/811) > * Fix UnnecessaryThrows to check actual close() method exceptions by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#812](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/812) > * Adjust indent in `ReplaceRedundantFormatWithPrintfTest` by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#815](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/815) > * One more test case for `ExplicitLambdaArgumentTypes` by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#814](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/814) > > New Contributors > ---------------- > > * [`@sambsnyd`](https://github.com/sambsnyd) made their first contribution in [openrewrite/rewrite-static-analysis#811](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/811) > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.26.0...v2.27.0> Commits * [`21db3b9`](openrewrite/rewrite-static-analysis@21db3b9) Extract documentation examples from tests * [`82e1520`](openrewrite/rewrite-static-analysis@82e1520) doesNotImportConflictingClassName ([#814](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/814)) * [`73b881f`](openrewrite/rewrite-static-analysis@73b881f) Adjust indent ([#815](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/815)) * [`fa551ea`](openrewrite/rewrite-static-analysis@fa551ea) Delete files * [`a095673`](openrewrite/rewrite-static-analysis@a095673) Fix UnnecessaryThrows to check actual close() method exceptions ([#812](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/812)) * [`a32c4e3`](openrewrite/rewrite-static-analysis@a32c4e3) Make declarative recipes singletons ([#811](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/811)) * [`98e70a3`](openrewrite/rewrite-static-analysis@98e70a3) Followup after the formatting merge ([#810](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/810)) * [`8c2d7dc`](openrewrite/rewrite-static-analysis@8c2d7dc) Preserve `else-if` chains in `UnwrapElseAfterReturn` recipe ([#809](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/809)) * [`6d3fb00`](openrewrite/rewrite-static-analysis@6d3fb00) `FixStringFormatExpressions` should check for content difference * [`12d5798`](openrewrite/rewrite-static-analysis@12d5798) Skip MinimumSwitchCases transformation when type info is missing ([#808](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/808)) * See full diff in [compare view](openrewrite/rewrite-static-analysis@v2.26.0...v2.27.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 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)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
else ifstructure when unwrapping else blocks after return/throwelseblock in an else-if chain, not intermediateelse ifbranchesfindInnermostIfWithElse()helper to locate the last if in a chainremoveInnermostElse()helper to recursively remove only the innermost else