@adecore/editor-core 0.44.2 → 0.44.3

package/dist/complete-statement.js

@@ -52,11 +52,22 @@ function completeBraced(source, lineIndex, caret, options) {
     const context = source.context(end);
     const first = statementStart(source, lineIndex, options.language);
     const firstStart = source.line(first).start;
-    const startsWithBrace = /^\s*\}/.test(line.text);
+    const startsWithBrace = /^\s*\}/.test(line.text) && source.context(line.start + whitespaceOf(line.text).length).bracket?.block !== false;
     let inline = context.mode === 'quote' ? (context.quote ?? '') : '';
     let open = context.bracket;
+    let resume = null;
     for (; open !== undefined && open.template !== true && !(open.close === '}' && open.block === true) && open.at >= firstStart; open = open.previous) {
-        inline += open.close;
+        const closer = source.closerOf(open.at);
+        if (closer === undefined) {
+            inline += open.close;
+        }
+        else {
+            resume = closer;
+        }
+    }
+    // A later line closes a bracket of this one, so the statement goes on there and ends there.
+    if (resume !== null) {
+        return completeBraced(source, source.lineAt(resume), resume, options);
     }
     const tail = source.slice(end, line.end);
     const newline = source.newline(lineIndex);
@@ -121,8 +132,18 @@ function completePython(source, lineIndex, caret, options) {
         return startNewLine(source, lineIndex, options);
     }
     let inline = '';
+    let resume = null;
     for (let open = source.context(end).bracket; open !== undefined; open = open.previous) {
-        inline += open.close;
+        const closer = source.closerOf(open.at);
+        if (closer === undefined) {
+            inline += open.close;
+        }
+        else {
+            resume = closer;
+        }
+    }
+    if (resume !== null) {
+        return completePython(source, source.lineAt(resume), resume, options);
     }
     const head = (source.slice(line.start, end) + inline).trim();
     const tail = source.slice(end, line.end);
@@ -136,21 +157,25 @@ function completePython(source, lineIndex, caret, options) {
 export function planCompleteStatement(source, selections, options) {
     const complete = isBraced(options.language) ? completeBraced : /^(python|py)$/i.test(options.language) ? completePython : null;
     const pieces = new Map();
+    const byStart = new Map();
     for (const selection of selections) {
         const line = source.lineAt(selection.head);
-        pieces.set(line, complete === null ? startNewLine(source, line, options) : complete(source, line, selection.head, options));
+        const piece = complete === null ? startNewLine(source, line, options) : complete(source, line, selection.head, options);
+        // Carets on lines of one statement end up at the same edit, which applies once.
+        pieces.set(line, byStart.get(piece.from) ?? piece);
+        byStart.set(piece.from, pieces.get(line));
     }
-    const ordered = [...pieces.entries()].sort((left, right) => left[1].from - right[1].from);
+    const ordered = [...new Set(pieces.values())].sort((left, right) => left.from - right.from);
     const carets = new Map();
     let delta = 0;
-    for (const [line, piece] of ordered) {
-        carets.set(line, piece.from + delta + piece.caret);
+    for (const piece of ordered) {
+        carets.set(piece, piece.from + delta + piece.caret);
         delta += piece.text.length - (piece.to - piece.from);
     }
     return {
-        edits: ordered.map(([, piece]) => ({ from: piece.from, to: piece.to, text: piece.text })),
+        edits: ordered.map((piece) => ({ from: piece.from, to: piece.to, text: piece.text })),
         selections: selections.map((selection) => {
-            const caret = carets.get(source.lineAt(selection.head));
+            const caret = carets.get(pieces.get(source.lineAt(selection.head)));
             return { anchor: caret, head: caret };
         })
     };

package/dist/document.d.ts

@@ -146,6 +146,8 @@ export declare class DocumentModel {
     unwrapTargets(offset: number, language: string, indentUnit: string): UnwrapTarget[];
     private editSource;
     private isUnclosedBrace;
+    private closerOf;
+    private bracketIndexAt;
     private scriptSource;
     private scriptBracketIndex;
     private bracketIndex;

package/dist/document.js

@@ -1569,7 +1569,8 @@ export class DocumentModel {
             newline: (index) => this.newlineAt(index),
             context: (offset) => this.typingContext(offset, language),
             region: (line) => (/^vue$/i.test(language) ? vueRegionAt((index) => this.getLine(index).text, line) : null),
-            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language)
+            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language),
+            closerOf: (offset) => this.closerOf(offset, language)
         };
     }
     /*
@@ -1577,8 +1578,7 @@ export class DocumentModel {
      * it, which it took from that block. Such a closer sits shallower than the brace's line and leaves an opener before it unmatched.
      */
     isUnclosedBrace(offset, language) {
-        const context = isPhp(language) ? this.typingContext(offset, language) : undefined;
-        const index = context?.embedded === 'javascript' && context.embedStart !== undefined ? this.scriptBracketIndex(context.embedStart) : this.bracketIndex(language);
+        const index = this.bracketIndexAt(offset, language);
         if (index === undefined) {
             return false;
         }
@@ -1592,6 +1592,20 @@ export class DocumentModel {
         }
         return [...index.unmatched].some((at) => at < offset && this.rope.charAt(at) === '{');
     }
+    /* Where the closer of the opening bracket at `offset` stands; undefined where it has none, or the document is too large to scan. */
+    closerOf(offset, language) {
+        const index = this.bracketIndexAt(offset, language);
+        if (index === undefined || index.unmatched.has(offset)) {
+            return undefined;
+        }
+        return index.pairs.get(offset);
+    }
+    bracketIndexAt(offset, language) {
+        const context = isPhp(language) ? this.typingContext(offset, language) : undefined;
+        return context?.embedded === 'javascript' && context.embedStart !== undefined
+            ? this.scriptBracketIndex(context.embedStart)
+            : this.bracketIndex(language);
+    }
     scriptSource(start, limit) {
         if (this.scriptCache?.revision !== this.revision) {
             this.scriptCache = { revision: this.revision, sources: new Map() };

package/dist/edit-source.d.ts

@@ -12,6 +12,7 @@ export interface EditSource {
     context(offset: number): TypingContext;
     region(line: number): VueRegion | null;
     unclosedBrace(offset: number): boolean;
+    closerOf(offset: number): number | undefined;
 }
 export interface EditPlan {
     edits: TextEdit[];

package/dist/hippie.js

@@ -43,19 +43,25 @@ function isHump(word, index) {
     const startsHump = character !== character.toLowerCase() && before !== before.toUpperCase();
     return startsHump || /[\d_-]/.test(before);
 }
-function continues(word, prefix, wordIndex, prefixIndex) {
+/* `failed` holds the positions known to lead nowhere, so each of the word times prefix positions is tried once. */
+function continues(word, prefix, wordIndex, prefixIndex, failed) {
     if (prefixIndex === prefix.length) {
         return true;
     }
+    const position = wordIndex * prefix.length + prefixIndex;
+    if (failed.has(position)) {
+        return false;
+    }
     for (let i = wordIndex; i < word.length; i++) {
         // The character right after the last match continues it; any other has to start a hump.
         if (i > wordIndex && !isHump(word, i)) {
             continue;
         }
-        if (word[i].toLowerCase() === prefix[prefixIndex].toLowerCase() && continues(word, prefix, i + 1, prefixIndex + 1)) {
+        if (word[i].toLowerCase() === prefix[prefixIndex].toLowerCase() && continues(word, prefix, i + 1, prefixIndex + 1, failed)) {
             return true;
         }
     }
+    failed.add(position);
     return false;
 }
 /* Whether a word is longer than the prefix and starts with it: the first character as typed, the rest by letters of any case or camel humps. */
@@ -63,7 +69,7 @@ export function hippieMatches(word, prefix) {
     if (word.length <= prefix.length) {
         return false;
     }
-    return prefix === '' || (word[0] === prefix[0] && continues(word, prefix, 1, 1));
+    return prefix === '' || (word[0] === prefix[0] && continues(word, prefix, 1, 1, new Set()));
 }
 /* The words of this document that complete the prefix: those before the primary caret ascending, then those after it. */
 function variantsHere(text, carets, primary, prefix, hyphenated) {
@@ -160,12 +166,13 @@ export function planHippie(text, carets, primary, cycle, direction, options) {
     }
     // With nothing left to offer, a cycle that is under way gives the prefix back.
     const proposal = variant?.text ?? prefix;
-    const length = cycle?.length ?? prefix.length;
     const edits = [];
     const landed = [];
     let end = 0;
     let delta = 0;
     for (const caret of carets) {
+        // A cycle under way holds the same text at every caret; a first press replaces what each caret has typed.
+        const length = cycle?.length ?? caret - hippiePrefixStart(text, caret, hyphenated);
         const from = Math.max(caret - length, end);
         edits.push({ from, to: caret, text: proposal });
         landed.push(from + delta + proposal.length);

package/dist/statement-move.js

@@ -312,10 +312,12 @@ function apply(source, selections, moves, options) {
     const moved = [];
     const lines = [];
     const ordered = moves.toSorted((left, right) => left.region.first - right.region.first);
+    // Where a region stands after the edits of the regions before it.
+    let delta = 0;
     for (const { region, order } of ordered) {
         const parts = [];
         const placed = [];
-        let at = source.line(region.first).start;
+        let at = source.line(region.first).start + delta;
         for (const [index, slot] of order.entries()) {
             const info = source.line(slot.line);
             const target = source.line(region.first + index);
@@ -328,8 +330,10 @@ function apply(source, selections, moves, options) {
                 lines.push({ from: slot.line, to: region.first + index });
             }
         }
-        edits.push({ from: source.line(region.first).start, to: source.line(region.last).next, text: parts.join('') });
+        const edit = { from: source.line(region.first).start, to: source.line(region.last).next, text: parts.join('') };
+        edits.push(edit);
         moved.push(placed);
+        delta += edit.text.length - (edit.to - edit.from);
     }
     const mapPoint = (offset, keepWithLineAbove) => {
         const line = source.lineAt(keepWithLineAbove ? offset - 1 : offset);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor-core",
-  "version": "0.44.2",
+  "version": "0.44.3",
   "type": "module",
   "exports": {
     ".": {

package/src/complete-statement.ts

@@ -89,12 +89,25 @@ function completeBraced(source: EditSource, lineIndex: number, caret: number, op
     const context = source.context(end);
     const first = statementStart(source, lineIndex, options.language);
     const firstStart = source.line(first).start;
-    const startsWithBrace = /^\s*\}/.test(line.text);
+    const startsWithBrace = /^\s*\}/.test(line.text) && source.context(line.start + whitespaceOf(line.text).length).bracket?.block !== false;
     let inline = context.mode === 'quote' ? (context.quote ?? '') : '';
     let open = context.bracket;
 
+    let resume: number | null = null;
+
     for (; open !== undefined && open.template !== true && !(open.close === '}' && open.block === true) && open.at >= firstStart; open = open.previous) {
-        inline += open.close;
+        const closer = source.closerOf(open.at);
+
+        if (closer === undefined) {
+            inline += open.close;
+        } else {
+            resume = closer;
+        }
+    }
+
+    // A later line closes a bracket of this one, so the statement goes on there and ends there.
+    if (resume !== null) {
+        return completeBraced(source, source.lineAt(resume), resume, options);
     }
 
     const tail = source.slice(end, line.end);
@@ -184,9 +197,20 @@ function completePython(source: EditSource, lineIndex: number, caret: number, op
     }
 
     let inline = '';
+    let resume: number | null = null;
 
     for (let open = source.context(end).bracket; open !== undefined; open = open.previous) {
-        inline += open.close;
+        const closer = source.closerOf(open.at);
+
+        if (closer === undefined) {
+            inline += open.close;
+        } else {
+            resume = closer;
+        }
+    }
+
+    if (resume !== null) {
+        return completePython(source, source.lineAt(resume), resume, options);
     }
 
     const head = (source.slice(line.start, end) + inline).trim();
@@ -205,25 +229,30 @@ function completePython(source: EditSource, lineIndex: number, caret: number, op
 export function planCompleteStatement(source: EditSource, selections: readonly Selection[], options: CompleteStatementOptions): EditPlan {
     const complete = isBraced(options.language) ? completeBraced : /^(python|py)$/i.test(options.language) ? completePython : null;
     const pieces = new Map<number, Piece>();
+    const byStart = new Map<number, Piece>();
 
     for (const selection of selections) {
         const line = source.lineAt(selection.head);
-        pieces.set(line, complete === null ? startNewLine(source, line, options) : complete(source, line, selection.head, options));
+        const piece = complete === null ? startNewLine(source, line, options) : complete(source, line, selection.head, options);
+
+        // Carets on lines of one statement end up at the same edit, which applies once.
+        pieces.set(line, byStart.get(piece.from) ?? piece);
+        byStart.set(piece.from, pieces.get(line)!);
     }
 
-    const ordered = [...pieces.entries()].sort((left, right) => left[1].from - right[1].from);
-    const carets = new Map<number, number>();
+    const ordered = [...new Set(pieces.values())].sort((left, right) => left.from - right.from);
+    const carets = new Map<Piece, number>();
     let delta = 0;
 
-    for (const [line, piece] of ordered) {
-        carets.set(line, piece.from + delta + piece.caret);
+    for (const piece of ordered) {
+        carets.set(piece, piece.from + delta + piece.caret);
         delta += piece.text.length - (piece.to - piece.from);
     }
 
     return {
-        edits: ordered.map(([, piece]) => ({ from: piece.from, to: piece.to, text: piece.text })),
+        edits: ordered.map((piece) => ({ from: piece.from, to: piece.to, text: piece.text })),
         selections: selections.map((selection) => {
-            const caret = carets.get(source.lineAt(selection.head))!;
+            const caret = carets.get(pieces.get(source.lineAt(selection.head))!)!;
 
             return { anchor: caret, head: caret };
         })

package/src/document.ts

@@ -2224,7 +2224,8 @@ export class DocumentModel {
             newline: (index) => this.newlineAt(index),
             context: (offset) => this.typingContext(offset, language),
             region: (line) => (/^vue$/i.test(language) ? vueRegionAt((index) => this.getLine(index).text, line) : null),
-            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language)
+            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language),
+            closerOf: (offset) => this.closerOf(offset, language)
         };
     }
 
@@ -2233,10 +2234,7 @@ export class DocumentModel {
      * it, which it took from that block. Such a closer sits shallower than the brace's line and leaves an opener before it unmatched.
      */
     private isUnclosedBrace(offset: number, language: string): boolean {
-        const context = isPhp(language) ? this.typingContext(offset, language) : undefined;
-
-        const index =
-            context?.embedded === 'javascript' && context.embedStart !== undefined ? this.scriptBracketIndex(context.embedStart) : this.bracketIndex(language);
+        const index = this.bracketIndexAt(offset, language);
 
         if (index === undefined) {
             return false;
@@ -2257,6 +2255,25 @@ export class DocumentModel {
         return [...index.unmatched].some((at) => at < offset && this.rope.charAt(at) === '{');
     }
 
+    /* Where the closer of the opening bracket at `offset` stands; undefined where it has none, or the document is too large to scan. */
+    private closerOf(offset: number, language: string): number | undefined {
+        const index = this.bracketIndexAt(offset, language);
+
+        if (index === undefined || index.unmatched.has(offset)) {
+            return undefined;
+        }
+
+        return index.pairs.get(offset);
+    }
+
+    private bracketIndexAt(offset: number, language: string): BracketIndex | undefined {
+        const context = isPhp(language) ? this.typingContext(offset, language) : undefined;
+
+        return context?.embedded === 'javascript' && context.embedStart !== undefined
+            ? this.scriptBracketIndex(context.embedStart)
+            : this.bracketIndex(language);
+    }
+
     private scriptSource(start: number, limit: number): { limit: number; text?: string; index?: BracketIndex } {
         if (this.scriptCache?.revision !== this.revision) {
             this.scriptCache = { revision: this.revision, sources: new Map() };

package/src/edit-source.ts

@@ -16,6 +16,8 @@ export interface EditSource {
     region(line: number): VueRegion | null;
     /* Whether a `{` at this offset has no closer of its own, so Enter after it adds one. */
     unclosedBrace(offset: number): boolean;
+    /* Where the closer of the opening bracket at this offset stands, undefined where the document has none. */
+    closerOf(offset: number): number | undefined;
 }
 
 /* Edits to apply together and the selections that stand after them. */

package/src/hippie.ts

@@ -103,22 +103,31 @@ function isHump(word: string, index: number): boolean {
     return startsHump || /[\d_-]/.test(before);
 }
 
-function continues(word: string, prefix: string, wordIndex: number, prefixIndex: number): boolean {
+/* `failed` holds the positions known to lead nowhere, so each of the word times prefix positions is tried once. */
+function continues(word: string, prefix: string, wordIndex: number, prefixIndex: number, failed: Set<number>): boolean {
     if (prefixIndex === prefix.length) {
         return true;
     }
 
+    const position = wordIndex * prefix.length + prefixIndex;
+
+    if (failed.has(position)) {
+        return false;
+    }
+
     for (let i = wordIndex; i < word.length; i++) {
         // The character right after the last match continues it; any other has to start a hump.
         if (i > wordIndex && !isHump(word, i)) {
             continue;
         }
 
-        if (word[i]!.toLowerCase() === prefix[prefixIndex]!.toLowerCase() && continues(word, prefix, i + 1, prefixIndex + 1)) {
+        if (word[i]!.toLowerCase() === prefix[prefixIndex]!.toLowerCase() && continues(word, prefix, i + 1, prefixIndex + 1, failed)) {
             return true;
         }
     }
 
+    failed.add(position);
+
     return false;
 }
 
@@ -128,7 +137,7 @@ export function hippieMatches(word: string, prefix: string): boolean {
         return false;
     }
 
-    return prefix === '' || (word[0] === prefix[0] && continues(word, prefix, 1, 1));
+    return prefix === '' || (word[0] === prefix[0] && continues(word, prefix, 1, 1, new Set()));
 }
 
 /* The words of this document that complete the prefix: those before the primary caret ascending, then those after it. */
@@ -263,13 +272,14 @@ export function planHippie(
 
     // With nothing left to offer, a cycle that is under way gives the prefix back.
     const proposal = variant?.text ?? prefix;
-    const length = cycle?.length ?? prefix.length;
     const edits: TextEdit[] = [];
     const landed: number[] = [];
     let end = 0;
     let delta = 0;
 
     for (const caret of carets) {
+        // A cycle under way holds the same text at every caret; a first press replaces what each caret has typed.
+        const length = cycle?.length ?? caret - hippiePrefixStart(text, caret, hyphenated);
         const from = Math.max(caret - length, end);
 
         edits.push({ from, to: caret, text: proposal });

package/src/statement-move.ts

@@ -473,10 +473,13 @@ function apply(source: EditSource, selections: readonly Selection[], moves: read
 
     const ordered = moves.toSorted((left, right) => left.region.first - right.region.first);
 
+    // Where a region stands after the edits of the regions before it.
+    let delta = 0;
+
     for (const { region, order } of ordered) {
         const parts: string[] = [];
         const placed: Placed[] = [];
-        let at = source.line(region.first).start;
+        let at = source.line(region.first).start + delta;
 
         for (const [index, slot] of order.entries()) {
             const info = source.line(slot.line);
@@ -492,8 +495,11 @@ function apply(source: EditSource, selections: readonly Selection[], moves: read
             }
         }
 
-        edits.push({ from: source.line(region.first).start, to: source.line(region.last).next, text: parts.join('') });
+        const edit = { from: source.line(region.first).start, to: source.line(region.last).next, text: parts.join('') };
+
+        edits.push(edit);
         moved.push(placed);
+        delta += edit.text.length - (edit.to - edit.from);
     }
 
     const mapPoint = (offset: number, keepWithLineAbove: boolean): number => {