@codemirror/autocomplete 6.10.2 → 6.11.1

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## 6.11.1 (2023-11-27)
+
+### Bug fixes
+
+Fix a bug that caused typing over closed brackets after pressing enter to still not work in many situations.
+
+## 6.11.0 (2023-11-09)
+
+### Bug fixes
+
+Fix an issue that would prevent typing over closed brackets after starting a new line with enter.
+
+### New features
+
+Additional elements rendered in completion options with `addToOptions` are now given access to the editor view.
+
 ## 6.10.2 (2023-10-13)
 
 ### Bug fixes

package/dist/index.cjs

@@ -404,7 +404,7 @@ function optionContent(config) {
             position: 20
         });
     content.push({
-        render(completion, _s, match) {
+        render(completion, _s, _v, match) {
             let labelElt = document.createElement("span");
             labelElt.className = "cm-completionLabel";
             let label = completion.displayLabel || completion.label, off = 0;
@@ -653,7 +653,7 @@ class CompletionTooltip {
             if (cls)
                 li.className = cls;
             for (let source of this.optionContent) {
-                let node = source(completion, this.view.state, match);
+                let node = source(completion, this.view.state, this.view, match);
                 if (node)
                     li.appendChild(node);
             }
@@ -1662,13 +1662,11 @@ closedBracket.endSide = -1;
 const bracketState = state.StateField.define({
     create() { return state.RangeSet.empty; },
     update(value, tr) {
+        value = value.map(tr.changes);
         if (tr.selection) {
-            let lineStart = tr.state.doc.lineAt(tr.selection.main.head).from;
-            let prevLineStart = tr.startState.doc.lineAt(tr.startState.selection.main.head).from;
-            if (lineStart != tr.changes.mapPos(prevLineStart, -1))
-                value = state.RangeSet.empty;
+            let line = tr.state.doc.lineAt(tr.selection.main.head);
+            value = value.update({ filter: from => from >= line.from && from <= line.to });
         }
-        value = value.map(tr.changes);
         for (let effect of tr.effects)
             if (effect.is(closeBracketEffect))
                 value = value.update({ add: [closedBracket.range(effect.value, effect.value + 1)] });

package/dist/index.d.cts

@@ -340,7 +340,7 @@ interface CompletionConfig {
     80.
     */
     addToOptions?: {
-        render: (completion: Completion, state: EditorState) => Node | null;
+        render: (completion: Completion, state: EditorState, view: EditorView) => Node | null;
         position: number;
     }[];
     /**

package/dist/index.d.ts

@@ -340,7 +340,7 @@ interface CompletionConfig {
     80.
     */
     addToOptions?: {
-        render: (completion: Completion, state: EditorState) => Node | null;
+        render: (completion: Completion, state: EditorState, view: EditorView) => Node | null;
         position: number;
     }[];
     /**

package/dist/index.js

@@ -402,7 +402,7 @@ function optionContent(config) {
             position: 20
         });
     content.push({
-        render(completion, _s, match) {
+        render(completion, _s, _v, match) {
             let labelElt = document.createElement("span");
             labelElt.className = "cm-completionLabel";
             let label = completion.displayLabel || completion.label, off = 0;
@@ -651,7 +651,7 @@ class CompletionTooltip {
             if (cls)
                 li.className = cls;
             for (let source of this.optionContent) {
-                let node = source(completion, this.view.state, match);
+                let node = source(completion, this.view.state, this.view, match);
                 if (node)
                     li.appendChild(node);
             }
@@ -1660,13 +1660,11 @@ closedBracket.endSide = -1;
 const bracketState = /*@__PURE__*/StateField.define({
     create() { return RangeSet.empty; },
     update(value, tr) {
+        value = value.map(tr.changes);
         if (tr.selection) {
-            let lineStart = tr.state.doc.lineAt(tr.selection.main.head).from;
-            let prevLineStart = tr.startState.doc.lineAt(tr.startState.selection.main.head).from;
-            if (lineStart != tr.changes.mapPos(prevLineStart, -1))
-                value = RangeSet.empty;
+            let line = tr.state.doc.lineAt(tr.selection.main.head);
+            value = value.update({ filter: from => from >= line.from && from <= line.to });
         }
-        value = value.map(tr.changes);
         for (let effect of tr.effects)
             if (effect.is(closeBracketEffect))
                 value = value.update({ add: [closedBracket.range(effect.value, effect.value + 1)] });

package/package.json

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