Implement proper surrogate pair handling in JavaWordFinder#2922
Draft
vogella wants to merge 1 commit into
Draft
Conversation
vogella
force-pushed
the
fix-java-word-finder
branch
from
4eab49f to
b6d5ad7
Compare
vogella
changed the title
Replace the simplistic surrogate skip (from eclipse-jdt#2977) with full code-point checking: when a surrogate char is encountered, form the code point from the pair and test it with Character.isJavaIdentifierPart(int), so identifiers containing supplementary Unicode characters are correctly included in the word region.
vogella
force-pushed
the
fix-java-word-finder
branch
from
b6d5ad7 to
143821b
Compare
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.
PR #2977 removed the stale ICU comments from JavaWordFinder and replaced them with a simple surrogate skip (
!Character.isSurrogate(c)). That avoids the old placeholder comments but still does not correctly handle supplementary Unicode characters in Java identifiers.This PR replaces that shortcut with proper code-point logic: when a surrogate char is encountered during a word scan, the adjacent char is read to form the full code point, which is then tested with
Character.isJavaIdentifierPart(int). Identifiers containing supplementary Unicode characters are now included in the word region correctly, and unpaired or non-identifier surrogates still terminate the scan.