@adecore/editor-react 0.39.0 → 0.40.1

package/dist/PickPopup.js

@@ -2,7 +2,7 @@ import { c as _c } from "react/compiler-runtime";
 import { useId, useLayoutEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { PathText } from "./PathText.js";
-import { keepFocusOutOfList } from './popup-focus.js';
+import { keepFocusOutOfList, useInputPopup } from './popup-focus.js';
 import { placePopup } from './popup-placement.js';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const CARD = 'fixed top-0 left-0 z-(--z-popup) flex w-[420px] flex-col overflow-hidden rounded-lg border border-border bg-surface-raised text-text shadow-(--float-shadow)';
@@ -95,7 +95,7 @@ function _temp(line, index) {
   }, `-${index}`);
 }
 export function PickPopup(t0) {
-  const $ = _c(39);
+  const $ = _c(31);
   const {
     language,
     view,
@@ -175,64 +175,38 @@ export function PickPopup(t0) {
     t4 = $[10];
   }
   const activeId = t4;
+  useInputPopup(language, listId, activeId);
   let t5;
-  if ($[11] !== activeId || $[12] !== language.editor || $[13] !== listId) {
-    t5 = () => {
-      language.editor.setInputPopup({
-        controls: listId,
-        activeDescendant: activeId
-      });
-      return () => language.editor.setInputPopup(null);
+  if ($[11] === Symbol.for("react.memo_cache_sentinel")) {
+    t5 = {
+      visibility: "hidden"
     };
-    $[11] = activeId;
-    $[12] = language.editor;
-    $[13] = listId;
-    $[14] = t5;
+    $[11] = t5;
   } else {
-    t5 = $[14];
+    t5 = $[11];
   }
   let t6;
-  if ($[15] !== activeId || $[16] !== language || $[17] !== listId) {
-    t6 = [language, listId, activeId];
-    $[15] = activeId;
-    $[16] = language;
-    $[17] = listId;
-    $[18] = t6;
+  if ($[12] !== language) {
+    t6 = keepFocusOutOfList(() => language.editor.focus());
+    $[12] = language;
+    $[13] = t6;
   } else {
-    t6 = $[18];
+    t6 = $[13];
   }
-  useLayoutEffect(t5, t6);
   let t7;
-  if ($[19] === Symbol.for("react.memo_cache_sentinel")) {
-    t7 = {
-      visibility: "hidden"
-    };
-    $[19] = t7;
-  } else {
-    t7 = $[19];
-  }
-  let t8;
-  if ($[20] !== language.editor) {
-    t8 = keepFocusOutOfList(() => language.editor.focus());
-    $[20] = language.editor;
-    $[21] = t8;
-  } else {
-    t8 = $[21];
-  }
-  let t9;
-  if ($[22] !== view.title) {
-    t9 = view.title !== null && /*#__PURE__*/_jsx("div", {
+  if ($[14] !== view.title) {
+    t7 = view.title !== null && /*#__PURE__*/_jsx("div", {
       className: "border-b border-border px-3 py-1.5 text-xs text-text-muted",
       children: view.title
     });
-    $[22] = view.title;
-    $[23] = t9;
+    $[14] = view.title;
+    $[15] = t7;
   } else {
-    t9 = $[23];
+    t7 = $[15];
   }
-  let t10;
-  if ($[24] !== language.pick || $[25] !== optionIds || $[26] !== view.active || $[27] !== view.groups) {
-    t10 = view.groups.map((group_0, groupIndex) => /*#__PURE__*/_jsxs("div", {
+  let t8;
+  if ($[16] !== language || $[17] !== optionIds || $[18] !== view.active || $[19] !== view.groups) {
+    t8 = view.groups.map((group_0, groupIndex) => /*#__PURE__*/_jsxs("div", {
       role: "group",
       className: "flex flex-col",
       children: [group_0.title !== null && /*#__PURE__*/_jsx("div", {
@@ -260,57 +234,57 @@ export function PickPopup(t0) {
         })]
       }, row_0.id))]
     }, group_0.title ?? groupIndex));
-    $[24] = language.pick;
-    $[25] = optionIds;
-    $[26] = view.active;
-    $[27] = view.groups;
-    $[28] = t10;
+    $[16] = language;
+    $[17] = optionIds;
+    $[18] = view.active;
+    $[19] = view.groups;
+    $[20] = t8;
   } else {
-    t10 = $[28];
+    t8 = $[20];
   }
-  let t11;
-  if ($[29] !== listId || $[30] !== t10) {
-    t11 = /*#__PURE__*/_jsx("div", {
+  let t9;
+  if ($[21] !== listId || $[22] !== t8) {
+    t9 = /*#__PURE__*/_jsx("div", {
       id: listId,
       role: "listbox",
       className: "min-h-0 flex-1 overflow-y-auto p-1",
-      children: t10
+      children: t8
     });
-    $[29] = listId;
-    $[30] = t10;
-    $[31] = t11;
+    $[21] = listId;
+    $[22] = t8;
+    $[23] = t9;
   } else {
-    t11 = $[31];
+    t9 = $[23];
   }
-  let t12;
-  if ($[32] !== view.preview) {
-    t12 = view.preview !== null && /*#__PURE__*/_jsx(PreviewLines, {
+  let t10;
+  if ($[24] !== view.preview) {
+    t10 = view.preview !== null && /*#__PURE__*/_jsx(PreviewLines, {
       preview: view.preview
     });
-    $[32] = view.preview;
-    $[33] = t12;
+    $[24] = view.preview;
+    $[25] = t10;
   } else {
-    t12 = $[33];
+    t10 = $[25];
   }
-  let t13;
-  if ($[34] !== t11 || $[35] !== t12 || $[36] !== t8 || $[37] !== t9) {
-    t13 = createPortal(/*#__PURE__*/_jsxs("div", {
+  let t11;
+  if ($[26] !== t10 || $[27] !== t6 || $[28] !== t7 || $[29] !== t9) {
+    t11 = createPortal(/*#__PURE__*/_jsxs("div", {
       ref: card,
       className: CARD,
-      style: t7,
+      style: t5,
       onPointerDown: _temp3,
-      ...t8,
-      children: [t9, t11, t12]
+      ...t6,
+      children: [t7, t9, t10]
     }), document.body);
-    $[34] = t11;
-    $[35] = t12;
-    $[36] = t8;
-    $[37] = t9;
-    $[38] = t13;
+    $[26] = t10;
+    $[27] = t6;
+    $[28] = t7;
+    $[29] = t9;
+    $[30] = t11;
   } else {
-    t13 = $[38];
+    t11 = $[30];
   }
-  return t13;
+  return t11;
 }
 function _temp3(event) {
   return event.preventDefault();

package/dist/SplitDiffView.js

@@ -1,6 +1,7 @@
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { parseChord } from '@adecore/editor/keymap';
+import { repaintOnTokens } from './diff-syntax.js';
 import { DiffOverlays } from "./diff-overlays.js";
 import { wordMarks } from './diff-wordmarks.js';
 import { RowHost, LineActionHost } from './row-host.js';
@@ -281,35 +282,7 @@ export function SplitDiffView({
       }
     };
     refresh();
-    const ownerWindow = oldElement.current?.ownerDocument.defaultView;
-    let frame;
-    let pending_0 = false;
-    let stopped_0 = false;
-    const schedule = () => {
-      if (pending_0) {
-        return;
-      }
-      pending_0 = true;
-      const paint = () => {
-        pending_0 = false;
-        if (!stopped_0) {
-          refresh();
-        }
-      };
-      if (ownerWindow?.requestAnimationFrame !== undefined) {
-        frame = ownerWindow.requestAnimationFrame(paint);
-      } else {
-        queueMicrotask(paint);
-      }
-    };
-    const stop_0 = tokens?.subscribe(schedule);
-    return () => {
-      stopped_0 = true;
-      stop_0?.();
-      if (frame !== undefined) {
-        ownerWindow?.cancelAnimationFrame?.(frame);
-      }
-    };
+    return repaintOnTokens(oldElement.current?.ownerDocument.defaultView, tokens, refresh);
   }, [mounted, engine, display, tokens]);
   useLayoutEffect(() => {
     if (mounted === null || mounted.old.engine !== engine) {
@@ -317,8 +290,8 @@ export function SplitDiffView({
     }
     const stops_0 = SIDES.map(side_7 => onMount?.(mounted[side_7].editor, side_7));
     return () => {
-      for (const stop_1 of stops_0) {
-        stop_1?.();
+      for (const stop_0 of stops_0) {
+        stop_0?.();
       }
     };
   }, [mounted, engine, onMount]);
@@ -335,32 +308,29 @@ export function SplitDiffView({
     style: {
       height: fill ? '100%' : Math.min(height, limit)
     },
-    children: SIDES.map(side_8 => /*#__PURE__*/_jsxs("div", {
-      className: "adecore-editor-diff-side",
-      "data-side": side_8,
-      role: "group",
-      "aria-label": t(`diff.${side_8}Side`),
-      onWheelCapture: () => {
-        mounted?.drive(side_8);
-      },
-      onFocusCapture: () => {
+    children: SIDES.map(side_8 => {
+      const drive = () => {
         mounted?.drive(side_8);
-      },
-      onPointerDownCapture: () => {
-        mounted?.drive(side_8);
-      },
-      onKeyDownCapture: () => {
-        mounted?.drive(side_8);
-      },
-      children: [/*#__PURE__*/_jsx("div", {
-        ref: side_8 === 'old' ? oldElement : newElement,
-        className: "adecore-editor-diff-surface"
-      }), mounted !== null && mounted[side_8].engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
-        mounted: mounted[side_8],
-        display: display[side_8],
-        unfold: unfold,
-        blocked: blocked
-      })]
-    }, side_8))
+      };
+      return /*#__PURE__*/_jsxs("div", {
+        className: "adecore-editor-diff-side",
+        "data-side": side_8,
+        role: "group",
+        "aria-label": t(`diff.${side_8}Side`),
+        onWheelCapture: drive,
+        onFocusCapture: drive,
+        onPointerDownCapture: drive,
+        onKeyDownCapture: drive,
+        children: [/*#__PURE__*/_jsx("div", {
+          ref: side_8 === 'old' ? oldElement : newElement,
+          className: "adecore-editor-diff-surface"
+        }), mounted !== null && mounted[side_8].engine === engine && /*#__PURE__*/_jsx(DiffOverlays, {
+          mounted: mounted[side_8],
+          display: display[side_8],
+          unfold: unfold,
+          blocked: blocked
+        })]
+      }, side_8);
+    })
   });
 }

package/dist/SymbolPicker.js

@@ -7,14 +7,8 @@ import { fileUriToPath } from '@adecore/lsp';
 import { formatShortcut, Icon } from '@adecore/ui';
 import { formatNumber } from '@adecore/ui/format';
 import { basenameOf } from './paths.js';
-import { filterEntries, groupEntries, letterOfKind, modeOf, toneOfKind } from './symbol-picker-model.js';
+import { filterEntries, groupEntries, letterOfKind, modeOf, toneOfKind, TONE_CLASSES } from './symbol-picker-model.js';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const TONES = {
-  callable: 'bg-accent-soft text-accent',
-  value: 'bg-status-running/15 text-status-running',
-  type: 'bg-status-idle/15 text-status-idle',
-  other: 'bg-surface-hover text-text-muted'
-};
 const SEARCH_DELAY_MS = 200;
 /* The letter badge of a symbol kind, tinted by what the symbol is. */
 export function SymbolBadge(t0) {
@@ -22,7 +16,7 @@ export function SymbolBadge(t0) {
   const {
     kind
   } = t0;
-  const t1 = `grid size-4 shrink-0 place-items-center rounded-sm font-mono text-xs font-semibold ${TONES[toneOfKind(kind)]}`;
+  const t1 = `grid size-4 shrink-0 place-items-center rounded-sm font-mono text-xs font-semibold ${TONE_CLASSES[toneOfKind(kind)]}`;
   let t2;
   if ($[0] !== kind) {
     t2 = letterOfKind(kind);

package/dist/code-actions-model.js

@@ -1,5 +1,6 @@
 import { applyTextEdits } from '@adecore/lsp';
 import { comparePositions } from './diagnostics-model.js';
+import { uniqueBy } from './unique.js';
 import { resourceOperationsOf, textEntriesOf } from './workspace-edit.js';
 /* The order of the list under the caret: the fixes and the rewrites that are one keystroke away first, the refactorings after them. */
 export const ACTION_GROUPS = ['quickfix', 'rewrite', 'extract', 'inline', 'move', 'refactor', 'source', 'other'];
@@ -47,15 +48,7 @@ export function actionsOf(result, order = ACTION_GROUPS) {
 }
 /* Entries from several requests as one list: the same order as a single answer, and an id of its own for each row. Two actions with a title and kind alike are one. */
 export function mergeEntries(lists) {
-  const seen = new Set();
-  const unique = lists.flat().filter(entry => {
-    const key = `${entry.action.kind ?? ''}\0${entry.action.title}`;
-    if (seen.has(key)) {
-      return false;
-    }
-    seen.add(key);
-    return true;
-  });
+  const unique = uniqueBy(lists.flat(), entry => `${entry.action.kind ?? ''}\0${entry.action.title}`);
   return inGroupOrder(unique, ACTION_GROUPS).map((entry, index) => ({
     ...entry,
     id: String(index)

package/dist/code-actions.js

@@ -334,17 +334,16 @@ export class CodeActionsFeature {
     if (found === null) {
       return null;
     }
-    const notes = [...(found.hiddenLines > 0 ? [this.say('moreLines', {
-      count: found.hiddenLines
-    })] : []), ...(found.otherFiles > 0 ? [this.say('otherFiles', {
-      count: found.otherFiles
-    })] : []), ...(found.moves > 0 ? [this.say('moves', {
-      count: found.moves
-    })] : []), ...((found.creates ?? 0) > 0 ? [this.say('creates', {
-      count: found.creates
-    })] : []), ...((found.deletes ?? 0) > 0 ? [this.say('deletes', {
-      count: found.deletes
-    })] : [])];
+    const counts = {
+      moreLines: found.hiddenLines,
+      otherFiles: found.otherFiles,
+      moves: found.moves,
+      creates: found.creates ?? 0,
+      deletes: found.deletes ?? 0
+    };
+    const notes = Object.entries(counts).filter(([, count]) => count > 0).map(([key, count]) => this.say(key, {
+      count
+    }));
     return {
       removed: found.removed,
       added: found.added,

package/dist/code-vision.js

@@ -2,6 +2,7 @@ import { splitLines } from '@adecore/merge';
 import { authorsText, authorshipOf, mapBlame } from './code-authors.js';
 import { declarationsOf, usagesText } from './code-vision-model.js';
 import { realTimers } from './timers.js';
+import { placeKey } from './unique.js';
 const REFERENCES = 'textDocument/references';
 /* Lines asked about above and below what is in view, so a little scrolling stays inside what is counted. */
 const MARGIN_LINES = 40;
@@ -253,5 +254,5 @@ export class CodeVisionFeature {
 }
 /* The places a server named, each counted once however many ways it was reached. */
 function distinctPlaces(locations) {
-  return new Set(locations.map(location => `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`)).size;
+  return new Set(locations.map(placeKey)).size;
 }

package/dist/completion-model.js

@@ -1,6 +1,6 @@
 import { labelCollator } from '@adecore/ui/format';
 import { applyCompletionDefaults } from '@adecore/lsp';
-import { comparePositions } from './diagnostics-model.js';
+import { comparePositions, sameRange } from './diagnostics-model.js';
 import { escapeMarkdown, isEmptyHover, splitSignatures } from './hover-content.js';
 import { compileSnippet, parseSnippet, tabOrder } from './snippet.js';
 import { indentSnippet } from './snippet-indent.js';
@@ -333,7 +333,7 @@ export function mirroredInsertions(carets, primary, caret, text, insertion, incl
   });
   return carets.flatMap(other => {
     const at = includeSelections ? other.end : other.start;
-    if (comparePositions(other.start, primary.start) === 0 && comparePositions(other.end, primary.end) === 0) {
+    if (sameRange(other, primary)) {
       return [];
     }
     if (!includeSelections && comparePositions(other.start, other.end) !== 0 || at.character < before) {

package/dist/completion.js

@@ -2,8 +2,9 @@ import { SnippetTransformQueueError } from './snippet-transform-queue.js';
 import { KEY_PRIORITY } from './key-priority.js';
 import { SnippetTransformError } from './snippet-transform-client.js';
 import { MAX_TRANSFORM_JOBS, MAX_TRANSFORM_WORK } from './snippet-transform-protocol.js';
+import { jobTable } from './snippet-field-transforms.js';
 import { fileUriToPath, StaleResultError } from '@adecore/lsp';
-import { comparePositions, shiftPosition } from './diagnostics-model.js';
+import { comparePositions, sameRange, shiftPosition } from './diagnostics-model.js';
 import { completionDocsOf, editRangeOf, identifierPrefix, insertionOf, isIdentifierCharacter, itemsOf, matchedCharacters, mirroredInsertions, opensCompletion, prefixFor, qualifiersOf, rankCompletions } from './completion-model.js';
 import { PARAMETER_HINTS_COMMAND, isCallItem, planCall, withParentheses } from './completion-call.js';
 import { compileSnippet } from './snippet.js';
@@ -11,7 +12,7 @@ import { createSnippetResolver } from './snippet-variables.js';
 import { wordRangeAt } from './rename-model.js';
 import { RecentChoices, recentChoicesOf } from './recent-choices.js';
 import { shikiLanguageOf } from './language-ids.js';
-import { textBeforeOf } from './line-text.js';
+import { lineTextOf, textBeforeOf } from './line-text.js';
 import { isEmptyRange } from './proposal-model.js';
 import { isShortcut } from './shortcut-keys.js';
 import { realTimers } from './timers.js';
@@ -193,7 +194,7 @@ export class CompletionFeature {
         return false;
       }
       const selections = editor.getSelections();
-      return selections.length === acceptedSelections.length && selections.every((range, index) => comparePositions(range.start, acceptedSelections[index].start) === 0 && comparePositions(range.end, acceptedSelections[index].end) === 0);
+      return selections.length === acceptedSelections.length && selections.every((range, index) => sameRange(range, acceptedSelections[index]));
     };
     recentChoicesOf(this.language.languageId).record(entry.item);
     let item = this.resolved.get(entry.item) ?? entry.item;
@@ -234,19 +235,10 @@ export class CompletionFeature {
     let characters = 0;
     let ranges = 0;
     const now = new Date();
-    const template = item.insertTextFormat === 2 ? compileSnippet(item.textEdit?.newText ?? item.insertText ?? item.label) : undefined;
+    const template = item.insertTextFormat === 2 ? compileSnippet(source) : undefined;
     const finishes = new Map();
     const renderAt = (position, selection) => {
-      const line = editor.textInRange({
-        start: {
-          line: position.line,
-          character: 0
-        },
-        end: {
-          line: position.line,
-          character: Number.MAX_SAFE_INTEGER
-        }
-      });
+      const line = lineTextOf(editor, position.line);
       const word = wordRangeAt(line, position);
       const resolver = createSnippetResolver({
         uri,
@@ -256,7 +248,7 @@ export class CompletionFeature {
         selectedText: editor.textInRange(selection),
         currentLine: line,
         currentWord: word === null ? '' : editor.textInRange(word),
-        cursorIndex: Math.max(0, carets.findIndex(range => comparePositions(range.start, selection.start) === 0 && comparePositions(range.end, selection.end) === 0)),
+        cursorIndex: Math.max(0, carets.findIndex(range => sameRange(range, selection))),
         cursorCount: carets.length,
         folder: project.host.folder,
         path: fileUriToPath(uri) ?? project.host.pathOfUri?.(uri) ?? undefined
@@ -275,13 +267,7 @@ export class CompletionFeature {
           template,
           variableTransforms,
           resolve: resolver,
-          indentationBefore: editStart === undefined ? undefined : editor.textInRange({
-            start: {
-              line: editStart.line,
-              character: 0
-            },
-            end: editStart
-          })
+          indentationBefore: editStart === undefined ? undefined : textBeforeOf(editor, editStart)
         });
         return commit === undefined ? insertion : {
           ...insertion,
@@ -344,18 +330,11 @@ export class CompletionFeature {
         return edit;
       });
       const drafts = [...mirrored.map(edit => instances.get(edit)), main];
-      const jobs = [];
-      const keys = new Map();
-      const slots = drafts.map(draft => (draft.variableTransforms ?? []).map(job => {
-        const key = JSON.stringify(job);
-        let slot = keys.get(key);
-        if (slot === undefined) {
-          slot = jobs.length;
-          keys.set(key, slot);
-          jobs.push(job);
-        }
-        return slot;
-      }));
+      const {
+        jobs,
+        slotOf
+      } = jobTable();
+      const slots = drafts.map(draft => (draft.variableTransforms ?? []).map(slotOf));
       if (jobs.length > MAX_TRANSFORM_JOBS || jobs.reduce((sum, job) => sum + job.value.length, 0) > MAX_TRANSFORM_WORK) {
         throw new CompletionLimitError();
       }

package/dist/definition-link.d.ts

@@ -1,4 +1,5 @@
 import type { EditorLanguage } from './editor-language.ts';
+export declare function followModKey(apple: boolean, onHeld: (held: boolean) => void): () => void;
 export declare class DefinitionLinkFeature {
     private readonly language;
     private held;

package/dist/definition-link.js

@@ -2,6 +2,27 @@ import { isIdentifierCharacter } from './completion-model.js';
 import { locationsOf } from './hover-content.js';
 import { lineTextOf } from './line-text.js';
 import { wordRangeAt } from './rename-model.js';
+/* Reports the Mod key going down and up, from the window since the editor only says where the pointer is. */
+export function followModKey(apple, onHeld) {
+  if (typeof window === 'undefined') {
+    return () => {};
+  }
+  const modKey = apple ? 'Meta' : 'Control';
+  const keys = event => {
+    if (event.key === modKey) {
+      onHeld(event.type === 'keydown');
+    }
+  };
+  const lost = () => onHeld(false);
+  window.addEventListener('keydown', keys);
+  window.addEventListener('keyup', keys);
+  window.addEventListener('blur', lost);
+  return () => {
+    window.removeEventListener('keydown', keys);
+    window.removeEventListener('keyup', keys);
+    window.removeEventListener('blur', lost);
+  };
+}
 /*
  * The name under the pointer drawn as a link while Cmd (Ctrl elsewhere) is held and a server knows where it
  * is defined, which is what a Mod+click on it follows. The editor only says where the pointer is, so the
@@ -23,24 +44,7 @@ export class DefinitionLinkFeature {
     const offs = [editor.onHover(hover => {
       this.pointer = hover?.position ?? null;
       this.update();
-    }), editor.onTextChange(() => this.clear()), editor.onViewChange(() => this.clear())];
-    if (typeof window !== 'undefined') {
-      const modKey = language.apple ? 'Meta' : 'Control';
-      const keys = event => {
-        if (event.key === modKey) {
-          this.setModHeld(event.type === 'keydown');
-        }
-      };
-      const lost = () => this.setModHeld(false);
-      window.addEventListener('keydown', keys);
-      window.addEventListener('keyup', keys);
-      window.addEventListener('blur', lost);
-      offs.push(() => {
-        window.removeEventListener('keydown', keys);
-        window.removeEventListener('keyup', keys);
-        window.removeEventListener('blur', lost);
-      });
-    }
+    }), editor.onTextChange(() => this.clear()), editor.onViewChange(() => this.clear()), followModKey(language.apple, held => this.setModHeld(held))];
     language.onDispose(() => {
       for (const off of offs) {
         off();

package/dist/diagnostics-model.d.ts

@@ -9,6 +9,7 @@ export declare function severityOf(diagnostic: Diagnostic): EditorMarkerSeverity
 export declare function markerOf(diagnostic: Diagnostic): EditorMarker;
 export declare function problemCountsOf(diagnostics: readonly Diagnostic[]): ProblemCounts;
 export declare function comparePositions(left: EditorPosition, right: EditorPosition): number;
+export declare function sameRange(left: EditorRange, right: EditorRange): boolean;
 export declare function endOfInsertion(start: EditorPosition, text: string): EditorPosition;
 export declare function shiftPosition(position: EditorPosition, change: EditorContentChange): EditorPosition;
 export declare function shiftRange(range: EditorRange, changes: readonly EditorContentChange[]): EditorRange;

package/dist/diagnostics-model.js

@@ -22,7 +22,6 @@ export function markerOf(diagnostic) {
     message: diagnostic.message.length > TICK_MESSAGE_LENGTH ? `${diagnostic.message.slice(0, TICK_MESSAGE_LENGTH)}…` : diagnostic.message
   };
 }
-/* A diagnostic that names no severity counts as an error. */
 export function problemCountsOf(diagnostics) {
   const count = severity => diagnostics.filter(diagnostic => (diagnostic.severity ?? 1) === severity).length;
   return {
@@ -34,6 +33,9 @@ export function problemCountsOf(diagnostics) {
 export function comparePositions(left, right) {
   return left.line === right.line ? left.character - right.character : left.line - right.line;
 }
+export function sameRange(left, right) {
+  return comparePositions(left.start, right.start) === 0 && comparePositions(left.end, right.end) === 0;
+}
 /* Where an insertion of `text` at `start` ends, counting a line break of any kind once. */
 export function endOfInsertion(start, text) {
   const lines = text.split(/\r\n|\r|\n/);

package/dist/diagnostics.js

@@ -1,7 +1,6 @@
 import { KEY_PRIORITY } from './key-priority.js';
-import { sameRange } from './hover-content.js';
 import { isShortcut } from './shortcut-keys.js';
-import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsAt, severityOf, shiftRange } from './diagnostics-model.js';
+import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsAt, sameRange, severityOf, shiftRange } from './diagnostics-model.js';
 /*
  * The problems the servers report for one file. A report from a server replaces the one before it
  * from the same server, the editor draws them, and each one follows its text through edits made

package/dist/diff-syntax.d.ts

@@ -13,4 +13,5 @@ export interface DiffSyntaxSources {
         readonly line: number;
     } | undefined;
 }
+export declare function repaintOnTokens(ownerWindow: Window | null | undefined, tokens: DiffSourceTokens | undefined, refresh: () => void): () => void;
 export declare function diffSyntaxDocument(document: DiffDocument, language: string, theme: string): DiffSyntaxSources;

package/dist/diff-syntax.js

@@ -1,3 +1,34 @@
+/* Calls `refresh` once per frame while tokens arrive, or in a microtask where the window draws no frames. */
+export function repaintOnTokens(ownerWindow, tokens, refresh) {
+  let pending = false;
+  let stopped = false;
+  let frame;
+  const schedule = () => {
+    if (pending) {
+      return;
+    }
+    pending = true;
+    const paint = () => {
+      pending = false;
+      if (!stopped) {
+        refresh();
+      }
+    };
+    if (ownerWindow?.requestAnimationFrame !== undefined) {
+      frame = ownerWindow.requestAnimationFrame(paint);
+    } else {
+      queueMicrotask(paint);
+    }
+  };
+  const stop = tokens?.subscribe(schedule);
+  return () => {
+    stopped = true;
+    stop?.();
+    if (frame !== undefined) {
+      ownerWindow?.cancelAnimationFrame?.(frame);
+    }
+  };
+}
 function canTokenize(source) {
   if (source.length > 20000) {
     return false;