Skip IfElseIfConstructToSwitch when instanceof types are missing#1095
Merged
Conversation
The template references symbols visible from its insertion scope (variables, types, methods), so parsing outside that context can fail on Java 21 pattern-switch syntax and leak `__P__` parameter stubs into the result.
Replace the speculative `contextSensitive()` template change with a precondition: skip the conversion when any `instanceof`'s type is missing or unknown. A reporter observed JavaTemplate parameter stubs (`__P__./*__pN__*/voidp()`) leaking into the generated switch when types were unresolved; staying conservative avoids the broken output without guessing at the precise template parser interaction.
timtebeek
changed the title
contextSensitive() template in IfElseIfConstructToSwitchIfElseIfConstructToSwitch when instanceof types are missing
`RemoveAnnotationVisitor.maybeRemoveBlankLines` walks up to the enclosing `JavaSourceFile`, but the visitor was invoked without a parent cursor, causing `IllegalStateException: Expected to find enclosing JavaSourceFile` after a recent framework change.
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
1 participant
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
IfElseIfConstructToSwitchemitting broken output with leaked JavaTemplate parameter stubs (__P__./*__pN__*/voidp()) and mis-parsed pattern-switch syntax. The reporter suspected missing type information.instanceoftypes are well-formed (TypeUtils.isWellFormedType). When types are unresolvable, the if-chain is now left unchanged.unresolvableTypesKeepCaseSpacing(Missing whitespace on case inzuul-core/.../Http2MetricsChannelHandlers.javawithIf-else-if-else to switchrewrite#7458), which previously produced a switch even with unresolvable types. The test is renamed and inverted to assert no-change.Test plan
./gradlew test --tests "*IfElseIfConstructToSwitchTest*"(all 25 tests pass)