@adecore/editor-core 0.17.0 → 0.18.0

package/dist/document.d.ts

@@ -110,6 +110,7 @@ export declare class DocumentModel {
     private startNewLineBefore;
     private editLines;
     private editSource;
+    private isUnclosedBrace;
     private bracketIndex;
     private deleteCharacter;
     private unindent;

package/dist/document.js

@@ -1317,9 +1317,28 @@ 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),
-            unmatchedBrace: (offset) => this.bracketIndex(language)?.unmatched.has(offset) ?? false
+            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language)
         };
     }
+    /*
+     * Whether the `{` at `offset` has no closer of its own: none in the document, or only the closer of a block around
+     * 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 index = this.bracketIndex(language);
+        if (index === undefined) {
+            return false;
+        }
+        if (index.unmatched.has(offset)) {
+            return true;
+        }
+        const closer = index.pairs.get(offset);
+        const indentAt = (at) => this.getLine(this.rope.lineAt(at)).text.match(/^[\t ]*/)[0].length;
+        if (closer === undefined || indentAt(closer) >= indentAt(offset)) {
+            return false;
+        }
+        return [...index.unmatched].some((at) => at < offset && this.rope.charAt(at) === '{');
+    }
     /* Undefined for a document too large to scan on every Enter. */
     bracketIndex(language) {
         if (this.rope.length > bracketScanLimit) {

package/dist/edit-source.d.ts

@@ -11,7 +11,7 @@ export interface EditSource {
     newline(index: number): string;
     context(offset: number): TypingContext;
     region(line: number): VueRegion | null;
-    unmatchedBrace(offset: number): boolean;
+    unclosedBrace(offset: number): boolean;
 }
 export interface EditPlan {
     edits: TextEdit[];

package/dist/enter.js

@@ -120,7 +120,7 @@ class Enter {
             if (next === closers[last]) {
                 return { from, to: afterWhitespace, text: newline + inner + newline + start, caret: newline.length + inner.length };
             }
-            const closing = last === '{' && source.unmatchedBrace(context.bracket.at) ? this.closeBrace(from, afterWhitespace, line, rest, newline, start, inner) : null;
+            const closing = last === '{' && source.unclosedBrace(context.bracket.at) ? this.closeBrace(from, afterWhitespace, line, rest, newline, start, inner) : null;
             return closing ?? plain(inner);
         }
         const tag = this.openTag(trimmed, index);

package/package.json

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

package/src/document.ts

@@ -1584,10 +1584,30 @@ 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),
-            unmatchedBrace: (offset) => this.bracketIndex(language)?.unmatched.has(offset) ?? false
+            unclosedBrace: (offset) => this.isUnclosedBrace(offset, language)
         };
     }
 
+    /*
+     * Whether the `{` at `offset` has no closer of its own: none in the document, or only the closer of a block around
+     * 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 index = this.bracketIndex(language);
+        if (index === undefined) {
+            return false;
+        }
+        if (index.unmatched.has(offset)) {
+            return true;
+        }
+        const closer = index.pairs.get(offset);
+        const indentAt = (at: number): number => this.getLine(this.rope.lineAt(at)).text.match(/^[\t ]*/)![0].length;
+        if (closer === undefined || indentAt(closer) >= indentAt(offset)) {
+            return false;
+        }
+        return [...index.unmatched].some((at) => at < offset && this.rope.charAt(at) === '{');
+    }
+
     /* Undefined for a document too large to scan on every Enter. */
     private bracketIndex(language: string): BracketIndex | undefined {
         if (this.rope.length > bracketScanLimit) {

package/src/edit-source.ts

@@ -14,8 +14,8 @@ export interface EditSource {
     newline(index: number): string;
     context(offset: number): TypingContext;
     region(line: number): VueRegion | null;
-    /* Whether a `{` at this offset has no closer anywhere in the document. */
-    unmatchedBrace(offset: number): boolean;
+    /* Whether a `{` at this offset has no closer of its own, so Enter after it adds one. */
+    unclosedBrace(offset: number): boolean;
 }
 
 /* Edits to apply together and the selections that stand after them. */

package/src/enter.ts

@@ -159,7 +159,7 @@ class Enter {
                 return { from, to: afterWhitespace, text: newline + inner + newline + start, caret: newline.length + inner.length };
             }
             const closing =
-                last === '{' && source.unmatchedBrace(context.bracket!.at) ? this.closeBrace(from, afterWhitespace, line, rest, newline, start, inner) : null;
+                last === '{' && source.unclosedBrace(context.bracket!.at) ? this.closeBrace(from, afterWhitespace, line, rest, newline, start, inner) : null;
             return closing ?? plain(inner);
         }