@adecore/editor-react 0.39.0 → 0.40.0

package/dist/doc-comment-model.d.ts

@@ -10,6 +10,7 @@ export interface ParsedDocComment {
 }
 export declare const DOC_LINK_PREFIX = "#doc-link:";
 export declare function decodeEntities(text: string): string;
+export declare function dedent(text: string): string;
 export declare function safeAddress(address: string): string | null;
 export declare function htmlToMarkdown(source: string): string;
 export declare function inlineTagsToMarkdown(markdown: string): string;

package/dist/doc-comment-model.js

@@ -170,7 +170,7 @@ export function decodeEntities(text) {
     return ENTITIES[code.toLowerCase()] ?? match;
   });
 }
-function dedent(text) {
+export function dedent(text) {
   const lines = text.replace(/^\n+|\s+$/g, '').split('\n');
   const indents = lines.filter(line => line.trim() !== '').map(line => line.length - line.trimStart().length);
   const common = indents.length === 0 ? 0 : Math.min(...indents);

package/dist/folding.js

@@ -92,10 +92,9 @@ export class FoldingFeature {
     });
   }
   publish() {
-    const hints = {
+    this.language.editor.setFoldHints({
       symbols: this.symbols,
       ranges: this.ranges
-    };
-    this.language.editor.setFoldHints(hints);
+    });
   }
 }

package/dist/format-on-type.js

@@ -10,17 +10,13 @@ function overlaps(edits) {
   return ordered.some((edit, index) => index > 0 && comparePositions(ordered[index - 1].range.end, edit.range.start) > 0);
 }
 /*
- * Formatting while typing: after a person types one of the characters the server named in
- * `firstTriggerCharacter` and `moreTriggerCharacter`, the server is asked what to change around the caret, and its
- * edits are applied.
+ * Formatting while typing: after one of the server's trigger characters is typed, the server is asked what
+ * to change around the caret, and its edits join the undo step of the typed character.
  *
- * Only typing counts: one change that is the trigger character alone, the closer the editor moved back to its
- * opener's indentation, or a line break with its indentation for `\n`, which the editor reports as typed though
- * Enter runs as a command. A character the editor types over an existing closer changes no text and asks nothing. A paste, undo, a completion or an external change does not ask, and neither does a
- * second caret, a read-only editor or a snippet session, whose tab stops an edit could move. An answer is applied
- * only while the text is exactly what it was asked about, and the caret where it was.
- *
- * The edits join the undo step of the typed character, so one undo takes both back. Off by default; a host enables it explicitly with `configure(true)`.
+ * Only typing counts: the trigger character alone, the closer the editor moved back to its opener's
+ * indentation, or a line break with its indentation for `\n`. A paste, undo, a completion, an external change,
+ * a second caret, a read-only editor or a snippet session (whose tab stops an edit could move) asks nothing.
+ * An answer is applied only while the text and the caret are what it was asked about. Off until `configure(true)`.
  */
 export class FormatOnTypeFeature {
   language;

package/dist/hover-content.d.ts

@@ -1,4 +1,3 @@
-import type { EditorRange } from '@adecore/editor';
 import type { Hover, Location, NavigationResult } from '@adecore/lsp';
 export interface SignatureBlock {
     readonly language: string;
@@ -13,7 +12,6 @@ export declare function hoverTextOf(hover: Hover): HoverText;
 export declare function escapeMarkdown(text: string): string;
 export declare function isEmptyHover(text: HoverText): boolean;
 export declare function locationsOf(result: NavigationResult): Location[];
-export declare function sameRange(left: EditorRange, right: EditorRange): boolean;
 export interface DocTag {
     readonly name: string;
     readonly markdown: string;

package/dist/hover-content.js

@@ -1,3 +1,4 @@
+import { dedent } from './doc-comment-model.js';
 const FENCE = /^```([\w+#.-]*)[^\n]*\n([\s\S]*?)\n```[ \t]*(?:\n|$)/;
 /*
  * The leading fenced blocks of a markdown text as signatures, and what follows them, minus the rule
@@ -72,9 +73,6 @@ export function locationsOf(result) {
     range: entry.targetSelectionRange
   } : entry);
 }
-export function sameRange(left, right) {
-  return left.start.line === right.start.line && left.start.character === right.start.character && left.end.line === right.end.line && left.end.character === right.end.character;
-}
 const TAG_LINE = /^(?:_@([\w-]+)_|\*@([\w-]+)\*|@([\w-]+))(?:\s+|$)([\s\S]*)$/;
 /* Tags whose text is a block of its own, which a row of the tag list has no room for. */
 const BLOCK_TAGS = new Set(['example']);
@@ -145,12 +143,6 @@ const INLINE_TAG = /\{@(see|link|linkplain)\s+([^}\s]+)(?:\s+([^}]+?))?\s*\}/g;
 function decodeEntities(text) {
   return text.replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#0?39;/g, "'").replace(/&amp;/g, '&');
 }
-function dedent(text) {
-  const lines = text.replace(/^\n+|\s+$/g, '').split('\n');
-  const indents = lines.filter(line => line.trim() !== '').map(line => line.length - line.trimStart().length);
-  const common = indents.length === 0 ? 0 : Math.min(...indents);
-  return lines.map(line => line.slice(common)).join('\n');
-}
 /*
  * What a docblock writes for a reader of its source, written for one of a hover: a `<code>` or `<pre>`
  * example as a block in the symbol's language, and an inline `{@see Name}` or `{@link Name label}` as

package/dist/inlay-hints.d.ts

@@ -6,7 +6,6 @@ import { type Timers } from './timers.ts';
 export declare function hintLabelOf(hint: InlayHint): string;
 export declare function drawableHints(hints: readonly InlayHint[]): InlayHint[];
 export declare function editorHintOf(hint: InlayHint, id: string): EditorInlayHint;
-export declare function editorHintsOf(hints: readonly InlayHint[]): EditorInlayHint[];
 export declare function withMargin(visible: EditorRange, endOfDocument: EditorPosition, endOfLine: (line: number) => EditorPosition): EditorRange;
 export declare function covers(asked: EditorRange, visible: EditorRange): boolean;
 export declare function tooltipTextOf(tooltip: string | MarkupContent | undefined): HoverText | null;

package/dist/inlay-hints.js

@@ -1,3 +1,5 @@
+import { followModKey } from './definition-link.js';
+import { comparePositions } from './diagnostics-model.js';
 import { hoverTextOf, isEmptyHover } from './hover-content.js';
 import { SHOW_DELAY_MS } from './hover.js';
 import { messageOf } from './error-message.js';
@@ -12,13 +14,11 @@ const PAUSE_MS = 300;
 const DOUBLE_PRESS_MS = 500;
 /* Lines asked for above and below what is in view, so a little scrolling stays inside what is already drawn. */
 const MARGIN_LINES = 60;
-/* A hint's label is a string or a list of parts, which are read as one text. */
 export function hintLabelOf(hint) {
   return typeof hint.label === 'string' ? hint.label : hint.label.map(part => part.value).join('');
 }
-/* The hints worth drawing, in the order of the text. */
 export function drawableHints(hints) {
-  return hints.filter(hint => hintLabelOf(hint) !== '').sort((left, right) => left.position.line - right.position.line || left.position.character - right.position.character);
+  return hints.filter(hint => hintLabelOf(hint) !== '').sort((left, right) => comparePositions(left.position, right.position));
 }
 /* A hint as the editor draws it: a label with parts keeps them apart so each can be pointed at. */
 export function editorHintOf(hint, id) {
@@ -37,10 +37,6 @@ export function editorHintOf(hint, id) {
     } : {})
   };
 }
-export function editorHintsOf(hints) {
-  return drawableHints(hints).map((hint, index) => editorHintOf(hint, `hint-${index}`));
-}
-/* The lines in view with a margin of lines around them, from the start of the first to the end of the last. */
 export function withMargin(visible, endOfDocument, endOfLine) {
   const first = Math.max(0, visible.start.line - MARGIN_LINES);
   const last = Math.min(endOfDocument.line, visible.end.line + MARGIN_LINES);
@@ -52,7 +48,6 @@ export function withMargin(visible, endOfDocument, endOfLine) {
     end: last === endOfDocument.line ? endOfDocument : endOfLine(last)
   };
 }
-/* Whether what was asked for already holds every line in view. */
 export function covers(asked, visible) {
   return asked.start.line <= visible.start.line && asked.end.line >= visible.end.line;
 }
@@ -69,7 +64,6 @@ export function tooltipTextOf(tooltip) {
   });
   return isEmptyHover(text) ? null : text;
 }
-/* One part of a hint's label, or null for a hint whose label is a string. */
 export function partOf(hint, index) {
   return index === null || typeof hint.label === 'string' ? null : hint.label[index] ?? null;
 }
@@ -94,7 +88,7 @@ export function lacksInfo(hint, index) {
 export function editsFit(editor, edits) {
   const end = editor.positionAt(Number.MAX_SAFE_INTEGER);
   const inside = position => Number.isInteger(position.line) && Number.isInteger(position.character) && position.line >= 0 && position.character >= 0 && position.line <= end.line && position.character <= lineTextOf(editor, position.line).length;
-  const before = (left, right) => left.line < right.line || left.line === right.line && left.character <= right.character;
+  const before = (left, right) => comparePositions(left, right) <= 0;
   const ordered = [...edits].sort((left, right) => before(left.range.start, right.range.start) ? -1 : 1);
   return ordered.every((edit, index) => {
     const next = ordered[index + 1];
@@ -123,17 +117,12 @@ export function actionOf(hint, click) {
 }
 /*
  * Types and parameter names the servers infer, asked for the lines in view and a margin around them. The
- * last ones stay until the answer comes, so nothing blinks while typing; scrolling asks again only once the
- * view leaves the lines that were asked for.
+ * last ones stay until the answer comes, so nothing blinks while typing.
  *
- * A hint can be acted on with the pointer. The server is asked to resolve a hint as the pointer arrives, and
- * resting on it for the hover delay shows its tooltip. Mod+click on a part follows its place, a click on a
- * part runs its command and a double click inserts its text edits as one undo step, never together with the
- * command: when a hint has both, the command waits for the double press interval. A press on a hint that
- * offers nothing (yet) moves the caret as beside the text. A finger has no hover, so a tap shows the
- * tooltip and does nothing more. All of it is for the pointer: the hints are not part
- * of the text and stay out of the keyboard's way, and Quick Info on the caret shows the tooltip of a hint that
- * sits there.
+ * Mod+click on a part follows its place, a click runs its command and a double click inserts its text edits
+ * as one undo step, never together with the command. A press on a hint that offers nothing (yet) moves the
+ * caret; a tap only shows the tooltip. The hints stay out of the keyboard's way: Quick Info on the caret
+ * shows the tooltip of a hint that sits there.
  */
 export class InlayHintsFeature {
   language;
@@ -203,23 +192,7 @@ export class InlayHintsFeature {
     if (editor.onInlayClick !== undefined) {
       offs.push(editor.onInlayClick(click => this.pressed(click)));
     }
-    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);
-      });
-    }
+    offs.push(followModKey(language.apple, held => this.setModHeld(held)));
     language.onDispose(() => {
       for (const off of offs) {
         off();
@@ -240,7 +213,7 @@ export class InlayHintsFeature {
   }
   /* The tooltip of a hint that sits at a position, as a card; false when there is none. This is how the keyboard reaches it. */
   async showTooltipAt(position) {
-    const found = [...this.entries].find(([, entry]) => entry.epoch === this.epoch && sameSpot(entry.hint.position, position));
+    const found = [...this.entries].find(([, entry]) => entry.epoch === this.epoch && comparePositions(entry.hint.position, position) === 0);
     if (found === undefined) {
       return false;
     }
@@ -447,7 +420,4 @@ export class InlayHintsFeature {
       });
     }
   }
-}
-function sameSpot(left, right) {
-  return left.line === right.line && left.character === right.character;
 }

package/dist/navigation.js

@@ -5,6 +5,7 @@ import { rangeHolds } from './diagnostics-model.js';
 import { placesOfName } from './symbol-links.js';
 import { isShortcut } from './shortcut-keys.js';
 import { messageOf } from './error-message.js';
+import { placeKey, uniqueBy } from './unique.js';
 const METHODS = {
   definition: 'textDocument/definition',
   declaration: 'textDocument/declaration',
@@ -21,9 +22,8 @@ const SHORTCUT_KINDS = [['definition', 'goToDefinition'], ['typeDefinition', 'go
 const TOAST_ID = 'language-navigation';
 /* The places of a result, each once: the two servers of a Vue file may both know the same one. `target` is the whole declaration when the server gave it. */
 export function uniquePlaces(result) {
-  const seen = new Set();
   const list = result === null ? [] : Array.isArray(result) ? result : [result];
-  return list.map(entry => 'targetUri' in entry ? {
+  return uniqueBy(list.map(entry => 'targetUri' in entry ? {
     location: {
       uri: entry.targetUri,
       range: entry.targetSelectionRange
@@ -32,19 +32,9 @@ export function uniquePlaces(result) {
   } : {
     location: entry,
     target: null
-  }).filter(({
+  }), ({
     location
-  }) => {
-    const {
-      start
-    } = location.range;
-    const key = `${location.uri}\0${start.line}\0${start.character}`;
-    if (seen.has(key)) {
-      return false;
-    }
-    seen.add(key);
-    return true;
-  });
+  }) => placeKey(location));
 }
 /* The places of a result, each once. */
 export function uniqueLocations(result) {

package/dist/peek.js

@@ -5,6 +5,7 @@ import { PEEK_READ_FILES, definitionSnippetOf, peekFilesOf, snippetOf } from './
 import { isShortcut } from './shortcut-keys.js';
 import { messageOf } from './error-message.js';
 import { realTimers, revealRow } from './timers.js';
+import { placeKey, uniqueBy } from './unique.js';
 const TOAST_ID = 'language-peek';
 /* The block as the panel draws it: a hatched band, the header, eight lines of code and a hatched band, until the editor has measured it. */
 export const PEEK_HEIGHT = 241;
@@ -20,9 +21,6 @@ const KINDS = {
     none: 'noDefinition'
   }
 };
-function placeKey(location) {
-  return `${location.uri}\0${location.range.start.line}\0${location.range.start.character}`;
-}
 /*
  * The references of the name at the caret, between the lines of the file under the line it is on. The
  * editor keeps the keyboard: arrows pick a reference, Enter goes to it and Escape closes the peek; typing
@@ -95,15 +93,7 @@ export class PeekFeature {
     const {
       targets
     } = found;
-    const seen = new Set();
-    const unique = found.locations.filter(location => {
-      const key = placeKey(location);
-      if (seen.has(key)) {
-        return false;
-      }
-      seen.add(key);
-      return true;
-    });
+    const unique = uniqueBy(found.locations, placeKey);
     if (unique.length === 0) {
       this.tell(this.say(KINDS[kind].none));
       return;

package/dist/popup-focus.d.ts

@@ -1,5 +1,7 @@
-import type { FocusEvent, MouseEvent } from 'react';
+import { type FocusEvent, type MouseEvent } from 'react';
+import type { EditorLanguage } from './editor-language.ts';
 export declare function keepFocusOutOfList(focusBack: () => void): {
     onMouseDown(event: MouseEvent): void;
     onFocus(event: FocusEvent): void;
 };
+export declare function useInputPopup(language: EditorLanguage, controls: string, activeDescendant: string | undefined): void;

package/dist/popup-focus.js

@@ -1,3 +1,5 @@
+import { c as _c } from "react/compiler-runtime";
+import { useLayoutEffect } from 'react';
 /*
  * The handlers for a popup list whose rows the keyboard never enters: the text it belongs to keeps the
  * focus, and the active row is only `aria-activedescendant` or a highlight. Chromium reports that row as
@@ -9,4 +11,35 @@ export function keepFocusOutOfList(focusBack) {
     onMouseDown: event => event.preventDefault(),
     onFocus: () => focusBack()
   };
+}
+/* The focus stays in the text, so the input is what names the popup's list and its active option. */
+export function useInputPopup(language, controls, activeDescendant) {
+  const $ = _c(8);
+  let t0;
+  if ($[0] !== activeDescendant || $[1] !== controls || $[2] !== language.editor) {
+    t0 = () => {
+      language.editor.setInputPopup({
+        controls,
+        activeDescendant
+      });
+      return () => language.editor.setInputPopup(null);
+    };
+    $[0] = activeDescendant;
+    $[1] = controls;
+    $[2] = language.editor;
+    $[3] = t0;
+  } else {
+    t0 = $[3];
+  }
+  let t1;
+  if ($[4] !== activeDescendant || $[5] !== controls || $[6] !== language) {
+    t1 = [language, controls, activeDescendant];
+    $[4] = activeDescendant;
+    $[5] = controls;
+    $[6] = language;
+    $[7] = t1;
+  } else {
+    t1 = $[7];
+  }
+  useLayoutEffect(t0, t1);
 }

package/dist/recent-choices.d.ts

@@ -7,4 +7,3 @@ export declare class RecentChoices {
     recency(item: CompletionItem): number;
 }
 export declare function recentChoicesOf(languageId: string): RecentChoices;
-export declare function forgetRecentChoices(): void;

package/dist/recent-choices.js

@@ -32,8 +32,4 @@ export function recentChoicesOf(languageId) {
     stores.set(languageId, store);
   }
   return store;
-}
-/* For a test that must not hear the choices an earlier one made. */
-export function forgetRecentChoices() {
-  stores.clear();
 }

package/dist/rendered-docs.d.ts

@@ -39,6 +39,7 @@ export declare class RenderedDocsFeature {
     isRendered(comment: DocComment): boolean;
     toggle(): boolean;
     toggleAt(startLine: number): boolean;
+    private switch;
     entries(): readonly RenderedDocEntry[];
     getVersion(): number;
     getEntries(): readonly RenderedDocEntry[];

package/dist/rendered-docs.js

@@ -1,6 +1,8 @@
 import { findDocComments } from '@adecore/editor';
+import { comparePositions } from './diagnostics-model.js';
 import { KEY_PRIORITY } from './key-priority.js';
 import { parseDocComment } from './doc-comment-model.js';
+import { lineTextOf } from './line-text.js';
 import { isShortcut } from './shortcut-keys.js';
 import { realTimers } from './timers.js';
 const OWNER = 'rendered-docs';
@@ -22,7 +24,7 @@ function touches(range, comment) {
   if (range.end.line < comment.startLine || range.start.line > comment.endLine) {
     return false;
   }
-  const empty = range.start.line === range.end.line && range.start.character === range.end.character;
+  const empty = comparePositions(range.start, range.end) === 0;
   if (!empty && range.end.line === comment.startLine && range.end.character === 0) {
     return false;
   }
@@ -30,13 +32,13 @@ function touches(range, comment) {
 }
 /* The first words of what a comment says, to tell its row from the others for a person who hears it. */
 function summaryOf(body) {
-  const lead = body.split('\n').findIndex(line => /^\s*@/.test(line));
-  const text = (lead === -1 ? body : body.split('\n').slice(0, lead).join('\n')).replace(/[`*_#>[\]()]/g, ' ');
-  const words = text.split(/\s+/).filter(word => word !== '');
-  return words.slice(0, SUMMARY_WORDS).join(' ');
+  const lines = body.split('\n');
+  const lead = lines.findIndex(line => /^\s*@/.test(line));
+  const text = (lead === -1 ? body : lines.slice(0, lead).join('\n')).replace(/[`*_#>[\]()]/g, ' ');
+  return text.split(/\s+/).filter(word => word !== '').slice(0, SUMMARY_WORDS).join(' ');
 }
 function samePlace(range, position) {
-  return range !== null && range.start.line === position.line && range.start.character === position.character;
+  return range !== null && comparePositions(range.start, position) === 0;
 }
 /*
  * Documentation comments drawn as formatted text in place of their lines, the way the Reader mode of the
@@ -105,10 +107,7 @@ export class RenderedDocsFeature {
       }
       this.timers.clear(this.settleTimer);
       this.timers.clear(this.caretTimer);
-      for (const override of this.overrides) {
-        override.tracked.dispose();
-      }
-      this.overrides = [];
+      this.clearOverrides();
       editor.setReplacements?.([], OWNER);
       editor.setGutterMarkers([], OWNER);
       this.containers.clear();
@@ -141,17 +140,14 @@ export class RenderedDocsFeature {
   /* Switches the comment the caret is in between formatted and source. False when the caret is in none. */
   toggle() {
     this.settle();
-    const comment = this.at(this.language.editor.getCaret().line);
-    if (!this.enabled || comment === undefined || !this.canRender(comment)) {
-      return false;
-    }
-    this.setRendered(comment, !this.wantsRendered(comment));
-    return true;
+    return this.switch(this.at(this.language.editor.getCaret().line));
   }
   /* Switches the comment that starts on a line, which is what its gutter button does. */
   toggleAt(startLine) {
     this.settle();
-    const comment = this.comments.find(candidate => candidate.startLine === startLine);
+    return this.switch(this.comments.find(candidate => candidate.startLine === startLine));
+  }
+  switch(comment) {
     if (!this.enabled || comment === undefined || !this.canRender(comment)) {
       return false;
     }
@@ -267,16 +263,7 @@ export class RenderedDocsFeature {
     if (line < 0) {
       return;
     }
-    const text = editor.textInRange({
-      start: {
-        line,
-        character: 0
-      },
-      end: {
-        line,
-        character: Number.MAX_SAFE_INTEGER
-      }
-    });
+    const text = lineTextOf(editor, line);
     const character = line > comment.endLine ? /^[ \t]*/.exec(text)?.[0].length ?? 0 : text.length;
     const place = {
       line,
@@ -344,7 +331,7 @@ export class RenderedDocsFeature {
     this.bump();
   }
   parse(comment) {
-    const key = `${comment.body}`;
+    const key = comment.body;
     let result = this.parsed.get(key);
     if (result === undefined) {
       if (this.parsed.size >= MAX_PARSED) {

package/dist/snippet-field-transforms.d.ts

@@ -1,6 +1,7 @@
 import type { Editor, EditorContentChange, EditorRange } from '@adecore/editor';
 import type { SnippetTransform } from './snippet.ts';
 import type { SnippetTransformLease } from './snippet-transform-queue.ts';
+import type { SnippetTransformJob } from './snippet-transform-protocol.ts';
 export interface FieldTransformTarget {
     readonly id: symbol;
     range: EditorRange;
@@ -12,6 +13,10 @@ export interface FieldTransformTarget {
     readonly order: readonly number[];
     readonly ancestors?: readonly symbol[];
 }
+export declare function jobTable(): {
+    readonly jobs: SnippetTransformJob[];
+    readonly slotOf: (job: SnippetTransformJob) => number;
+};
 export declare class SnippetFieldTransforms {
     private readonly entries;
     private applying;

package/dist/snippet-field-transforms.js

@@ -1,4 +1,23 @@
 import { comparePositions, shiftPosition } from './diagnostics-model.js';
+/* Each distinct job once, so a transform that several ranges share is computed once; `slotOf` is its index in `jobs`. */
+export function jobTable() {
+  const jobs = [];
+  const keys = new Map();
+  const slotOf = 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;
+  };
+  return {
+    jobs,
+    slotOf
+  };
+}
 /* Navigation frames can pop before a worker replies; their tracked targets live independently. */
 export class SnippetFieldTransforms {
   entries = new Set();
@@ -36,22 +55,14 @@ export class SnippetFieldTransforms {
       cancelled: false
     };
     this.entries.add(entry);
-    const jobs = [],
-      keys = new Map();
-    const slots = targets.map(target => {
-      const job = {
-          ...target.transform,
-          value: target.value
-        },
-        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 = targets.map(target => slotOf({
+      ...target.transform,
+      value: target.value
+    }));
     const valid = () => !entry.cancelled && entry.current() && targets.every(target => this.editor.textInRange(target.range) === target.value);
     void this.lease.request(jobs, {
       kind: 'exit',

package/dist/snippet-session.js

@@ -5,16 +5,10 @@ import { acquireSnippetTransforms } from './snippet-transform-queue.js';
 import { realTimers } from './timers.js';
 import { KEY_PRIORITY } from './key-priority.js';
 import { MAX_TRANSFORM_CHARACTERS } from './snippet-transform-protocol.js';
-import { comparePositions, rangeHolds, shiftPosition } from './diagnostics-model.js';
+import { comparePositions, endOfInsertion, rangeHolds, sameRange, shiftPosition } from './diagnostics-model.js';
+import { textBeforeOf } from './line-text.js';
 export function positionInInsertion(start, text, offset) {
-  const lines = text.slice(0, offset).split(/\r\n|\r|\n/);
-  return lines.length === 1 ? {
-    line: start.line,
-    character: start.character + offset
-  } : {
-    line: start.line + lines.length - 1,
-    character: lines[lines.length - 1].length
-  };
+  return endOfInsertion(start, text.slice(0, offset));
 }
 function mapRange(range, changes, grow) {
   let {
@@ -198,7 +192,7 @@ export class SnippetFeature {
       off();
     }
     const now = this.language.editor.getSelections();
-    return valid && current() && now.length === selections.length && now.every((range, index) => comparePositions(range.start, selections[index].start) === 0 && comparePositions(range.end, selections[index].end) === 0);
+    return valid && current() && now.length === selections.length && now.every((range, index) => sameRange(range, selections[index]));
   }
   get isActive() {
     return this.frames.length > 0;
@@ -489,13 +483,7 @@ export class SnippetFeature {
     const groups = [];
     let characters = 0;
     for (const [index, target] of targets.entries()) {
-      const before = editor.textInRange({
-        start: {
-          line: target.range.start.line,
-          character: 0
-        },
-        end: target.range.start
-      });
+      const before = textBeforeOf(editor, target.range.start);
       const prefix = /^[\t ]*/.exec(before)?.[0] ?? '';
       const value = values[index];
       let newlines = 0;
@@ -586,7 +574,7 @@ export class SnippetFeature {
     const captured = [...this.placed, ...active, ...trackedFrames.flatMap(frame => frame.instances.flatMap(instance => instance.fields.flatMap(field => field.ranges.filter(range => !transformIds.has(range.id) || comparePositions(range.start, range.end) < 0))))];
     const ancestorsOf = new Map(targets.map(target => [target, new Set([...(target.ancestors ?? []), ...target.frame.instances.flatMap(instance => instance.fields.flatMap(field => target.owner === instance && target.parents?.includes(field.index) === true ? field.ranges.filter(range => rangeHolds(range, target.range.start) && rangeHolds(range, target.range.end)).map(range => range.id) : []))])]));
     const map = (range, parent) => {
-      const tracked = 'order' in range ? range : captured.find(candidate => comparePositions(candidate.start, range.start) === 0 && comparePositions(candidate.end, range.end) === 0);
+      const tracked = 'order' in range ? range : captured.find(candidate => sameRange(candidate, range));
       let {
         start,
         end
@@ -665,7 +653,7 @@ export class SnippetFeature {
       for (const field of instance.fields) {
         const primary = field.ranges[field.primary];
         field.ranges = field.ranges.filter(range => !range.parents?.includes(index) || !owned.some(edit => comparePositions(edit.range.start, edit.range.end) < 0 && (comparePositions(range.start, range.end) === 0 ? rangeHolds(edit.range, range.start) : comparePositions(edit.range.start, range.end) < 0 && comparePositions(range.start, edit.range.end) < 0)));
-        field.primary = Math.max(0, field.ranges.findIndex(range => range === primary));
+        field.primary = Math.max(0, field.ranges.indexOf(primary));
         field.ranges = field.ranges.map(range => {
           const replacement = this.detached?.ranges.get(range.id);
           if (replacement !== undefined) {
@@ -712,7 +700,7 @@ export class SnippetFeature {
     if (!this.isActive) {
       return;
     }
-    const extras = new Set(change.changes.filter(change => this.extras.some(extra => comparePositions(extra.range.start, change.range.start) === 0 && comparePositions(extra.range.end, change.range.end) === 0 && extra.text === change.text)));
+    const extras = new Set(change.changes.filter(change => this.extras.some(extra => sameRange(extra.range, change.range) && extra.text === change.text)));
     for (const frame of this.frames) {
       if (!this.mapFrame(frame, change.changes, extras)) {
         const caret = this.language.editor.getCaret();