@codemirror/autocomplete 0.18.4 → 0.18.8

package/CHANGELOG.md

@@ -1,3 +1,35 @@
+## 0.18.8 (2021-06-30)
+
+### New features
+
+Add an `ifIn` helper function that constrains a completion source to only fire when in a given syntax node. Add support for unfiltered completions
+
+A completion result can now set a `filter: false` property to disable filtering and sorting of completions, when it already did so itself.
+
+## 0.18.7 (2021-06-14)
+
+### Bug fixes
+
+Don't treat continued completions when typing after an explicit completion as explicit.
+
+## 0.18.6 (2021-06-03)
+
+### Bug fixes
+
+Adding or reconfiguring completion sources will now cause them to be activated right away if a completion was active.
+
+### New features
+
+You can now specify multiple types in `Completion.type` by separating them by spaces. Small doc comment tweak for Completion.type
+
+## 0.18.5 (2021-04-23)
+
+### Bug fixes
+
+Fix a regression where snippet field selection didn't work with @codemirror/state 0.18.6.
+
+Fix a bug where snippet fields with different position numbers were inappropriately merged.
+
 ## 0.18.4 (2021-04-20)
 
 ### Bug fixes

package/dist/index.cjs

@@ -109,6 +109,18 @@ function completeFromList(list) {
     };
 }
 /**
+Wrap the given completion source so that it will only fire when the
+cursor is in a syntax node with one of the given names.
+*/
+function ifIn(nodes, source) {
+    return (context) => {
+        for (let pos = language.syntaxTree(context.state).resolve(context.pos, -1); pos; pos = pos.parent)
+            if (nodes.indexOf(pos.name) > -1)
+                return source(context);
+        return null;
+    };
+}
+/**
 Wrap the given completion source so that it will not fire when the
 cursor is in a syntax node with one of the given names.
 */
@@ -406,7 +418,7 @@ function createListBox(options, id, range) {
         let icon = li.appendChild(document.createElement("div"));
         icon.classList.add("cm-completionIcon");
         if (completion.type)
-            icon.classList.add("cm-completionIcon-" + completion.type);
+            icon.classList.add(...completion.type.split(/\s+/g).map(cls => "cm-completionIcon-" + cls));
         icon.setAttribute("aria-hidden", "true");
         let labelElt = li.appendChild(document.createElement("span"));
         labelElt.className = "cm-completionLabel";
@@ -588,16 +600,22 @@ function score(option) {
         (option.type ? 1 : 0);
 }
 function sortOptions(active, state) {
-    let options = [];
+    let options = [], i = 0;
     for (let a of active)
         if (a.hasResult()) {
-            let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to)), match;
-            for (let option of a.result.options)
-                if (match = matcher.match(option.label)) {
-                    if (option.boost != null)
-                        match[0] += option.boost;
-                    options.push(new Option(option, a, match));
-                }
+            if (a.result.filter === false) {
+                for (let option of a.result.options)
+                    options.push(new Option(option, a, [1e9 - i++]));
+            }
+            else {
+                let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to)), match;
+                for (let option of a.result.options)
+                    if (match = matcher.match(option.label)) {
+                        if (option.boost != null)
+                            match[0] += option.boost;
+                        options.push(new Option(option, a, match));
+                    }
+            }
         }
     options.sort(cmpOption);
     let result = [], prev = null;
@@ -659,7 +677,8 @@ class CompletionState {
         let sources = conf.override ||
             state.languageDataAt("autocomplete", cur(state)).map(asSource);
         let active = sources.map(source => {
-            let value = this.active.find(s => s.source == source) || new ActiveSource(source, 0 /* Inactive */, false);
+            let value = this.active.find(s => s.source == source) ||
+                new ActiveSource(source, this.active.some(a => a.state != 0 /* Inactive */) ? 1 /* Pending */ : 0 /* Inactive */);
             return value.update(tr, conf);
         });
         if (active.length == this.active.length && active.every((a, i) => a == this.active[i]))
@@ -668,7 +687,7 @@ class CompletionState {
             !sameResults(active, this.active) ? CompletionDialog.build(active, state, this.id, this.open)
             : this.open && tr.docChanged ? this.open.map(tr.changes) : this.open;
         if (!open && active.every(a => a.state != 1 /* Pending */) && active.some(a => a.hasResult()))
-            active = active.map(a => a.hasResult() ? new ActiveSource(a.source, 0 /* Inactive */, false) : a);
+            active = active.map(a => a.hasResult() ? new ActiveSource(a.source, 0 /* Inactive */) : a);
         for (let effect of tr.effects)
             if (effect.is(setSelectedEffect))
                 open = open && open.setSelected(effect.value, this.id);
@@ -708,10 +727,10 @@ function cmpOption(a, b) {
     return lA < lB ? -1 : lA == lB ? 0 : 1;
 }
 class ActiveSource {
-    constructor(source, state, explicit) {
+    constructor(source, state, explicitPos = -1) {
         this.source = source;
         this.state = state;
-        this.explicit = explicit;
+        this.explicitPos = explicitPos;
     }
     hasResult() { return false; }
     update(tr, conf) {
@@ -721,12 +740,12 @@ class ActiveSource {
         else if (tr.docChanged)
             value = value.handleChange(tr);
         else if (tr.selection && value.state != 0 /* Inactive */)
-            value = new ActiveSource(value.source, 0 /* Inactive */, false);
+            value = new ActiveSource(value.source, 0 /* Inactive */);
         for (let effect of tr.effects) {
             if (effect.is(startCompletionEffect))
-                value = new ActiveSource(value.source, 1 /* Pending */, effect.value);
+                value = new ActiveSource(value.source, 1 /* Pending */, effect.value ? cur(tr.state) : -1);
             else if (effect.is(closeCompletionEffect))
-                value = new ActiveSource(value.source, 0 /* Inactive */, false);
+                value = new ActiveSource(value.source, 0 /* Inactive */);
             else if (effect.is(setActiveEffect))
                 for (let active of effect.value)
                     if (active.source == value.source)
@@ -734,16 +753,19 @@ class ActiveSource {
         }
         return value;
     }
-    handleUserEvent(_tr, type, conf) {
-        return type == "delete" || !conf.activateOnTyping ? this : new ActiveSource(this.source, 1 /* Pending */, false);
+    handleUserEvent(tr, type, conf) {
+        return type == "delete" || !conf.activateOnTyping ? this.map(tr.changes) : new ActiveSource(this.source, 1 /* Pending */);
     }
     handleChange(tr) {
-        return tr.changes.touchesRange(cur(tr.startState)) ? new ActiveSource(this.source, 0 /* Inactive */, false) : this;
+        return tr.changes.touchesRange(cur(tr.startState)) ? new ActiveSource(this.source, 0 /* Inactive */) : this.map(tr.changes);
+    }
+    map(changes) {
+        return changes.empty || this.explicitPos < 0 ? this : new ActiveSource(this.source, this.state, changes.mapPos(this.explicitPos));
     }
 }
 class ActiveResult extends ActiveSource {
-    constructor(source, explicit, result, from, to, span) {
-        super(source, 2 /* Result */, explicit);
+    constructor(source, explicitPos, result, from, to, span) {
+        super(source, 2 /* Result */, explicitPos);
         this.result = result;
         this.from = from;
         this.to = to;
@@ -753,25 +775,25 @@ class ActiveResult extends ActiveSource {
     handleUserEvent(tr, type, conf) {
         let from = tr.changes.mapPos(this.from), to = tr.changes.mapPos(this.to, 1);
         let pos = cur(tr.state);
-        if ((this.explicit ? pos < from : pos <= from) || pos > to)
-            return new ActiveSource(this.source, type == "input" && conf.activateOnTyping ? 1 /* Pending */ : 0 /* Inactive */, false);
+        if ((this.explicitPos > -1 ? pos < from : pos <= from) || pos > to)
+            return new ActiveSource(this.source, type == "input" && conf.activateOnTyping ? 1 /* Pending */ : 0 /* Inactive */);
+        let explicitPos = this.explicitPos < 0 ? -1 : tr.changes.mapPos(this.explicitPos);
         if (this.span && (from == to || this.span.test(tr.state.sliceDoc(from, to))))
-            return new ActiveResult(this.source, this.explicit, this.result, from, to, this.span);
-        return new ActiveSource(this.source, 1 /* Pending */, this.explicit);
+            return new ActiveResult(this.source, explicitPos, this.result, from, to, this.span);
+        return new ActiveSource(this.source, 1 /* Pending */, explicitPos);
     }
     handleChange(tr) {
-        return tr.changes.touchesRange(this.from, this.to)
-            ? new ActiveSource(this.source, 0 /* Inactive */, false)
-            : new ActiveResult(this.source, this.explicit, this.result, tr.changes.mapPos(this.from), tr.changes.mapPos(this.to, 1), this.span);
+        return tr.changes.touchesRange(this.from, this.to) ? new ActiveSource(this.source, 0 /* Inactive */) : this.map(tr.changes);
     }
     map(mapping) {
-        return new ActiveResult(this.source, this.explicit, this.result, mapping.mapPos(this.from), mapping.mapPos(this.to, 1), this.span);
+        return mapping.empty ? this :
+            new ActiveResult(this.source, this.explicitPos < 0 ? -1 : mapping.mapPos(this.explicitPos), this.result, mapping.mapPos(this.from), mapping.mapPos(this.to, 1), this.span);
     }
 }
 const startCompletionEffect = state.StateEffect.define();
 const closeCompletionEffect = state.StateEffect.define();
 const setActiveEffect = state.StateEffect.define({
-    map(sources, mapping) { return sources.map(s => s.hasResult() && !mapping.empty ? s.map(mapping) : s); }
+    map(sources, mapping) { return sources.map(s => s.map(mapping)); }
 });
 const setSelectedEffect = state.StateEffect.define();
 const completionState = state.StateField.define({
@@ -836,8 +858,8 @@ const closeCompletion = (view) => {
     return true;
 };
 class RunningQuery {
-    constructor(source, context) {
-        this.source = source;
+    constructor(active, context) {
+        this.active = active;
         this.context = context;
         this.time = Date.now();
         this.updates = [];
@@ -887,7 +909,7 @@ const completionPlugin = view.ViewPlugin.fromClass(class {
         }
         if (this.debounceUpdate > -1)
             clearTimeout(this.debounceUpdate);
-        this.debounceUpdate = cState.active.some(a => a.state == 1 /* Pending */ && !this.running.some(q => q.source == a.source))
+        this.debounceUpdate = cState.active.some(a => a.state == 1 /* Pending */ && !this.running.some(q => q.active.source == a.source))
             ? setTimeout(() => this.startUpdate(), DebounceTime) : -1;
         if (this.composing != 0 /* None */)
             for (let tr of update.transactions) {
@@ -901,14 +923,14 @@ const completionPlugin = view.ViewPlugin.fromClass(class {
         this.debounceUpdate = -1;
         let { state } = this.view, cState = state.field(completionState);
         for (let active of cState.active) {
-            if (active.state == 1 /* Pending */ && !this.running.some(r => r.source == active.source))
+            if (active.state == 1 /* Pending */ && !this.running.some(r => r.active.source == active.source))
                 this.startQuery(active);
         }
     }
     startQuery(active) {
         let { state } = this.view, pos = cur(state);
-        let context = new CompletionContext(state, pos, active.explicit);
-        let pending = new RunningQuery(active.source, context);
+        let context = new CompletionContext(state, pos, active.explicitPos == pos);
+        let pending = new RunningQuery(active, context);
         this.running.push(pending);
         Promise.resolve(active.source(context)).then(result => {
             if (!pending.context.aborted) {
@@ -941,7 +963,7 @@ const completionPlugin = view.ViewPlugin.fromClass(class {
                 continue;
             this.running.splice(i--, 1);
             if (query.done) {
-                let active = new ActiveResult(query.source, query.context.explicit, query.done, query.done.from, (_a = query.done.to) !== null && _a !== void 0 ? _a : cur(query.updates.length ? query.updates[0].startState : this.view.state), query.done.span ? ensureAnchor(query.done.span, true) : null);
+                let active = new ActiveResult(query.active.source, query.active.explicitPos, query.done, query.done.from, (_a = query.done.to) !== null && _a !== void 0 ? _a : cur(query.updates.length ? query.updates[0].startState : this.view.state), query.done.span && query.done.filter !== false ? ensureAnchor(query.done.span, true) : null);
                 // Replay the transactions that happened since the start of
                 // the request and see if that preserves the result
                 for (let tr of query.updates)
@@ -951,12 +973,12 @@ const completionPlugin = view.ViewPlugin.fromClass(class {
                     continue;
                 }
             }
-            let current = this.view.state.field(completionState).active.find(a => a.source == query.source);
+            let current = this.view.state.field(completionState).active.find(a => a.source == query.active.source);
             if (current && current.state == 1 /* Pending */) {
                 if (query.done == null) {
                     // Explicitly failed. Should clear the pending status if it
                     // hasn't been re-set in the meantime.
-                    let active = new ActiveSource(query.source, 0 /* Inactive */, false);
+                    let active = new ActiveSource(query.active.source, 0 /* Inactive */);
                     for (let tr of query.updates)
                         active = active.update(tr, conf);
                     if (active.state != 1 /* Pending */)
@@ -1034,7 +1056,7 @@ class Snippet {
             while (m = /[#$]\{(?:(\d+)(?::([^}]*))?|([^}]*))\}/.exec(line)) {
                 let seq = m[1] ? +m[1] : null, name = m[2] || m[3], found = -1;
                 for (let i = 0; i < fields.length; i++) {
-                    if (name ? fields[i].name == name : seq != null && fields[i].seq == seq)
+                    if (seq != null ? fields[i].seq == seq : name ? fields[i].name == name : false)
                         found = i;
                 }
                 if (found < 0) {
@@ -1043,6 +1065,9 @@ class Snippet {
                         i++;
                     fields.splice(i, 0, { seq, name: name || null });
                     found = i;
+                    for (let pos of positions)
+                        if (pos.field >= found)
+                            pos.field++;
                 }
                 positions.push(new FieldPos(found, lines.length, m.index, m.index + name.length));
                 line = line.slice(0, m.index) + name + line.slice(m.index + m[0].length);
@@ -1131,9 +1156,11 @@ function snippet(template) {
         if (ranges.length)
             spec.selection = fieldSelection(ranges, 0);
         if (ranges.length > 1) {
-            let effects = spec.effects = [setActive.of(new ActiveSnippet(ranges, 0))];
+            let active = new ActiveSnippet(ranges, 0);
+            let effects = spec.effects = [setActive.of(active)];
             if (editor.state.field(snippetState, false) === undefined)
-                effects.push(state.StateEffect.appendConfig.of([snippetState, addSnippetKeymap, snippetPointerHandler, baseTheme]));
+                effects.push(state.StateEffect.appendConfig.of([snippetState.init(() => active), addSnippetKeymap,
+                    snippetPointerHandler, baseTheme]));
         }
         editor.dispatch(editor.state.update(spec));
     };
@@ -1309,6 +1336,7 @@ exports.completeFromList = completeFromList;
 exports.completionKeymap = completionKeymap;
 exports.completionStatus = completionStatus;
 exports.currentCompletions = currentCompletions;
+exports.ifIn = ifIn;
 exports.ifNotIn = ifNotIn;
 exports.moveCompletionSelection = moveCompletionSelection;
 exports.nextSnippetField = nextSnippetField;

package/dist/index.d.ts

@@ -1,6 +1,5 @@
 import { EditorState, Transaction, StateCommand, Facet, Extension } from '@codemirror/state';
 import { EditorView, KeyBinding, Command } from '@codemirror/view';
-import { NodeType } from 'lezer-tree';
 
 interface CompletionConfig {
     /**
@@ -66,6 +65,8 @@ interface Completion {
     library defines simple icons for `class`, `constant`, `enum`,
     `function`, `interface`, `keyword`, `method`, `namespace`,
     `property`, `text`, `type`, and `variable`.
+    
+    Multiple types can be provided by separating them with spaces.
     */
     type?: string;
     /**
@@ -121,10 +122,10 @@ declare class CompletionContext {
     token before `this.pos`.
     */
     tokenBefore(types: readonly string[]): {
-        from: number;
+        from: any;
         to: number;
         text: string;
-        type: NodeType;
+        type: any;
     } | null;
     /**
     Get the match of the given expression directly before the
@@ -153,6 +154,11 @@ completes them.
 */
 declare function completeFromList(list: readonly (string | Completion)[]): CompletionSource;
 /**
+Wrap the given completion source so that it will only fire when the
+cursor is in a syntax node with one of the given names.
+*/
+declare function ifIn(nodes: readonly string[], source: CompletionSource): CompletionSource;
+/**
 Wrap the given completion source so that it will not fire when the
 cursor is in a syntax node with one of the given names.
 */
@@ -193,6 +199,15 @@ interface CompletionResult {
     list to be updated synchronously.
     */
     span?: RegExp;
+    /**
+    By default, the library filters and scores completions. Set
+    `filter` to `false` to disable this, and cause your completions
+    to all be included, in the order they were given. When there are
+    other sources, unfiltered completions appear at the top of the
+    list of completions. `span` must not be given `filter` is
+    `false`, because it only works when filtering.
+    */
+    filter?: boolean;
 }
 
 /**
@@ -304,4 +319,4 @@ Returns the available completions as an array.
 */
 declare function currentCompletions(state: EditorState): readonly Completion[];
 
-export { Completion, CompletionContext, CompletionResult, CompletionSource, acceptCompletion, autocompletion, clearSnippet, closeCompletion, completeAnyWord, completeFromList, completionKeymap, completionStatus, currentCompletions, ifNotIn, moveCompletionSelection, nextSnippetField, prevSnippetField, snippet, snippetCompletion, snippetKeymap, startCompletion };
+export { Completion, CompletionContext, CompletionResult, CompletionSource, acceptCompletion, autocompletion, clearSnippet, closeCompletion, completeAnyWord, completeFromList, completionKeymap, completionStatus, currentCompletions, ifIn, ifNotIn, moveCompletionSelection, nextSnippetField, prevSnippetField, snippet, snippetCompletion, snippetKeymap, startCompletion };

package/dist/index.js

@@ -105,6 +105,18 @@ function completeFromList(list) {
     };
 }
 /**
+Wrap the given completion source so that it will only fire when the
+cursor is in a syntax node with one of the given names.
+*/
+function ifIn(nodes, source) {
+    return (context) => {
+        for (let pos = syntaxTree(context.state).resolve(context.pos, -1); pos; pos = pos.parent)
+            if (nodes.indexOf(pos.name) > -1)
+                return source(context);
+        return null;
+    };
+}
+/**
 Wrap the given completion source so that it will not fire when the
 cursor is in a syntax node with one of the given names.
 */
@@ -402,7 +414,7 @@ function createListBox(options, id, range) {
         let icon = li.appendChild(document.createElement("div"));
         icon.classList.add("cm-completionIcon");
         if (completion.type)
-            icon.classList.add("cm-completionIcon-" + completion.type);
+            icon.classList.add(...completion.type.split(/\s+/g).map(cls => "cm-completionIcon-" + cls));
         icon.setAttribute("aria-hidden", "true");
         let labelElt = li.appendChild(document.createElement("span"));
         labelElt.className = "cm-completionLabel";
@@ -584,16 +596,22 @@ function score(option) {
         (option.type ? 1 : 0);
 }
 function sortOptions(active, state) {
-    let options = [];
+    let options = [], i = 0;
     for (let a of active)
         if (a.hasResult()) {
-            let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to)), match;
-            for (let option of a.result.options)
-                if (match = matcher.match(option.label)) {
-                    if (option.boost != null)
-                        match[0] += option.boost;
-                    options.push(new Option(option, a, match));
-                }
+            if (a.result.filter === false) {
+                for (let option of a.result.options)
+                    options.push(new Option(option, a, [1e9 - i++]));
+            }
+            else {
+                let matcher = new FuzzyMatcher(state.sliceDoc(a.from, a.to)), match;
+                for (let option of a.result.options)
+                    if (match = matcher.match(option.label)) {
+                        if (option.boost != null)
+                            match[0] += option.boost;
+                        options.push(new Option(option, a, match));
+                    }
+            }
         }
     options.sort(cmpOption);
     let result = [], prev = null;
@@ -655,7 +673,8 @@ class CompletionState {
         let sources = conf.override ||
             state.languageDataAt("autocomplete", cur(state)).map(asSource);
         let active = sources.map(source => {
-            let value = this.active.find(s => s.source == source) || new ActiveSource(source, 0 /* Inactive */, false);
+            let value = this.active.find(s => s.source == source) ||
+                new ActiveSource(source, this.active.some(a => a.state != 0 /* Inactive */) ? 1 /* Pending */ : 0 /* Inactive */);
             return value.update(tr, conf);
         });
         if (active.length == this.active.length && active.every((a, i) => a == this.active[i]))
@@ -664,7 +683,7 @@ class CompletionState {
             !sameResults(active, this.active) ? CompletionDialog.build(active, state, this.id, this.open)
             : this.open && tr.docChanged ? this.open.map(tr.changes) : this.open;
         if (!open && active.every(a => a.state != 1 /* Pending */) && active.some(a => a.hasResult()))
-            active = active.map(a => a.hasResult() ? new ActiveSource(a.source, 0 /* Inactive */, false) : a);
+            active = active.map(a => a.hasResult() ? new ActiveSource(a.source, 0 /* Inactive */) : a);
         for (let effect of tr.effects)
             if (effect.is(setSelectedEffect))
                 open = open && open.setSelected(effect.value, this.id);
@@ -704,10 +723,10 @@ function cmpOption(a, b) {
     return lA < lB ? -1 : lA == lB ? 0 : 1;
 }
 class ActiveSource {
-    constructor(source, state, explicit) {
+    constructor(source, state, explicitPos = -1) {
         this.source = source;
         this.state = state;
-        this.explicit = explicit;
+        this.explicitPos = explicitPos;
     }
     hasResult() { return false; }
     update(tr, conf) {
@@ -717,12 +736,12 @@ class ActiveSource {
         else if (tr.docChanged)
             value = value.handleChange(tr);
         else if (tr.selection && value.state != 0 /* Inactive */)
-            value = new ActiveSource(value.source, 0 /* Inactive */, false);
+            value = new ActiveSource(value.source, 0 /* Inactive */);
         for (let effect of tr.effects) {
             if (effect.is(startCompletionEffect))
-                value = new ActiveSource(value.source, 1 /* Pending */, effect.value);
+                value = new ActiveSource(value.source, 1 /* Pending */, effect.value ? cur(tr.state) : -1);
             else if (effect.is(closeCompletionEffect))
-                value = new ActiveSource(value.source, 0 /* Inactive */, false);
+                value = new ActiveSource(value.source, 0 /* Inactive */);
             else if (effect.is(setActiveEffect))
                 for (let active of effect.value)
                     if (active.source == value.source)
@@ -730,16 +749,19 @@ class ActiveSource {
         }
         return value;
     }
-    handleUserEvent(_tr, type, conf) {
-        return type == "delete" || !conf.activateOnTyping ? this : new ActiveSource(this.source, 1 /* Pending */, false);
+    handleUserEvent(tr, type, conf) {
+        return type == "delete" || !conf.activateOnTyping ? this.map(tr.changes) : new ActiveSource(this.source, 1 /* Pending */);
     }
     handleChange(tr) {
-        return tr.changes.touchesRange(cur(tr.startState)) ? new ActiveSource(this.source, 0 /* Inactive */, false) : this;
+        return tr.changes.touchesRange(cur(tr.startState)) ? new ActiveSource(this.source, 0 /* Inactive */) : this.map(tr.changes);
+    }
+    map(changes) {
+        return changes.empty || this.explicitPos < 0 ? this : new ActiveSource(this.source, this.state, changes.mapPos(this.explicitPos));
     }
 }
 class ActiveResult extends ActiveSource {
-    constructor(source, explicit, result, from, to, span) {
-        super(source, 2 /* Result */, explicit);
+    constructor(source, explicitPos, result, from, to, span) {
+        super(source, 2 /* Result */, explicitPos);
         this.result = result;
         this.from = from;
         this.to = to;
@@ -749,25 +771,25 @@ class ActiveResult extends ActiveSource {
     handleUserEvent(tr, type, conf) {
         let from = tr.changes.mapPos(this.from), to = tr.changes.mapPos(this.to, 1);
         let pos = cur(tr.state);
-        if ((this.explicit ? pos < from : pos <= from) || pos > to)
-            return new ActiveSource(this.source, type == "input" && conf.activateOnTyping ? 1 /* Pending */ : 0 /* Inactive */, false);
+        if ((this.explicitPos > -1 ? pos < from : pos <= from) || pos > to)
+            return new ActiveSource(this.source, type == "input" && conf.activateOnTyping ? 1 /* Pending */ : 0 /* Inactive */);
+        let explicitPos = this.explicitPos < 0 ? -1 : tr.changes.mapPos(this.explicitPos);
         if (this.span && (from == to || this.span.test(tr.state.sliceDoc(from, to))))
-            return new ActiveResult(this.source, this.explicit, this.result, from, to, this.span);
-        return new ActiveSource(this.source, 1 /* Pending */, this.explicit);
+            return new ActiveResult(this.source, explicitPos, this.result, from, to, this.span);
+        return new ActiveSource(this.source, 1 /* Pending */, explicitPos);
     }
     handleChange(tr) {
-        return tr.changes.touchesRange(this.from, this.to)
-            ? new ActiveSource(this.source, 0 /* Inactive */, false)
-            : new ActiveResult(this.source, this.explicit, this.result, tr.changes.mapPos(this.from), tr.changes.mapPos(this.to, 1), this.span);
+        return tr.changes.touchesRange(this.from, this.to) ? new ActiveSource(this.source, 0 /* Inactive */) : this.map(tr.changes);
     }
     map(mapping) {
-        return new ActiveResult(this.source, this.explicit, this.result, mapping.mapPos(this.from), mapping.mapPos(this.to, 1), this.span);
+        return mapping.empty ? this :
+            new ActiveResult(this.source, this.explicitPos < 0 ? -1 : mapping.mapPos(this.explicitPos), this.result, mapping.mapPos(this.from), mapping.mapPos(this.to, 1), this.span);
     }
 }
 const startCompletionEffect = /*@__PURE__*/StateEffect.define();
 const closeCompletionEffect = /*@__PURE__*/StateEffect.define();
 const setActiveEffect = /*@__PURE__*/StateEffect.define({
-    map(sources, mapping) { return sources.map(s => s.hasResult() && !mapping.empty ? s.map(mapping) : s); }
+    map(sources, mapping) { return sources.map(s => s.map(mapping)); }
 });
 const setSelectedEffect = /*@__PURE__*/StateEffect.define();
 const completionState = /*@__PURE__*/StateField.define({
@@ -832,8 +854,8 @@ const closeCompletion = (view) => {
     return true;
 };
 class RunningQuery {
-    constructor(source, context) {
-        this.source = source;
+    constructor(active, context) {
+        this.active = active;
         this.context = context;
         this.time = Date.now();
         this.updates = [];
@@ -883,7 +905,7 @@ const completionPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         }
         if (this.debounceUpdate > -1)
             clearTimeout(this.debounceUpdate);
-        this.debounceUpdate = cState.active.some(a => a.state == 1 /* Pending */ && !this.running.some(q => q.source == a.source))
+        this.debounceUpdate = cState.active.some(a => a.state == 1 /* Pending */ && !this.running.some(q => q.active.source == a.source))
             ? setTimeout(() => this.startUpdate(), DebounceTime) : -1;
         if (this.composing != 0 /* None */)
             for (let tr of update.transactions) {
@@ -897,14 +919,14 @@ const completionPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
         this.debounceUpdate = -1;
         let { state } = this.view, cState = state.field(completionState);
         for (let active of cState.active) {
-            if (active.state == 1 /* Pending */ && !this.running.some(r => r.source == active.source))
+            if (active.state == 1 /* Pending */ && !this.running.some(r => r.active.source == active.source))
                 this.startQuery(active);
         }
     }
     startQuery(active) {
         let { state } = this.view, pos = cur(state);
-        let context = new CompletionContext(state, pos, active.explicit);
-        let pending = new RunningQuery(active.source, context);
+        let context = new CompletionContext(state, pos, active.explicitPos == pos);
+        let pending = new RunningQuery(active, context);
         this.running.push(pending);
         Promise.resolve(active.source(context)).then(result => {
             if (!pending.context.aborted) {
@@ -937,7 +959,7 @@ const completionPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
                 continue;
             this.running.splice(i--, 1);
             if (query.done) {
-                let active = new ActiveResult(query.source, query.context.explicit, query.done, query.done.from, (_a = query.done.to) !== null && _a !== void 0 ? _a : cur(query.updates.length ? query.updates[0].startState : this.view.state), query.done.span ? ensureAnchor(query.done.span, true) : null);
+                let active = new ActiveResult(query.active.source, query.active.explicitPos, query.done, query.done.from, (_a = query.done.to) !== null && _a !== void 0 ? _a : cur(query.updates.length ? query.updates[0].startState : this.view.state), query.done.span && query.done.filter !== false ? ensureAnchor(query.done.span, true) : null);
                 // Replay the transactions that happened since the start of
                 // the request and see if that preserves the result
                 for (let tr of query.updates)
@@ -947,12 +969,12 @@ const completionPlugin = /*@__PURE__*/ViewPlugin.fromClass(class {
                     continue;
                 }
             }
-            let current = this.view.state.field(completionState).active.find(a => a.source == query.source);
+            let current = this.view.state.field(completionState).active.find(a => a.source == query.active.source);
             if (current && current.state == 1 /* Pending */) {
                 if (query.done == null) {
                     // Explicitly failed. Should clear the pending status if it
                     // hasn't been re-set in the meantime.
-                    let active = new ActiveSource(query.source, 0 /* Inactive */, false);
+                    let active = new ActiveSource(query.active.source, 0 /* Inactive */);
                     for (let tr of query.updates)
                         active = active.update(tr, conf);
                     if (active.state != 1 /* Pending */)
@@ -1030,7 +1052,7 @@ class Snippet {
             while (m = /[#$]\{(?:(\d+)(?::([^}]*))?|([^}]*))\}/.exec(line)) {
                 let seq = m[1] ? +m[1] : null, name = m[2] || m[3], found = -1;
                 for (let i = 0; i < fields.length; i++) {
-                    if (name ? fields[i].name == name : seq != null && fields[i].seq == seq)
+                    if (seq != null ? fields[i].seq == seq : name ? fields[i].name == name : false)
                         found = i;
                 }
                 if (found < 0) {
@@ -1039,6 +1061,9 @@ class Snippet {
                         i++;
                     fields.splice(i, 0, { seq, name: name || null });
                     found = i;
+                    for (let pos of positions)
+                        if (pos.field >= found)
+                            pos.field++;
                 }
                 positions.push(new FieldPos(found, lines.length, m.index, m.index + name.length));
                 line = line.slice(0, m.index) + name + line.slice(m.index + m[0].length);
@@ -1127,9 +1152,11 @@ function snippet(template) {
         if (ranges.length)
             spec.selection = fieldSelection(ranges, 0);
         if (ranges.length > 1) {
-            let effects = spec.effects = [setActive.of(new ActiveSnippet(ranges, 0))];
+            let active = new ActiveSnippet(ranges, 0);
+            let effects = spec.effects = [setActive.of(active)];
             if (editor.state.field(snippetState, false) === undefined)
-                effects.push(StateEffect.appendConfig.of([snippetState, addSnippetKeymap, snippetPointerHandler, baseTheme]));
+                effects.push(StateEffect.appendConfig.of([snippetState.init(() => active), addSnippetKeymap,
+                    snippetPointerHandler, baseTheme]));
         }
         editor.dispatch(editor.state.update(spec));
     };
@@ -1295,4 +1322,4 @@ function currentCompletions(state) {
     return open ? open.options.map(o => o.completion) : [];
 }
 
-export { CompletionContext, acceptCompletion, autocompletion, clearSnippet, closeCompletion, completeAnyWord, completeFromList, completionKeymap, completionStatus, currentCompletions, ifNotIn, moveCompletionSelection, nextSnippetField, prevSnippetField, snippet, snippetCompletion, snippetKeymap, startCompletion };
+export { CompletionContext, acceptCompletion, autocompletion, clearSnippet, closeCompletion, completeAnyWord, completeFromList, completionKeymap, completionStatus, currentCompletions, ifIn, ifNotIn, moveCompletionSelection, nextSnippetField, prevSnippetField, snippet, snippetCompletion, snippetKeymap, startCompletion };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@codemirror/autocomplete",
-  "version": "0.18.4",
+  "version": "0.18.8",
   "description": "Autocompletion for the CodeMirror code editor",
   "scripts": {
-    "test": "echo 'Test runner in wrapper package'",
+    "test": "cm-runtests",
     "prepare": "cm-buildhelper src/index.ts"
   },
   "keywords": [
@@ -34,10 +34,7 @@
     "lezer-tree": "^0.13.0"
   },
   "devDependencies": {
-    "@codemirror/buildhelper": "^0.1.0",
-    "@types/mocha": "^5.2.0",
-    "ist": "^1.1.6",
-    "mocha": "^7.1.1"
+    "@codemirror/buildhelper": "^0.1.5"
   },
   "repository": {
     "type": "git",