@codemirror/autocomplete 6.0.0 → 6.0.3

package/.github/workflows/dispatch.yml

@@ -11,6 +11,6 @@ jobs:
         with:
           # You should create a personal access token and store it in your repository
           token: ${{ secrets.DISPATCH_AUTH }}
-          repo: codemirror.next
+          repo: dev
           owner: codemirror
           event_type: push

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 6.0.3 (2022-07-04)
+
+### Bug fixes
+
+Fix a bug that caused `closeBrackets` to not close quotes when at the end of a syntactic construct that starts with a similar quote.
+
+## 6.0.2 (2022-06-15)
+
+### Bug fixes
+
+Declare package dependencies as peer dependencies as an attempt to avoid duplicated package issues.
+
+## 6.0.1 (2022-06-09)
+
+### Bug fixes
+
+Support escaping `${` or `#{` in snippets.
+
 ## 6.0.0 (2022-06-08)
 
 ### Bug fixes

package/README.md

@@ -1,13 +1,13 @@
 # @codemirror/autocomplete [![NPM version](https://img.shields.io/npm/v/@codemirror/autocomplete.svg)](https://www.npmjs.org/package/@codemirror/autocomplete)
 
-[ [**WEBSITE**](https://codemirror.net/6/) | [**DOCS**](https://codemirror.net/6/docs/ref/#autocomplete) | [**ISSUES**](https://github.com/codemirror/codemirror.next/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md) ]
+[ [**WEBSITE**](https://codemirror.net/) | [**DOCS**](https://codemirror.net/docs/ref/#autocomplete) | [**ISSUES**](https://github.com/codemirror/dev/issues) | [**FORUM**](https://discuss.codemirror.net/c/next/) | [**CHANGELOG**](https://github.com/codemirror/autocomplete/blob/main/CHANGELOG.md) ]
 
 This package implements autocompletion for the
-[CodeMirror](https://codemirror.net/6/) code editor.
+[CodeMirror](https://codemirror.net/) code editor.
 
-The [project page](https://codemirror.net/6/) has more information, a
-number of [examples](https://codemirror.net/6/examples/) and the
-[documentation](https://codemirror.net/6/docs/).
+The [project page](https://codemirror.net/) has more information, a
+number of [examples](https://codemirror.net/examples/) and the
+[documentation](https://codemirror.net/docs/).
 
 This code is released under an
 [MIT license](https://github.com/codemirror/autocomplete/tree/main/LICENSE).

package/dist/index.cjs

@@ -1181,6 +1181,14 @@ class Snippet {
                 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);
             }
+            for (let esc; esc = /([$#])\\{/.exec(line);) {
+                line = line.slice(0, esc.index) + esc[1] + "{" + line.slice(esc.index + esc[0].length);
+                for (let pos of positions)
+                    if (pos.line == lines.length && pos.from > esc.index) {
+                        pos.from--;
+                        pos.to--;
+                    }
+            }
             lines.push(line);
         }
         return new Snippet(lines, positions);
@@ -1264,6 +1272,11 @@ cursor out of the current field deactivates the fields.
 The order of fields defaults to textual order, but you can add
 numbers to placeholders (`${1}` or `${1:defaultText}`) to provide
 a custom order.
+
+To include a literal `${` or `#{` in your template, put a
+backslash after the dollar or hash and before the brace (`$\\{`).
+This will be removed and the sequence will not be interpreted as a
+placeholder.
 */
 function snippet(template) {
     let snippet = Snippet.parse(template);
@@ -1649,10 +1662,18 @@ function nodeStart(state, pos) {
     return tree.parent && tree.from == pos;
 }
 function probablyInString(state, pos, quoteToken) {
+    console.log('check pos', pos);
     let node = language.syntaxTree(state).resolveInner(pos, -1);
     for (let i = 0; i < 5; i++) {
-        if (state.sliceDoc(node.from, node.from + quoteToken.length) == quoteToken)
+        if (state.sliceDoc(node.from, node.from + quoteToken.length) == quoteToken) {
+            let first = node.firstChild;
+            while (first && first.from == node.from && first.to - first.from > quoteToken.length) {
+                if (state.sliceDoc(first.to - quoteToken.length, first.to) == quoteToken)
+                    return false;
+                first = first.firstChild;
+            }
             return true;
+        }
         let parent = node.to == pos && node.parent;
         if (!parent)
             break;

package/dist/index.d.ts

@@ -302,6 +302,11 @@ cursor out of the current field deactivates the fields.
 The order of fields defaults to textual order, but you can add
 numbers to placeholders (`${1}` or `${1:defaultText}`) to provide
 a custom order.
+
+To include a literal `${` or `#{` in your template, put a
+backslash after the dollar or hash and before the brace (`$\\{`).
+This will be removed and the sequence will not be interpreted as a
+placeholder.
 */
 declare function snippet(template: string): (editor: {
     state: EditorState;

package/dist/index.js

@@ -1177,6 +1177,14 @@ class Snippet {
                 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);
             }
+            for (let esc; esc = /([$#])\\{/.exec(line);) {
+                line = line.slice(0, esc.index) + esc[1] + "{" + line.slice(esc.index + esc[0].length);
+                for (let pos of positions)
+                    if (pos.line == lines.length && pos.from > esc.index) {
+                        pos.from--;
+                        pos.to--;
+                    }
+            }
             lines.push(line);
         }
         return new Snippet(lines, positions);
@@ -1260,6 +1268,11 @@ cursor out of the current field deactivates the fields.
 The order of fields defaults to textual order, but you can add
 numbers to placeholders (`${1}` or `${1:defaultText}`) to provide
 a custom order.
+
+To include a literal `${` or `#{` in your template, put a
+backslash after the dollar or hash and before the brace (`$\\{`).
+This will be removed and the sequence will not be interpreted as a
+placeholder.
 */
 function snippet(template) {
     let snippet = Snippet.parse(template);
@@ -1645,10 +1658,18 @@ function nodeStart(state, pos) {
     return tree.parent && tree.from == pos;
 }
 function probablyInString(state, pos, quoteToken) {
+    console.log('check pos', pos);
     let node = syntaxTree(state).resolveInner(pos, -1);
     for (let i = 0; i < 5; i++) {
-        if (state.sliceDoc(node.from, node.from + quoteToken.length) == quoteToken)
+        if (state.sliceDoc(node.from, node.from + quoteToken.length) == quoteToken) {
+            let first = node.firstChild;
+            while (first && first.from == node.from && first.to - first.from > quoteToken.length) {
+                if (state.sliceDoc(first.to - quoteToken.length, first.to) == quoteToken)
+                    return false;
+                first = first.firstChild;
+            }
             return true;
+        }
         let parent = node.to == pos && node.parent;
         if (!parent)
             break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/autocomplete",
-  "version": "6.0.0",
+  "version": "6.0.3",
   "description": "Autocompletion for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",
@@ -31,6 +31,12 @@
     "@codemirror/view": "^6.0.0",
     "@lezer/common": "^1.0.0"
   },
+  "peerDependencies": {
+    "@codemirror/language": "^6.0.0",
+    "@codemirror/state": "^6.0.0",
+    "@codemirror/view": "^6.0.0",
+    "@lezer/common": "^1.0.0"
+  },
   "devDependencies": {
     "@codemirror/buildhelper": "^0.1.5"
   },