@codemirror/autocomplete 6.5.1 → 6.6.0

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 6.6.0 (2023-04-27)
+
+### Bug fixes
+
+Fix a bug in `insertCompletionText` that caused it to replace the wrong range when a result set's `to` fell after the cursor.
+
+### New features
+
+Functions returned by `snippet` can now be called without a completion object.
+
 ## 6.5.1 (2023-04-13)
 
 ### Bug fixes

package/dist/index.cjs

@@ -166,14 +166,14 @@ completion's text in the main selection range, and any other
 selection range that has the same text in front of it.
 */
 function insertCompletionText(state$1, text, from, to) {
-    let { main } = state$1.selection, len = to - from;
+    let { main } = state$1.selection, fromOff = from - main.from, toOff = to - main.from;
     return Object.assign(Object.assign({}, state$1.changeByRange(range => {
-        if (range != main && len &&
-            state$1.sliceDoc(range.from - len, range.from + to - main.from) != state$1.sliceDoc(from, to))
+        if (range != main && from != to &&
+            state$1.sliceDoc(range.from + fromOff, range.from + toOff) != state$1.sliceDoc(from, to))
             return { range };
         return {
-            changes: { from: range.from - len, to: to == main.from ? range.to : range.from + to - main.from, insert: text },
-            range: state.EditorSelection.cursor(range.from - len + text.length)
+            changes: { from: range.from + fromOff, to: to == main.from ? range.to : range.from + toOff, insert: text },
+            range: state.EditorSelection.cursor(range.from + fromOff + text.length)
         };
     })), { userEvent: "input.complete" });
 }
@@ -1432,7 +1432,7 @@ function snippet(template) {
         let spec = {
             changes: { from, to, insert: state.Text.of(text) },
             scrollIntoView: true,
-            annotations: pickedCompletion.of(completion)
+            annotations: completion ? pickedCompletion.of(completion) : undefined
         };
         if (ranges.length)
             spec.selection = fieldSelection(ranges, 0);

package/dist/index.d.ts

@@ -384,7 +384,7 @@ interpreted as indicating a placeholder.
 declare function snippet(template: string): (editor: {
     state: EditorState;
     dispatch: (tr: Transaction) => void;
-}, completion: Completion, from: number, to: number) => void;
+}, completion: Completion | null, from: number, to: number) => void;
 /**
 A command that clears the active snippet, if any.
 */

package/dist/index.js

@@ -162,14 +162,14 @@ completion's text in the main selection range, and any other
 selection range that has the same text in front of it.
 */
 function insertCompletionText(state, text, from, to) {
-    let { main } = state.selection, len = to - from;
+    let { main } = state.selection, fromOff = from - main.from, toOff = to - main.from;
     return Object.assign(Object.assign({}, state.changeByRange(range => {
-        if (range != main && len &&
-            state.sliceDoc(range.from - len, range.from + to - main.from) != state.sliceDoc(from, to))
+        if (range != main && from != to &&
+            state.sliceDoc(range.from + fromOff, range.from + toOff) != state.sliceDoc(from, to))
             return { range };
         return {
-            changes: { from: range.from - len, to: to == main.from ? range.to : range.from + to - main.from, insert: text },
-            range: EditorSelection.cursor(range.from - len + text.length)
+            changes: { from: range.from + fromOff, to: to == main.from ? range.to : range.from + toOff, insert: text },
+            range: EditorSelection.cursor(range.from + fromOff + text.length)
         };
     })), { userEvent: "input.complete" });
 }
@@ -1428,7 +1428,7 @@ function snippet(template) {
         let spec = {
             changes: { from, to, insert: Text.of(text) },
             scrollIntoView: true,
-            annotations: pickedCompletion.of(completion)
+            annotations: completion ? pickedCompletion.of(completion) : undefined
         };
         if (ranges.length)
             spec.selection = fieldSelection(ranges, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/autocomplete",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "description": "Autocompletion for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",