Repository navigation
fix(gui): keep rename enabled for variables named as contextual keywords - #3044
Merged
Merged
Conversation
RSyntaxTextArea tokenizes contextual keywords like 'var' as DATA_TYPE and 'yield' as RESERVED_WORD_2. JadxTokenMaker only converted RESERVED_WORD contextual keywords back to identifiers, so CodeArea.adjustOffsetForWordToken rejected those tokens and disabled rename (and other node actions) for variables renamed to such names.
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.
Fixes #3034
Root cause
The rename itself is valid: �ar is a legal Java variable name and jadx applies the rename correctly. The problem is in the code area after the rename.
RSyntaxTextArea tokenizes contextual keywords according to their Java grammar role:
ecord, sealed, module, ... -> TokenTypes.RESERVED_WORD
JadxTokenMaker only converted RESERVED_WORD contextual keywords back to IDENTIFIER. CodeArea.adjustOffsetForWordToken() accepts only identifiers/functions (plus static), so a variable named �ar could not be resolved from the caret. With no node under the caret, RenameAction was disabled, so the variable could not be renamed again.
Fix
Treat DATA_TYPE and RESERVED_WORD_2 tokens through the same contextual-keyword check as RESERVED_WORD, and run that check even for the first token of a line. Real keywords/types (int,
eturn, class) are not in the contextual set and keep their token type.
Validation
ecord/... become identifiers while int/
eturn/class are unchanged)