@adecore/editor-react 0.31.11 → 0.32.0

package/dist/diagnostics.js

@@ -8,109 +8,130 @@ import { comparePositions, markerOf, neighborProblem, problemCountsOf, problemsA
  * before the server reports again, so what is under a squiggle is still what it was about.
  */
 export class DiagnosticsFeature {
-    language;
-    reports = new Map();
-    listeners = new Set();
-    list = [];
-    constructor(language) {
-        this.language = language;
-        const { editor, project, uri } = language;
-        const reports = project.service.onDiagnostics((report) => {
-            if (report.uri === uri) {
-                this.reports.set(report.source, report.diagnostics);
-                this.rebuild();
-            }
-        });
-        const edits = editor.onTextChange((change) => this.shift(change.changes));
-        // These keys are the editor's while it has the keyboard; elsewhere the menu's commands answer.
-        const keys = language.onKey((event) => {
-            const next = isShortcut(this.language.shortcuts.nextProblem, event);
-            if (!next && !isShortcut(this.language.shortcuts.previousProblem, event)) {
-                return false;
-            }
-            this.step(next ? 1 : -1);
-            return true;
-        }, KEY_PRIORITY.diagnostics);
-        language.onDispose(() => {
-            keys();
-            reports.dispose();
-            edits();
-            this.listeners.clear();
-            editor.setMarkers([]);
-        });
+  language;
+  reports = new Map();
+  listeners = new Set();
+  list = [];
+  constructor(language) {
+    this.language = language;
+    const {
+      editor,
+      project,
+      uri
+    } = language;
+    const reports = project.service.onDiagnostics(report => {
+      if (report.uri === uri) {
+        this.reports.set(report.source, report.diagnostics);
+        this.rebuild();
+      }
+    });
+    const edits = editor.onTextChange(change => this.shift(change.changes));
+    // These keys are the editor's while it has the keyboard; elsewhere the menu's commands answer.
+    const keys = language.onKey(event => {
+      const next = isShortcut(this.language.shortcuts.nextProblem, event);
+      if (!next && !isShortcut(this.language.shortcuts.previousProblem, event)) {
+        return false;
+      }
+      this.step(next ? 1 : -1);
+      return true;
+    }, KEY_PRIORITY.diagnostics);
+    language.onDispose(() => {
+      keys();
+      reports.dispose();
+      edits();
+      this.listeners.clear();
+      editor.setMarkers([]);
+    });
+  }
+  get problems() {
+    return this.list;
+  }
+  counts() {
+    return problemCountsOf(this.list.map(problem => problem.diagnostic));
+  }
+  at(position) {
+    return problemsAt(this.list, position);
+  }
+  /* Puts the caret on the next problem, or the one before; false when there is none. */
+  step(direction) {
+    const caret = this.language.editor.getCaret();
+    const target = neighborProblem(this.list, caret, direction);
+    if (target === null) {
+      return false;
     }
-    get problems() {
-        return this.list;
+    const {
+      start
+    } = target.diagnostic.range;
+    this.reveal(target, comparePositions(start, caret) > 0 ? 'centerDown' : 'centerUp');
+    return true;
+  }
+  /* Puts the caret on the first problem of the file. */
+  goToFirst() {
+    const target = neighborProblem(this.list, {
+      line: -1,
+      character: 0
+    }, 1);
+    if (target === null) {
+      return false;
     }
-    counts() {
-        return problemCountsOf(this.list.map((problem) => problem.diagnostic));
-    }
-    at(position) {
-        return problemsAt(this.list, position);
-    }
-    /* Puts the caret on the next problem, or the one before; false when there is none. */
-    step(direction) {
-        const caret = this.language.editor.getCaret();
-        const target = neighborProblem(this.list, caret, direction);
-        if (target === null) {
-            return false;
-        }
-        const { start } = target.diagnostic.range;
-        this.reveal(target, comparePositions(start, caret) > 0 ? 'centerDown' : 'centerUp');
-        return true;
-    }
-    /* Puts the caret on the first problem of the file. */
-    goToFirst() {
-        const target = neighborProblem(this.list, { line: -1, character: 0 }, 1);
-        if (target === null) {
-            return false;
-        }
-        this.reveal(target, 'center');
-        return true;
-    }
-    onChange(listener) {
-        this.listeners.add(listener);
-        return () => {
-            this.listeners.delete(listener);
-        };
-    }
-    reveal(problem, reveal) {
-        const { editor, project } = this.language;
-        editor.setCaret(problem.diagnostic.range.start, reveal);
-        editor.focus();
-        this.language.hover.showProblemsAt(editor.getCaret());
-        const severity = project.i18n.t(`editor:language.announce.severity.${severityOf(problem.diagnostic)}`);
-        editor.announce(project.i18n.t('editor:language.announce.problem', { severity, message: problem.diagnostic.message }));
-    }
-    /* The problems follow the edit as the markers do. Their number does not change, so nobody is told. */
-    shift(changes) {
-        let moved = false;
-        for (const [server, diagnostics] of this.reports) {
-            let shifted = null;
-            for (const [index, diagnostic] of diagnostics.entries()) {
-                const range = shiftRange(diagnostic.range, changes);
-                if (!sameRange(range, diagnostic.range)) {
-                    shifted ??= [...diagnostics];
-                    shifted[index] = { ...diagnostic, range };
-                }
-            }
-            if (shifted !== null) {
-                this.reports.set(server, shifted);
-                moved = true;
-            }
-        }
-        if (moved) {
-            this.collect();
+    this.reveal(target, 'center');
+    return true;
+  }
+  onChange(listener) {
+    this.listeners.add(listener);
+    return () => {
+      this.listeners.delete(listener);
+    };
+  }
+  reveal(problem, reveal) {
+    const {
+      editor,
+      project
+    } = this.language;
+    editor.setCaret(problem.diagnostic.range.start, reveal);
+    editor.focus();
+    this.language.hover.showProblemsAt(editor.getCaret());
+    const severity = project.i18n.t(`editor:language.announce.severity.${severityOf(problem.diagnostic)}`);
+    editor.announce(project.i18n.t('editor:language.announce.problem', {
+      severity,
+      message: problem.diagnostic.message
+    }));
+  }
+  /* The problems follow the edit as the markers do. Their number does not change, so nobody is told. */
+  shift(changes) {
+    let moved = false;
+    for (const [server, diagnostics] of this.reports) {
+      let shifted = null;
+      for (const [index, diagnostic] of diagnostics.entries()) {
+        const range = shiftRange(diagnostic.range, changes);
+        if (!sameRange(range, diagnostic.range)) {
+          shifted ??= [...diagnostics];
+          shifted[index] = {
+            ...diagnostic,
+            range
+          };
         }
+      }
+      if (shifted !== null) {
+        this.reports.set(server, shifted);
+        moved = true;
+      }
     }
-    rebuild() {
-        this.collect();
-        this.language.editor.setMarkers(this.list.map((problem) => markerOf(problem.diagnostic)));
-        for (const listener of [...this.listeners]) {
-            listener();
-        }
+    if (moved) {
+      this.collect();
     }
-    collect() {
-        this.list = [...this.reports].flatMap(([server, diagnostics]) => diagnostics.map((diagnostic) => ({ diagnostic, server })));
+  }
+  rebuild() {
+    this.collect();
+    this.language.editor.setMarkers(this.list.map(problem => markerOf(problem.diagnostic)));
+    for (const listener of [...this.listeners]) {
+      listener();
     }
-}
+  }
+  collect() {
+    this.list = [...this.reports].flatMap(([server, diagnostics]) => diagnostics.map(diagnostic => ({
+      diagnostic,
+      server
+    })));
+  }
+}

package/dist/diff-expansion.js

@@ -1,41 +1,44 @@
 import { diffRows } from '@adecore/merge';
-export const DEFAULT_UNFOLD_LIMITS = { rows: 20000, characters: 2000000, lineLength: 10000 };
+export const DEFAULT_UNFOLD_LIMITS = {
+  rows: 20000,
+  characters: 2000000,
+  lineLength: 10000
+};
 export function fitsDiff(document, unfolded, limits, maxRows = limits.rows) {
-    let rows = 0;
-    let characters = 0;
-    for (const row of diffRows(document, 'unified', unfolded)) {
-        if (row.kind === 'gap') {
-            continue;
-        }
-        const text = row.new === undefined ? document.sides.old[row.old.index] : document.sides.new[row.new.index];
-        characters += text.length + (rows > 0 ? 1 : 0);
-        if (++rows > maxRows || characters > limits.characters || text.length > limits.lineLength) {
-            return false;
-        }
+  let rows = 0;
+  let characters = 0;
+  for (const row of diffRows(document, 'unified', unfolded)) {
+    if (row.kind === 'gap') {
+      continue;
     }
-    return true;
+    const text = row.new === undefined ? document.sides.old[row.old.index] : document.sides.new[row.new.index];
+    characters += text.length + (rows > 0 ? 1 : 0);
+    if (++rows > maxRows || characters > limits.characters || text.length > limits.lineLength) {
+      return false;
+    }
+  }
+  return true;
 }
 export function expandDiff(document, unfolded, id, limits) {
-    const rows = diffRows(document, 'unified', unfolded);
-    const gap = rows.find((row) => row.kind === 'gap' && row.id === id);
-    if (gap?.kind !== 'gap' || !gap.unfoldable) {
-        return unfolded;
-    }
-    const visible = rows.filter((row) => row.kind === 'line').length;
-    const maxRows = Math.min(limits.rows, visible + 500);
-    const previous = unfolded.get(id) ?? 0;
-    let low = 0;
-    let high = Math.min(500, gap.oldCount);
-    // Between-hunk gaps reveal from both ends; search the per-end count within the shared row budget.
-    while (low < high) {
-        const count = Math.ceil((low + high) / 2);
-        const candidate = new Map(unfolded).set(id, previous + count);
-        if (fitsDiff(document, candidate, limits, maxRows)) {
-            low = count;
-        }
-        else {
-            high = count - 1;
-        }
+  const rows = diffRows(document, 'unified', unfolded);
+  const gap = rows.find(row => row.kind === 'gap' && row.id === id);
+  if (gap?.kind !== 'gap' || !gap.unfoldable) {
+    return unfolded;
+  }
+  const visible = rows.filter(row => row.kind === 'line').length;
+  const maxRows = Math.min(limits.rows, visible + 500);
+  const previous = unfolded.get(id) ?? 0;
+  let low = 0;
+  let high = Math.min(500, gap.oldCount);
+  // Between-hunk gaps reveal from both ends; search the per-end count within the shared row budget.
+  while (low < high) {
+    const count = Math.ceil((low + high) / 2);
+    const candidate = new Map(unfolded).set(id, previous + count);
+    if (fitsDiff(document, candidate, limits, maxRows)) {
+      low = count;
+    } else {
+      high = count - 1;
     }
-    return low === 0 ? unfolded : new Map(unfolded).set(id, previous + low);
-}
+  }
+  return low === 0 ? unfolded : new Map(unfolded).set(id, previous + low);
+}

package/dist/diff-overlays.js

@@ -1,28 +1,150 @@
-import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { c as _c } from "react/compiler-runtime";
 import { useSyncExternalStore } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
 import { Button, Tooltip } from '@adecore/ui';
 import { formatNumber } from '@adecore/ui/format';
 import { RowHost, LineActionHost } from './row-host.js';
-export function DiffOverlays({ mounted, display, unfold, blocked }) {
-    const { t } = useTranslation('editor');
-    useSyncExternalStore(mounted.rows.subscribe, mounted.rows.getVersion, mounted.rows.getVersion);
-    useSyncExternalStore(mounted.actions.subscribe, mounted.actions.getVersion, mounted.actions.getVersion);
-    return (_jsxs(_Fragment, { children: [display.gaps.map(({ row }) => {
-                const container = mounted.rows.container(`gap-${row.id}`);
-                if (container === undefined) {
-                    return null;
-                }
-                const text = t('diff.hidden', { count: formatNumber(Math.max(row.oldCount, row.newCount)) });
-                return createPortal(_jsx("div", { className: "adecore-editor-diff-gap", children: row.unfoldable && blocked?.has(row.id) === true ? (_jsx(Tooltip, { label: t('diff.contextLimit'), children: _jsx("span", { className: "inline-flex", children: _jsx(Button, { size: "xs", disabled: true, children: text }) }) })) : row.unfoldable ? (_jsx(Button, { size: "xs", onClick: () => unfold(row.id), children: text })) : (_jsx("span", { children: text })) }), container, `gap-${row.id}`);
-            }), display.rows.map((row, index) => {
-                if (row.noNewline === undefined) {
-                    return null;
-                }
-                const container = mounted.actions.container(`no-newline-${index}`);
-                return container === undefined
-                    ? null
-                    : createPortal(_jsx("span", { className: "adecore-editor-diff-no-newline", children: t('diff.noNewline') }), container, `no-newline-${index}`);
-            })] }));
-}
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
+export function DiffOverlays(t0) {
+  const $ = _c(29);
+  const {
+    mounted,
+    display,
+    unfold,
+    blocked
+  } = t0;
+  const {
+    t
+  } = useTranslation("editor");
+  let t1;
+  if ($[0] !== mounted.rows) {
+    t1 = () => mounted.rows.getContainers();
+    $[0] = mounted.rows;
+    $[1] = t1;
+  } else {
+    t1 = $[1];
+  }
+  const getRows = t1;
+  let t2;
+  if ($[2] !== mounted.actions) {
+    t2 = () => mounted.actions.getContainers();
+    $[2] = mounted.actions;
+    $[3] = t2;
+  } else {
+    t2 = $[3];
+  }
+  const getActions = t2;
+  let t3;
+  if ($[4] !== mounted.rows) {
+    t3 = listener => mounted.rows.subscribe(listener);
+    $[4] = mounted.rows;
+    $[5] = t3;
+  } else {
+    t3 = $[5];
+  }
+  const rows = useSyncExternalStore(t3, getRows, getRows);
+  let t4;
+  if ($[6] !== mounted.actions) {
+    t4 = listener_0 => mounted.actions.subscribe(listener_0);
+    $[6] = mounted.actions;
+    $[7] = t4;
+  } else {
+    t4 = $[7];
+  }
+  const actions = useSyncExternalStore(t4, getActions, getActions);
+  let t5;
+  if ($[8] !== blocked || $[9] !== display.gaps || $[10] !== rows || $[11] !== t || $[12] !== unfold) {
+    let t6;
+    if ($[14] !== blocked || $[15] !== rows || $[16] !== t || $[17] !== unfold) {
+      t6 = t7 => {
+        const {
+          row
+        } = t7;
+        const container = rows.get(`gap-${row.id}`);
+        if (container === undefined) {
+          return null;
+        }
+        const text = t("diff.hidden", {
+          count: formatNumber(Math.max(row.oldCount, row.newCount))
+        });
+        return createPortal(/*#__PURE__*/_jsx("div", {
+          className: "adecore-editor-diff-gap",
+          children: row.unfoldable && blocked?.has(row.id) === true ? /*#__PURE__*/_jsx(Tooltip, {
+            label: t("diff.contextLimit"),
+            children: /*#__PURE__*/_jsx("span", {
+              className: "inline-flex",
+              children: /*#__PURE__*/_jsx(Button, {
+                size: "xs",
+                disabled: true,
+                children: text
+              })
+            })
+          }) : row.unfoldable ? /*#__PURE__*/_jsx(Button, {
+            size: "xs",
+            onClick: () => unfold(row.id),
+            children: text
+          }) : /*#__PURE__*/_jsx("span", {
+            children: text
+          })
+        }), container, `gap-${row.id}`);
+      };
+      $[14] = blocked;
+      $[15] = rows;
+      $[16] = t;
+      $[17] = unfold;
+      $[18] = t6;
+    } else {
+      t6 = $[18];
+    }
+    t5 = display.gaps.map(t6);
+    $[8] = blocked;
+    $[9] = display.gaps;
+    $[10] = rows;
+    $[11] = t;
+    $[12] = unfold;
+    $[13] = t5;
+  } else {
+    t5 = $[13];
+  }
+  let t6;
+  if ($[19] !== actions || $[20] !== display.rows || $[21] !== t) {
+    let t7;
+    if ($[23] !== actions || $[24] !== t) {
+      t7 = (row_0, index) => {
+        if (row_0.noNewline === undefined) {
+          return null;
+        }
+        const container_0 = actions.get(`no-newline-${index}`);
+        return container_0 === undefined ? null : createPortal(/*#__PURE__*/_jsx("span", {
+          className: "adecore-editor-diff-no-newline",
+          children: t("diff.noNewline")
+        }), container_0, `no-newline-${index}`);
+      };
+      $[23] = actions;
+      $[24] = t;
+      $[25] = t7;
+    } else {
+      t7 = $[25];
+    }
+    t6 = display.rows.map(t7);
+    $[19] = actions;
+    $[20] = display.rows;
+    $[21] = t;
+    $[22] = t6;
+  } else {
+    t6 = $[22];
+  }
+  let t7;
+  if ($[26] !== t5 || $[27] !== t6) {
+    t7 = /*#__PURE__*/_jsxs(_Fragment, {
+      children: [t5, t6]
+    });
+    $[26] = t5;
+    $[27] = t6;
+    $[28] = t7;
+  } else {
+    t7 = $[28];
+  }
+  return t7;
+}

package/dist/diff-syntax.js

@@ -1,49 +1,72 @@
 function canTokenize(source) {
-    if (source.length > 20000) {
-        return false;
+  if (source.length > 20000) {
+    return false;
+  }
+  let characters = Math.max(0, source.length - 1);
+  for (const line of source) {
+    characters += line.length;
+    if (line.length > 10000 || characters > 2000000) {
+      return false;
     }
-    let characters = Math.max(0, source.length - 1);
-    for (const line of source) {
-        characters += line.length;
-        if (line.length > 10000 || characters > 2000000) {
-            return false;
-        }
-    }
-    return true;
+  }
+  return true;
 }
 export function diffSyntaxDocument(document, language, theme) {
-    const locations = { old: [], new: [] };
-    const build = (side) => {
-        const source = document.sides[side];
-        // Skipping a long hidden line loses grammar state; keep the entire side plain instead.
-        if (!canTokenize(source)) {
-            return { language, theme, blocks: [], resets: [] };
-        }
-        const blocks = [];
-        const resets = [];
-        const ranges = document.snapshots
-            ? [{ from: 0, to: source.length }]
-            : document.offsets.map((offset, index) => ({ from: offset[side], to: document.offsets[index + 1]?.[side] ?? source.length }));
-        for (const range of ranges) {
-            if (!document.snapshots && range.from < range.to) {
-                resets.push(blocks.length);
-            }
-            for (let from = range.from; from < range.to; from += 200) {
-                const to = Math.min(from + 200, range.to);
-                const block = blocks.length;
-                blocks.push(source.slice(from, to).join('\n'));
-                for (let index = from; index < to; index++) {
-                    locations[side][index] = { block, line: index - from };
-                }
-            }
+  const locations = {
+    old: [],
+    new: []
+  };
+  const build = side => {
+    const source = document.sides[side];
+    // Skipping a long hidden line loses grammar state; keep the entire side plain instead.
+    if (!canTokenize(source)) {
+      return {
+        language,
+        theme,
+        blocks: [],
+        resets: []
+      };
+    }
+    const blocks = [];
+    const resets = [];
+    const ranges = document.snapshots ? [{
+      from: 0,
+      to: source.length
+    }] : document.offsets.map((offset, index) => ({
+      from: offset[side],
+      to: document.offsets[index + 1]?.[side] ?? source.length
+    }));
+    for (const range of ranges) {
+      if (!document.snapshots && range.from < range.to) {
+        resets.push(blocks.length);
+      }
+      for (let from = range.from; from < range.to; from += 200) {
+        const to = Math.min(from + 200, range.to);
+        const block = blocks.length;
+        blocks.push(source.slice(from, to).join('\n'));
+        for (let index = from; index < to; index++) {
+          locations[side][index] = {
+            block,
+            line: index - from
+          };
         }
-        return { language, theme, blocks, resets };
-    };
-    const documents = { old: build('old'), new: build('new') };
+      }
+    }
     return {
-        documents,
-        locate(side, index) {
-            return Number.isInteger(index) && index >= 0 ? locations[side][index] : undefined;
-        }
+      language,
+      theme,
+      blocks,
+      resets
     };
-}
+  };
+  const documents = {
+    old: build('old'),
+    new: build('new')
+  };
+  return {
+    documents,
+    locate(side, index) {
+      return Number.isInteger(index) && index >= 0 ? locations[side][index] : undefined;
+    }
+  };
+}

package/dist/diff-wordmarks.js

@@ -1,26 +1,29 @@
 import { diffRows, wordChanges } from '@adecore/merge';
 export function wordMarks(document) {
-    const marks = { old: new Map(), new: new Map() };
-    let pairs = 0;
-    let characters = 0;
-    for (const row of diffRows(document, 'split')) {
-        if (row.kind !== 'line' || row.change !== 'pair' || document.hunks[row.hunk].coarse) {
-            continue;
-        }
-        const old = document.sides.old[row.old.index];
-        const fresh = document.sides.new[row.new.index];
-        characters += old.length + fresh.length;
-        // Per-pair limits alone still allow thousands of expensive word diffs during one mount.
-        if (++pairs > 1000 || characters > 100000) {
-            break;
-        }
-        const words = wordChanges(old, fresh);
-        if (words === null) {
-            continue;
-        }
-        const ranges = (text, ranges) => ranges.filter((range) => !document.ignoreWhitespace || /\S/.test(text.slice(range.from, range.to))).map((range) => [range.from, range.to]);
-        marks.old.set(row.old.index, ranges(old, words.old));
-        marks.new.set(row.new.index, ranges(fresh, words.new));
+  const marks = {
+    old: new Map(),
+    new: new Map()
+  };
+  let pairs = 0;
+  let characters = 0;
+  for (const row of diffRows(document, 'split')) {
+    if (row.kind !== 'line' || row.change !== 'pair' || document.hunks[row.hunk].coarse) {
+      continue;
     }
-    return marks;
-}
+    const old = document.sides.old[row.old.index];
+    const fresh = document.sides.new[row.new.index];
+    characters += old.length + fresh.length;
+    // Per-pair limits alone still allow thousands of expensive word diffs during one mount.
+    if (++pairs > 1000 || characters > 100000) {
+      break;
+    }
+    const words = wordChanges(old, fresh);
+    if (words === null) {
+      continue;
+    }
+    const ranges = (text, ranges) => ranges.filter(range => !document.ignoreWhitespace || /\S/.test(text.slice(range.from, range.to))).map(range => [range.from, range.to]);
+    marks.old.set(row.old.index, ranges(old, words.old));
+    marks.new.set(row.new.index, ranges(fresh, words.new));
+  }
+  return marks;
+}