Repository navigation
Align Unicode numbers in Android lab marker keys (rebase of #2552) - #2628
Merged
Merged
Conversation
…r keys The branch carried its own snapshot of Tools/parity_twin_map.json, taken before the declaration cleanup landed on main. Both edited the same counts, so the rebase conflicted there. A map is DERIVED, so the resolution is to regenerate it rather than to pick a side or merge the JSON by hand: either of those produces counts that describe neither tree. Resolved by taking main's snapshot and re-running --refresh-derived over the rebased source, which reproduces cleanly. Metadata only. The lab-marker change itself is unchanged and stays authored by its contributor.
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
2 participants
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.
Rebase of #2552 by @kavemang onto current main. Their two commits are unchanged and still theirs; the
only addition is a metadata commit regenerating the parity map.
Why it needed a rebase
The declaration cleanup (#2617) landed its own refresh of
Tools/parity_twin_map.jsonwhile this satopen, and both touched the same counts. A derived map cannot be hand-merged or resolved by picking a
side, because either produces numbers describing neither tree. Resolved by taking main's snapshot and
re-running
--refresh-derivedover the rebased source, which reproduces cleanly.What the change is
Android replaced Unicode number letters with underscores where Swift's
Character.isNumberkept them, sothe two platforms stored DIFFERENT keys for the same CSV row.
eGFR mL/min/1.73m²,Factor Ⅻ,Vitamin B₁₂,½ doseand similar names all diverged.That is a stored-data divergence under the repository's first rule, not a cosmetic one: a marker imported
on Android and the same marker imported on Apple did not land under the same key. The Kotlin side now
keeps
LETTER_NUMBERandOTHER_NUMBERcode points, matching Swift, and both test tables are extendedwith the same cases.
The contributor's own note on the remaining limit is worth keeping in view: NFC-composable names produce
the same key, but Swift's grapheme clusters and Kotlin's code points can still differ for uncomposed
marks. That is stated in the doc rather than papered over.
Verification
com.noop.ingest.LabMarkerCsvImportTest25 tests, 0 failures, run with--no-build-cache --rerun-tasksand the result XML checked against the clock.
The Swift half could not be run here:
StrandImportis GRDB-linked and this Linux host has nosnapshot-enabled SQLite (
sqlite3.h not found, the limitationdocs/BUILD.mddescribes), so theswift-packagesleg is what coversLabMarkerCsvImportTests.Supersedes #2552.