-
Notifications
You must be signed in to change notification settings - Fork 92
Fix CombineSemanticallyEqualCatchBlocks for inner exception types #772
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.
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
Merged
Conversation
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
The recipe failed to detect inheritance relationships when exception classes were inner/nested types (e.g., Outer.InnerException). The root cause was that the recipe only tracked J.Identifier instances when identifying parent-child exception relationships, but inner/nested exception types are represented as J.FieldAccess in the AST. Changes: - Updated data structures to use Set<NameTree> instead of Set<J.Identifier> - Added handling for J.FieldAccess in exception type comparisons - Added test case for inner exception extending parent exception Fixes #771 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
mergify bot
added a commit
to robfrank/linklift
that referenced
this pull request
Nov 24, 2025
… 2.21.0 to 2.22.0 [skip ci] Bumps [org.openrewrite.recipe:rewrite-static-analysis](https://github.com/openrewrite/rewrite-static-analysis) from 2.21.0 to 2.22.0. Release notes *Sourced from [org.openrewrite.recipe:rewrite-static-analysis's releases](https://github.com/openrewrite/rewrite-static-analysis/releases).* > 2.22.0 > ------ > > What's Changed > -------------- > > * Prevent `AnnotateNullableMethods` from failing on TypeScript sources by [`@greg-at-moderne`](https://github.com/greg-at-moderne) in [openrewrite/rewrite-static-analysis#773](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/773) > * Fix CombineSemanticallyEqualCatchBlocks for inner exception types by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#772](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/772) > * Handle single quotes in ReplaceStringBuilderWithString by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#775](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/775) > * Prevent `ReplaceLambdaWithMethodReference` in nested generic/overloaded contexts by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#776](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/776) > * Fix ReplaceLambdaWithMethodReference for local records and classes by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#777](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/777) > * Move nullable annotations to array types by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#778](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/778) > * Annotate nullable array type parameters by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#779](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/779) > * Annotate required parameters with `@NonNull` and remove throws by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#782](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/782) > * Skip UnnecessaryCatch after any missing types via a precondition by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#784](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/784) > * Run `UnnecessaryCatch` after `UnnecessaryThrows` to remove unused catch clauses by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#785](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/785) > * Add JavascriptFileChecker to selectively skip JavaScript files by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#787](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/787) > * Fix `RemoveUnusedLocalVariables` to preserve assignments with side effects by [`@timtebeek`](https://github.com/timtebeek) in [openrewrite/rewrite-static-analysis#741](https://redirect.github.com/openrewrite/rewrite-static-analysis/pull/741) > > **Full Changelog**: <openrewrite/rewrite-static-analysis@v2.21.0...v2.22.0> Commits * [`4d6fd83`](openrewrite/rewrite-static-analysis@4d6fd83) Fix `RemoveUnusedLocalVariables` to preserve assignments with side effects (#... * [`16dc1da`](openrewrite/rewrite-static-analysis@16dc1da) Add JavascriptFileChecker to selectively skip JavaScript files ([#787](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/787)) * [`c1712c2`](openrewrite/rewrite-static-analysis@c1712c2) Update documentation examples * [`af53ce1`](openrewrite/rewrite-static-analysis@af53ce1) Run `UnnecessaryCatch` after `UnnecessaryThrows` to remove unused catch claus... * [`b670b5a`](openrewrite/rewrite-static-analysis@b670b5a) Skip UnnecessaryCatch after any missing types via a precondition ([#784](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/784)) * [`0f1d5db`](openrewrite/rewrite-static-analysis@0f1d5db) Annotate required parameters with `@NonNull` and remove throws ([#782](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/782)) * [`02e09d0`](openrewrite/rewrite-static-analysis@02e09d0) Annotate nullable array type parameters ([#779](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/779)) * [`0f25051`](openrewrite/rewrite-static-analysis@0f25051) Move nullable annotations to array types ([#778](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/778)) * [`995c2d3`](openrewrite/rewrite-static-analysis@995c2d3) Fix `ReplaceLambdaWithMethodReference` for local records and classes ([#336](https://redirect.github.com/openrewrite/rewrite-static-analysis/issues/336)) (... * [`0ea5975`](openrewrite/rewrite-static-analysis@0ea5975) Prevent `ReplaceLambdaWithMethodReference` in nested generic/overloaded conte... * Additional commits viewable in [compare view](openrewrite/rewrite-static-analysis@v2.21.0...v2.22.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
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.
Summary
Fixes inheritance detection in
CombineSemanticallyEqualCatchBlocksrecipe when exception classes are inner/nested types.Problem
The recipe was incorrectly combining catch blocks when an inner exception type (e.g.,
Outer.InnerException) extended a parent exception (e.g.,Exception). Instead of eliminating the redundant child exception, it created invalid code:Root Cause
The recipe only tracked
J.Identifierinstances when identifying parent-child exception relationships, but inner/nested exception types are represented asJ.FieldAccessin the AST (e.g.,Outer.InnerExceptionis a field access, not a simple identifier).Changes
Set<J.Identifier>toSet<NameTree>to handle both identifier and field access exception typesJ.FieldAccessin addition toJ.Identifierwhen tracking parent-child relationshipscombineEquivalentCatches()to properly check and exclude both types of exception representationsremoveRedundantInnerExceptionWhenParentIsCaught()test that verifies the fixTest plan
New test
removeRedundantInnerExceptionWhenParentIsCaughtverifies inner exceptions are properly handledAll existing tests continue to pass, confirming backward compatibility
Fixes CombineSemanticallyEqualCatchBlocks doesn't detect inheritance in nested Exceptions #771
🤖 Generated with Claude Code