refactor: simplify hex escape pattern scanning - #1003
Merged
delei merged 8 commits intoAug 16, 2026
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Refactors EscapeHexCellWriteHandler’s _xHHHH_ pattern scanning to remove duplicated logic while preserving existing behavior, improving readability and avoiding allocations on the no-match path (as described in #1000’s refactor/cleanup step).
Changes:
- Consolidates pattern detection and replacement into a single scanning loop (removing the prior two-method split).
- Lazily allocates the
StringBuilderonly after the first valid match is found. - Introduces named offsets/constants (
PREFIX_LENGTH,HEX_DIGIT_COUNT) and renames hex validation helper toisHexDigits.
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
delei
reviewed
Aug 16, 2026
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.
Related: #1000
Purpose of the pull request
The second of the two PRs. This one does the refactor/cleanup. No behaviour change.
What's changed?
escapeHexlocated thefirst valid pattern, then
processWithPatternslocated every later one. Both carried the same match-handling code - bounds check, closing-_test, hex validation, append, so any change to the rule had to be made in two places. It is now a single loop.StringBuilderis created on the first match rather than up front, so a cell containing no_xHHHH_- costs oneindexOfscan and no allocation.hexStart,suffixIndexandpatternEndfromPREFIX_LENGTHandHEX_DIGIT_COUNT.isValidHexFastis nowisHexDigits, and the lookup table has a note on why it is notCharacter.digit(c, 16)- that method also accepts non-ASCII digits such asU+0663, which OOXML never encodes.Checklist