Keep mockStatic import in CleanupMockitoImports when type info is incomplete#1047
Merged
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
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.
What's changed
CleanupMockitoImportskeeps a curated list of Mockito method names (MOCKITO_METHOD_NAMES). When a call's type information isn't well-formed (e.g. an older Mockito on the classpath, or surrounding types that don't fully resolve), the recipe relies on this list to recognize the call and avoid removing the still-needed static import.mockStatic(and its siblingmockConstruction) were missing from that list — onlymockwas present. As a result,import static org.mockito.Mockito.mockStatic;was wrongly removed whenever themockStatic(...)call's type couldn't be resolved, even though it was still in use.This PR adds
mockStaticandmockConstructionto the list, and adds a reproducing test.Context
Reported via a Moderne result on
moderneinc/rewrite-ai-searchwheremockStaticwas being stripped fromSpellCheckCommentsInFrenchTest.javadespite being used.