The best way to control Claude Code, Codex and more from any computer or phone
fix(web): file editor carets and selections follow code font changes (#35144)
Julius Marminge committed
Nov 12, 2026 at 03:07 UTC
a94846d4c5967ebeb2b6c9514820de6ed6ac55f5
2 files changed
+122
-7
patches/@pierre__diffs@1.7.0-beta.3.patch
+117
-2
@@ -250,10 +250,18 @@ index 984f049ff3694dd353fa6637b0f09fc7dce74992..4d6599905be0fe7b5b5c1a225c0b3ff8
250
workingDiff,
251
diff: pendingRenderDiff
252
diff --git a/dist/editor/editor.js b/dist/editor/editor.js
253
-index a9905d43382de2ca03d6111ba9ab3725d8cb6981..466252fbc025fec5e29fc2958ad54b58f89ed124 100644
253
+index a9905d43382de2ca03d6111ba9ab3725d8cb6981..294f537622b9a62d89111d7ed4a7c07cc24dac30 100644
254
--- a/dist/editor/editor.js
255
+++ b/dist/editor/editor.js
256
-@@ -490,7 +490,9 @@ var Editor = class {
256
+@@ -106,6 +106,7 @@ var Editor = class {
257
+ #deletionsColumn;
258
+ #overlayElement;
259
+ #overlayElements;
260
++ #fontProbeElement;
261
+ #caretElements;
262
+ #caretHighlightElements;
263
+ #primaryCaretElement;
264
+@@ -490,7 +491,9 @@ var Editor = class {
265
selections: this.#selections
266
});
267
const primarySelection = resolvedSelections.at(-1);
@@ -264,6 +272,113 @@ index a9905d43382de2ca03d6111ba9ab3725d8cb6981..466252fbc025fec5e29fc2958ad54b58
272
this.#scrollToPrimaryCaret();
273
}
274
setMarkers(markers) {
275
+@@ -595,6 +598,7 @@ var Editor = class {
276
+ this.#contentHasFocus = false;
277
+ this.#overlayElement?.remove();
278
+ this.#overlayElement = void 0;
279
++ this.#fontProbeElement = void 0;
280
+ this.#resizeObserver?.disconnect();
281
+ this.#resizeObserver = void 0;
282
+ this.#fontRemeasureScheduled = false;
283
+@@ -1033,6 +1037,19 @@ var Editor = class {
284
+ this.#tokenizer?.applyStyle();
285
+ this.#spriteElement = createSpriteElement();
286
+ this.#overlayElement = h("div", { dataset: "editorOverlay" });
287
++ // Resizes when the inherited code font changes, so the observer can re-measure.
288
++ this.#fontProbeElement = h("span", {
289
++ ariaHidden: "true",
290
++ style: {
291
++ position: "absolute",
292
++ top: "0",
293
++ left: "0",
294
++ visibility: "hidden",
295
++ pointerEvents: "none",
296
++ whiteSpace: "pre"
297
++ },
298
++ textContent: "0"
299
++ }, this.#overlayElement);
300
+ const replacementFocusTargetIsContent = (event) => {
301
+ const target = event.composedPath()[0];
302
+ return target instanceof Node && this.#contentElement?.contains(target) === true;
303
+@@ -1409,6 +1426,7 @@ var Editor = class {
304
+ this.#resizeObserver = new ResizeObserver(this.#handleLayoutResize);
305
+ this.#resizeObserver.observe(contentEl);
306
+ this.#resizeObserver.observe(contentEl.parentElement);
307
++ if (this.#fontProbeElement !== void 0) this.#resizeObserver.observe(this.#fontProbeElement);
308
+ this.#computeContentOffset(contentEl);
309
+ }
310
+ #handleCustomPasteEvent = async () => {
311
+@@ -1864,7 +1882,9 @@ var Editor = class {
312
+ const change = textDocument.applyEdits(edits, true, selections, nextSelections, true);
313
+ if (change !== void 0) this.#applyChange(change, nextSelections);
314
+ }
315
+- #handleLayoutResize = () => {
316
++ #handleLayoutResize = (entries) => {
317
++ const contentElement = this.#contentElement;
318
++ const metricsChanged = contentElement !== void 0 && entries.some((entry) => entry.target === this.#fontProbeElement) && this.#metrics.init(contentElement);
319
+ const lineAnnotations = this.#lineAnnotations?.length ?? 0;
320
+ const prevGutterWidth = this.#gutterWidthCache;
321
+ const prevContentWidth = this.#contentWidthCache;
322
+@@ -1872,12 +1892,12 @@ var Editor = class {
323
+ this.#contentWidthCache = void 0;
324
+ const gutterWidthChanged = this.#getGutterWidth() !== prevGutterWidth;
325
+ const contentWidthChanged = this.#getContentWidth() !== prevContentWidth;
326
+- if (!gutterWidthChanged && !contentWidthChanged) return;
327
++ if (!gutterWidthChanged && !contentWidthChanged && !metricsChanged) return;
328
+ this.#lastAccessedCharX = void 0;
329
+ this.#metrics.clearTextWidthCache();
330
+- if (contentWidthChanged) {
331
++ if (contentWidthChanged || metricsChanged) {
332
+ this.#wrapLineOffsetsCache.clear();
333
+- if (this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
334
++ if (metricsChanged || this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
335
+ }
336
+ if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) {
337
+ this.#updateSelections(this.#selections ?? []);
338
+diff --git a/dist/editor/textMeasure.d.ts b/dist/editor/textMeasure.d.ts
339
+index 89e938d89eca77d351aeed65f3c5495383effd97..cde1d6ba89a97bbb1614754a48f8994388c186bd 100644
340
+--- a/dist/editor/textMeasure.d.ts
341
++++ b/dist/editor/textMeasure.d.ts
342
+@@ -9,8 +9,8 @@ declare class Metrics {
343
+ lineHeight: number;
344
+ /** Padding top of the root element. */
345
+ paddingTop: number;
346
+- /** initialize the metrics */
347
+- init(root: HTMLElement): void;
348
++ /** (re)read the metrics from root, returning true when they changed */
349
++ init(root: HTMLElement): boolean;
350
+ /**
351
+ * Re-measure the '0' character width against the font that is loaded right
352
+ * now, returning true when measurement-dependent UI should refresh.
353
+diff --git a/dist/editor/textMeasure.js b/dist/editor/textMeasure.js
354
+index 96d4fb137ea683b66381b1ce6e47e8708a89366c..13f2564897a5bf53a8f311300003b3ea875c73a5 100644
355
+--- a/dist/editor/textMeasure.js
356
++++ b/dist/editor/textMeasure.js
357
+@@ -16,9 +16,10 @@ var Metrics = class {
358
+ lineHeight = 20;
359
+ /** Padding top of the root element. */
360
+ paddingTop = 0;
361
+- /** initialize the metrics */
362
++ /** (re)read the metrics from root, returning true when they changed */
363
+ init(root) {
364
+- if (this.#root === root && this.#canvasCtx !== void 0 && this.ch !== -1) return;
365
++ const previousLineHeight = this.lineHeight;
366
++ let fontChanged = false;
367
+ this.#root = root;
368
+ this.#canvas ??= h("canvas", { style: { display: "none" } });
369
+ this.#canvasCtx ??= this.#canvas.getContext("2d") ?? void 0;
370
+@@ -37,9 +38,11 @@ var Metrics = class {
371
+ this.#setCanvasFont(font);
372
+ this.ch = this.canvasMeasureTextWidth("0");
373
+ this.clearTextWidthCache();
374
++ fontChanged = true;
375
+ }
376
+ const nextTabSize = parseInt(tabSize, 10);
377
+ if (!Number.isNaN(nextTabSize)) this.tabSize = nextTabSize;
378
++ return fontChanged || this.lineHeight !== previousLineHeight;
379
+ }
380
+ /**
381
+ * Re-measure the '0' character width against the font that is loaded right
382
diff --git a/dist/utils/createFileHeaderElement.js b/dist/utils/createFileHeaderElement.js
383
index 19934176d0787ae1304e771c707230d5c8837e83..298b3386eac5126a7c1ec985674e799aac0ffd42 100644
384
--- a/dist/utils/createFileHeaderElement.js
pnpm-lock.yaml
+5
-5
@@ -366,7 +366,7 @@ patchedDependencies:
366
'@ff-labs/fff-node@0.11.0': cc71fcec015f4d39bc96ae2e2bf6b0ca678124c722c66a7841efce9d34b5983c
367
'@legendapp/list@3.7.2': 3c68607b8bb7a531873bcbe0b197d163ef1fdb4d4cf52a4ddf9d2b3804671658
368
'@muse-code/sdk@1.4.6': 7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101
369
- '@pierre/diffs@1.7.0-beta.3': aea143f4a2e59744371219c4e7ae675ec739c9ba16f1732e2f11748b496ea05e
369
+ '@pierre/diffs@1.7.0-beta.3': 4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8
370
'@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
371
'@react-native-menu/menu@2.0.0': 6872ba71b9847c5a0210b1b896923dadc3860faedfe28d9f062bcedfe786ef1d
372
'@react-navigation/native-stack@7.21.0': 990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42
@@ -567,7 +567,7 @@ importers:
567
version: 0.3.0
568
'@pierre/diffs':
569
specifier: 1.7.0-beta.3
570
- version: 1.7.0-beta.3(patch_hash=aea143f4a2e59744371219c4e7ae675ec739c9ba16f1732e2f11748b496ea05e)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
570
+ version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
571
'@pierre/highlights':
572
specifier: 'catalog:'
573
version: 0.5.0
@@ -1088,7 +1088,7 @@ importers:
1088
version: 1.8.0
1089
'@pierre/diffs':
1090
specifier: 1.7.0-beta.3
1091
- version: 1.7.0-beta.3(patch_hash=aea143f4a2e59744371219c4e7ae675ec739c9ba16f1732e2f11748b496ea05e)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1091
+ version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1092
'@pierre/trees':
1093
specifier: 1.0.0-beta.6
1094
version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -1504,7 +1504,7 @@ importers:
1504
dependencies:
1505
'@pierre/diffs':
1506
specifier: 1.7.0-beta.3
1507
- version: 1.7.0-beta.3(patch_hash=aea143f4a2e59744371219c4e7ae675ec739c9ba16f1732e2f11748b496ea05e)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1507
+ version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1508
'@t3tools/contracts':
1509
specifier: workspace:*
1510
version: link:../contracts
@@ -16398,7 +16398,7 @@ snapshots:
16398
tslib: 2.8.1
16399
webcrypto-core: 1.9.2
16400
16401
- '@pierre/diffs@1.7.0-beta.3(patch_hash=aea143f4a2e59744371219c4e7ae675ec739c9ba16f1732e2f11748b496ea05e)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
16401
+ '@pierre/diffs@1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
16402
dependencies:
16403
'@pierre/highlights': 0.5.0
16404
'@pierre/patches': 0.0.1