@adecore/editor 0.44.1 → 0.44.3

package/dist/controller.js

@@ -800,8 +800,10 @@ export class InputController {
             : selections.map((selection) => model.slice(Math.min(selection.anchor, selection.head), Math.max(selection.anchor, selection.head))).join('\n');
         event.clipboardData?.setData('text/plain', text);
         lineClip = empty ? text : null;
-        emit(this.copyListeners, { text, wholeLines: empty, cut });
-        if (!cut || this.blockedByReadOnly()) {
+        const blocked = cut && this.blockedByReadOnly();
+        // A cut that a read-only editor refuses took nothing out, so it is told as the copy it came to.
+        emit(this.copyListeners, { text, wholeLines: empty, cut: cut && !blocked });
+        if (!cut || blocked) {
             return;
         }
         this.historyGroup++;

package/dist/outline.js

@@ -91,6 +91,16 @@ function toBlock(entry, document) {
         ...(entry.kind === undefined ? {} : { kind: entry.kind })
     };
 }
+/* Where the name stands in a line as a whole identifier, so `on` is not found inside `function`; -1 where it does not. */
+function identifierIndex(text, name) {
+    const isPart = (character) => character !== undefined && /[\w$]/.test(character);
+    for (let at = text.indexOf(name); at >= 0; at = text.indexOf(name, at + 1)) {
+        if (!isPart(text[at - 1]) && !isPart(text[at + name.length])) {
+            return at;
+        }
+    }
+    return -1;
+}
 /*
  * The blocks the editor knows the document by: its own reading of the structure, or the host's
  * where it has better, such as a language server's symbols. Ends are offsets, so an edit keeps
@@ -147,7 +157,7 @@ export class Outline {
                 return [];
             }
             const header = document.getLine(document.positionAt(entry.from).line);
-            return [header.start + Math.max(0, header.text.indexOf(entry.name))];
+            return [header.start + Math.max(0, identifierIndex(header.text, entry.name))];
         });
     }
     /* Outermost first. Of two blocks that start on one line, only the larger one. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adecore/editor",
-  "version": "0.44.1",
+  "version": "0.44.3",
   "type": "module",
   "exports": {
     ".": {
@@ -54,7 +54,7 @@
     "test": "bun test --conditions=source"
   },
   "dependencies": {
-    "@adecore/editor-core": "0.44.1",
+    "@adecore/editor-core": "0.44.3",
     "linkedom": "^0.18.14",
     "shiki": "^4.5.0"
   },

package/src/controller.ts

@@ -1034,9 +1034,12 @@ export class InputController {
 
         event.clipboardData?.setData('text/plain', text);
         lineClip = empty ? text : null;
-        emit(this.copyListeners, { text, wholeLines: empty, cut });
+        const blocked = cut && this.blockedByReadOnly();
 
-        if (!cut || this.blockedByReadOnly()) {
+        // A cut that a read-only editor refuses took nothing out, so it is told as the copy it came to.
+        emit(this.copyListeners, { text, wholeLines: empty, cut: cut && !blocked });
+
+        if (!cut || blocked) {
             return;
         }
 

package/src/outline.ts

@@ -151,6 +151,19 @@ function toBlock(entry: OutlineEntry, document: OutlineDocument): OutlineBlock {
     };
 }
 
+/* Where the name stands in a line as a whole identifier, so `on` is not found inside `function`; -1 where it does not. */
+function identifierIndex(text: string, name: string): number {
+    const isPart = (character: string | undefined): boolean => character !== undefined && /[\w$]/.test(character);
+
+    for (let at = text.indexOf(name); at >= 0; at = text.indexOf(name, at + 1)) {
+        if (!isPart(text[at - 1]) && !isPart(text[at + name.length])) {
+            return at;
+        }
+    }
+
+    return -1;
+}
+
 /*
  * The blocks the editor knows the document by: its own reading of the structure, or the host's
  * where it has better, such as a language server's symbols. Ends are offsets, so an edit keeps
@@ -224,7 +237,7 @@ export class Outline {
 
             const header = document.getLine(document.positionAt(entry.from).line);
 
-            return [header.start + Math.max(0, header.text.indexOf(entry.name))];
+            return [header.start + Math.max(0, identifierIndex(header.text, entry.name))];
         });
     }