The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 06:00 UTC
fix(mobile): Android diff word highlights sit on the changed characters (#33568)
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Victor committed
Nov 19, 2026 at 16:22 UTC
6b6950adfe2ea03b31894829ac8bfb369c9c35a2
3 files changed
+188
-76
apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/ReviewDiffCanvasDrawing.kt
+103
-74
@@ -221,6 +221,7 @@ internal class ReviewDiffCanvasDrawing(context: Context) {
221
private var measuredContentWidth = 0
222
private var asciiCharacterWidth = 0f
223
private var asciiFixedPitch = false
224
+ private var wordDiffLefts = FloatArray(0)
225
226
fun tokensChangeWidth(
227
previous: Map<String, List<DiffToken>>,
@@ -332,14 +333,58 @@ internal class ReviewDiffCanvasDrawing(context: Context) {
333
configureMonospacePaint(theme.hunkText, style.hunkFontSizePx, style.hunkFontWeight)
334
return textPaint.measureText(row.text.ifEmpty { row.content })
335
}
335
- val runs = if (tokens.isNullOrEmpty()) listOf(DiffToken(row.content, null, 0)) else tokens
336
- var width = 0f
337
- // Match drawCode's run boundaries and fonts, including fallback glyphs and tabs.
338
- for (run in runs) {
339
- configureCodePaint(run.color ?: theme.text, run.fontStyle, style)
340
- width += textPaint.measureText(run.content)
336
+ val lines = CodeWrapLayout.NONE.lines(row)
337
+ return forEachCodePiece(row, tokens, style, lines) { text, start, end, _, _, _, _ ->
338
+ textPaint.measureText(text, start, end)
339
}
342
- return width
340
+ }
341
+
342
+ /** Row width, highlights and drawCode share these drawText pieces so their positions agree. */
343
+ private inline fun forEachCodePiece(
344
+ row: DiffRow,
345
+ tokens: List<DiffToken>?,
346
+ style: DiffStyle,
347
+ lines: CodeLines,
348
+ piece: (
349
+ text: String,
350
+ start: Int,
351
+ end: Int,
352
+ tokenStart: Int,
353
+ x: Float,
354
+ line: Int,
355
+ note: Boolean
356
+ ) -> Float
357
+ ): Float {
358
+ val noteStart = row.noteStart ?: Int.MAX_VALUE
359
+ var line = 0
360
+ var x = 0f
361
+ var tokenStart = 0
362
+ val runCount = if (tokens.isNullOrEmpty()) 1 else tokens.size
363
+ for (index in 0 until runCount) {
364
+ val run = tokens?.getOrNull(index)
365
+ val text = run?.content ?: row.content
366
+ var start = 0
367
+ while (start < text.length) {
368
+ while (line + 1 < lines.starts.size && lines.starts[line + 1] <= tokenStart + start) {
369
+ line += 1
370
+ x = 0f
371
+ }
372
+ val note = tokenStart + start >= noteStart
373
+ var end = min(text.length, lines.end(line, Int.MAX_VALUE) - tokenStart)
374
+ if (!note) end = min(end, noteStart - tokenStart)
375
+ if (start == 0 || tokenStart + start == noteStart) {
376
+ configureCodePaint(
377
+ if (note) theme.warningText else run?.color ?: theme.text,
378
+ run?.fontStyle ?: 0,
379
+ style,
380
+ )
381
+ }
382
+ x += piece(text, start, end, tokenStart, x, line, note)
383
+ start = end
384
+ }
385
+ tokenStart += text.length
386
+ }
387
+ return x
388
}
389
390
fun lineNumberColor(change: String): Int = when (change) {
@@ -368,34 +413,55 @@ internal class ReviewDiffCanvasDrawing(context: Context) {
413
fun drawWordDiffRanges(
414
canvas: Canvas,
415
row: DiffRow,
416
+ tokens: List<DiffToken>?,
417
codeX: Float,
418
top: Int,
419
bottom: Int,
374
- lines: CodeLines
420
+ lines: CodeLines,
421
+ style: DiffStyle
422
) {
376
- if (lines.nativeLayout != null) return
377
- if (row.wordDiffRanges.isEmpty() || (row.change != "add" && row.change != "delete")) return
423
+ val changed = row.change == "add" || row.change == "delete"
424
+ if (lines.nativeLayout != null || row.wordDiffRanges.isEmpty() || !changed) return
425
val color = if (row.change == "add") theme.addBar else theme.deleteBar
426
backgroundPaint.color = withAlpha(color, 71)
380
- val characterWidth = textPaint.measureText("M")
427
+ configureCodePaint(theme.text, 0, style)
428
val fontHeight = textPaint.fontMetrics.run { descent - ascent }
429
val highlightHeight = max(4f * density, min(bottom - top - 4f * density, fontHeight))
430
val highlightTop = (top + bottom - highlightHeight) / 2f
384
- row.wordDiffRanges.forEach { range ->
385
- lines.starts.forEachIndexed { line, lineStart ->
386
- val start = max(range.start, lineStart)
387
- val end = min(range.end, lines.end(line, Int.MAX_VALUE))
388
- if (end <= start) return@forEachIndexed
389
- val left = codeX + (start - lineStart) * characterWidth
390
- val right = max(left + 2f * density, left + (end - start) * characterWidth)
391
- val lineTop = highlightTop + line * lines.height
392
- canvas.drawRoundRect(
393
- RectF(left, lineTop, right, lineTop + highlightHeight),
394
- 3f * density,
395
- 3f * density,
396
- backgroundPaint,
397
- )
431
+ if (wordDiffLefts.size < row.wordDiffRanges.size) {
432
+ wordDiffLefts = FloatArray(row.wordDiffRanges.size)
433
+ }
434
+ val lefts = wordDiffLefts
435
+ val lastEnd = row.wordDiffRanges.maxOf { it.end }
436
+ forEachCodePiece(row, tokens, style, lines) { text, start, end, tokenStart, x, line, _ ->
437
+ val pieceX = codeX + x
438
+ val advance = textPaint.measureText(text, start, end)
439
+
440
+ // Inside a piece an edge keeps its kerning and clusters, as drawText shapes the whole piece;
441
+ // the piece's end is where drawCode starts the next one.
442
+ fun edge(at: Int) = if (at == end) {
443
+ pieceX + advance
444
+ } else {
445
+ pieceX + textPaint.getRunAdvance(text, start, end, start, end, false, at)
446
+ }
447
+ row.wordDiffRanges.forEachIndexed { index, range ->
448
+ val left = max(range.start, lines.starts[line]) - tokenStart
449
+ val right = min(range.end, lines.end(line, Int.MAX_VALUE)) - tokenStart
450
+ if (right <= left) return@forEachIndexed
451
+ if (left in start until end) lefts[index] = edge(left)
452
+ if (right in start + 1..end) {
453
+ val lineTop = highlightTop + line * lines.height
454
+ val rightX = max(lefts[index] + 2f * density, edge(right))
455
+ canvas.drawRoundRect(
456
+ RectF(lefts[index], lineTop, rightX, lineTop + highlightHeight),
457
+ 3f * density,
458
+ 3f * density,
459
+ backgroundPaint,
460
+ )
461
+ }
462
}
463
+ if (tokenStart + end >= lastEnd) return
464
+ advance
465
}
466
}
467
@@ -417,35 +483,19 @@ internal class ReviewDiffCanvasDrawing(context: Context) {
483
canvas.restore()
484
return
485
}
420
- val runs = if (tokens.isNullOrEmpty()) listOf(DiffToken(row.content, null, 0)) else tokens
421
- var line = 0
422
- var x = codeX
423
- var column = 0
424
- splitAtNote(runs, row.noteStart).forEach { (run, note) ->
425
- configureCodePaint(
426
- if (note) theme.warningText else run.color ?: theme.text,
427
- run.fontStyle,
428
- style,
429
- )
430
- var start = 0
431
- while (start < run.content.length) {
432
- while (line + 1 < lines.starts.size && lines.starts[line + 1] <= column + start) {
433
- line += 1
434
- x = codeX
435
- }
436
- val end = min(run.content.length, lines.end(line, Int.MAX_VALUE) - column)
437
- val lineBaseline = baseline + line * lines.height
438
- if (lineBaseline + textPaint.fontMetrics.descent >= canvas.clipBounds.top &&
439
- lineBaseline + textPaint.fontMetrics.ascent <= canvas.clipBounds.bottom
440
- ) {
441
- val segmentWidth = textPaint.measureText(run.content, start, end)
442
- fillNote(canvas, note, x, x + segmentWidth, lineBaseline)
443
- canvas.drawText(run.content, start, end, x, lineBaseline, textPaint)
444
- x += segmentWidth
445
- }
446
- start = end
486
+ forEachCodePiece(row, tokens, style, lines) { text, start, end, _, x, line, note ->
487
+ val lineBaseline = baseline + line * lines.height
488
+ if (lineBaseline + textPaint.fontMetrics.descent >= canvas.clipBounds.top &&
489
+ lineBaseline + textPaint.fontMetrics.ascent <= canvas.clipBounds.bottom
490
+ ) {
491
+ val left = codeX + x
492
+ val segmentWidth = textPaint.measureText(text, start, end)
493
+ fillNote(canvas, note, left, left + segmentWidth, lineBaseline)
494
+ canvas.drawText(text, start, end, left, lineBaseline, textPaint)
495
+ segmentWidth
496
+ } else {
497
+ 0f
498
}
448
- column += run.content.length
499
}
500
}
501
@@ -553,24 +603,3 @@ private object ReviewDiffTypefaces {
603
else -> regular
604
}
605
}
556
-
557
-/** Splits color runs where a cut line's note starts; the flag marks the note's runs. */
558
-private fun splitAtNote(runs: List<DiffToken>, noteStart: Int?): List<Pair<DiffToken, Boolean>> {
559
- if (noteStart == null) return runs.map { it to false }
560
- return buildList {
561
- var offset = 0
562
- for (run in runs) {
563
- val end = offset + run.content.length
564
- when {
565
- end <= noteStart -> add(run to false)
566
- offset >= noteStart -> add(run to true)
567
- else -> {
568
- val cut = noteStart - offset
569
- add(run.copy(content = run.content.substring(0, cut)) to false)
570
- add(run.copy(content = run.content.substring(cut)) to true)
571
- }
572
- }
573
- offset = end
574
- }
575
- }
576
-}
apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffView.kt
+3
-2
@@ -1329,9 +1329,10 @@ private class DiffCanvasView(context: Context) : View(context) {
1329
val firstLineBottom = top + lines.firstHeight(style.rowHeightPx.toInt())
1330
drawScrollableCode(canvas, top, bottom) { codeX ->
1331
drawing.configureCodePaint(theme.text, 0, style)
1332
- drawing.drawWordDiffRanges(canvas, row, codeX, top, firstLineBottom, lines)
1332
val baseline = lines.baseline(top, firstLineBottom, textPaint)
1334
- drawing.drawCode(canvas, row, tokensByRowId[row.id], codeX, baseline, style, lines)
1333
+ val tokens = tokensByRowId[row.id]
1334
+ drawing.drawWordDiffRanges(canvas, row, tokens, codeX, top, firstLineBottom, lines, style)
1335
+ drawing.drawCode(canvas, row, tokens, codeX, baseline, style, lines)
1336
}
1337
1338
drawLineNumber(canvas, row, top, firstLineBottom)
apps/mobile/modules/t3-review-diff/tests/android/src/test/kotlin/expo/modules/t3reviewdiff/ReviewDiffGeometryTest.kt
+82
@@ -1,6 +1,12 @@
1
package expo.modules.t3reviewdiff
2
3
+import android.graphics.Bitmap
4
+import android.graphics.Canvas
5
import android.graphics.Color
6
+import android.graphics.Paint
7
+import android.graphics.RectF
8
+import android.text.StaticLayout
9
+import android.text.TextPaint
10
import android.view.View
11
import kotlin.math.ceil
12
import expo.modules.kotlin.AppContext
@@ -177,6 +183,82 @@ class ReviewDiffGeometryTest {
183
}
184
}
185
186
+ @Test
187
+ fun unwrappedWordDiffHighlightsCoverTheTextDrawCodeDraws() {
188
+ val drawing = ReviewDiffCanvasDrawing(RuntimeEnvironment.getApplication())
189
+ val boxes = mutableListOf<RectF>()
190
+ val texts = mutableMapOf<String, Float>()
191
+ val paints = mutableMapOf<String, TextPaint>()
192
+ val bitmap = Bitmap.createBitmap(1000, 60, Bitmap.Config.ARGB_8888)
193
+ val canvas = object : Canvas(bitmap) {
194
+ override fun drawRoundRect(rect: RectF, rx: Float, ry: Float, paint: Paint) {
195
+ boxes += RectF(rect)
196
+ }
197
+
198
+ override fun drawText(
199
+ text: String,
200
+ start: Int,
201
+ end: Int,
202
+ x: Float,
203
+ y: Float,
204
+ paint: Paint
205
+ ) {
206
+ texts[text.substring(start, end)] = x
207
+ paints[text.substring(start, end)] = TextPaint(paint)
208
+ }
209
+ }
210
+
211
+ // The framework's caret position in the piece drawCode drew, kerning included.
212
+ fun caret(piece: String, offset: Int): Float {
213
+ val layout = StaticLayout.Builder.obtain(piece, 0, piece.length, paints.getValue(piece), 1000)
214
+ return texts.getValue(piece) + layout.build().getPrimaryHorizontal(offset)
215
+ }
216
+ val lines = CodeLines(intArrayOf(0), 0)
217
+ for (weight in listOf("medium", "regular")) {
218
+ val style = DiffStyle.defaults(1f).copy(codeFontWeight = weight, codeFontSizePx = 17f)
219
+ for (prefix in listOf("if ", "说明 ", "😀 ")) {
220
+ val tokens = listOf(
221
+ DiffToken(prefix, Color.RED, 2),
222
+ DiffToken("go ", Color.BLUE, 0),
223
+ DiffToken("1.27.3", Color.GREEN, 0),
224
+ DiffToken(";", Color.BLUE, 0),
225
+ DiffToken(" LTP.", Color.BLUE, 0),
226
+ DiffToken(" AV", Color.GREEN, 0),
227
+ DiffToken("LP.", Color.BLUE, 0),
228
+ )
229
+ val content = tokens.joinToString("") { it.content }
230
+ val start = content.indexOf("1.27.3")
231
+ val kerned = content.indexOf("TP")
232
+ val crossing = content.indexOf("VLP")
233
+ val row = row("line", content).copy(
234
+ wordDiffRanges = listOf(
235
+ DiffWordDiffRange(start, start + "1.27.3".length),
236
+ DiffWordDiffRange(kerned, kerned + 2),
237
+ DiffWordDiffRange(crossing, crossing + 3),
238
+ ),
239
+ )
240
+ boxes.clear()
241
+ texts.clear()
242
+ paints.clear()
243
+ drawing.configureCodePaint(Color.BLACK, 0, style)
244
+ drawing.drawWordDiffRanges(canvas, row, tokens, 10f, 0, 40, lines, style)
245
+ drawing.drawCode(canvas, row, tokens, 10f, 28f, style, lines)
246
+ assertEquals(3, boxes.size)
247
+ val (box, kernedBox, crossingBox) = boxes
248
+ val case = "weight=$weight prefix=$prefix"
249
+ assertEquals("$case left", requireNotNull(texts["1.27.3"]), box.left, 0.5f)
250
+ assertEquals("$case right", requireNotNull(texts[";"]), box.right, 0.5f)
251
+ val unkerned = texts.getValue(" LTP.") + paints.getValue(" LTP.").measureText(" L")
252
+ if (weight == "medium") assertTrue("$case L and T kern", caret(" LTP.", 2) < unkerned - 1f)
253
+ assertEquals("$case kerned left", caret(" LTP.", 2), kernedBox.left, 0.5f)
254
+ assertEquals("$case kerned right", caret(" LTP.", 4), kernedBox.right, 0.5f)
255
+ assertEquals("$case crossing left", caret(" AV", 2), crossingBox.left, 0.5f)
256
+ assertEquals("$case crossing right", caret("LP.", 2), crossingBox.right, 0.5f)
257
+ }
258
+ }
259
+ bitmap.recycle()
260
+ }
261
+
262
@Test
263
fun lazyAsciiHeightAndLineStartsMatchTheExistingLayoutAtEveryBoundary() {
264
val drawing = ReviewDiffCanvasDrawing(RuntimeEnvironment.getApplication())