tree-sitter-kdl 1.0.2 → 1.0.3

package/.github/workflows/ci.yml

@@ -3,7 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - "master"
+      - master
   pull_request:
     branches:
       - "**"

package/.github/workflows/lint.yml

@@ -0,0 +1,19 @@
+name: Lint
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "**"
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install modules
+        run: npm install
+      - name: Run ESLint
+        run: npm run lint

package/.github/workflows/publish.yml

@@ -3,7 +3,7 @@ name: Publish
 on:
   push:
     branches:
-      - main
+      - master
     tags:
       - "v*"
   workflow_dispatch:
@@ -46,6 +46,6 @@ jobs:
           profile: minimal
           toolchain: stable
           override: true
-      - uses: katyo/publish-crates@v1
+      - uses: katyo/publish-crates@v2
         with:
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}

package/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-kdl"
 description = "KDL grammar for tree-sitter"
-version = "1.0.2"
+version = "1.0.3"
 authors = [
 	"Amaan Qureshi <amaanq12@gmail.com>",
 	"Andrew Hlynskyi <ahlincq@gmail.com>",

package/bindings/rust/lib.rs

@@ -11,7 +11,7 @@
 //! ```
 //! let code = "";
 //! let mut parser = tree_sitter::Parser::new();
-//! parser.set_language(tree_sitter_kdl::language()).expect("Error loading kdl grammar");
+//! parser.set_language(tree_sitter_kdl::language()).expect("Error loading KDL grammar");
 //! let tree = parser.parse(code, None).unwrap();
 //! ```
 //!
@@ -36,17 +36,21 @@ pub fn language() -> Language {
 /// The source of the Rust tree-sitter grammar description.
 pub const GRAMMAR: &str = include_str!("../../grammar.js");
 
+/// The folds query for this language.
+pub const FOLDS_QUERY: &str = include_str!("../../queries/folds.scm");
+
 /// The syntax highlighting query for this language.
 pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");
 
+/// The indents query for this language.
+pub const INDENTS_QUERY: &str = include_str!("../../queries/indents.scm");
+
 /// The injection query for this language.
 pub const INJECTIONS_QUERY: &str = include_str!("../../queries/injections.scm");
 
 /// The symbol tagging query for this language.
 pub const LOCALS_QUERY: &str = include_str!("../../queries/locals.scm");
 
-// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
-
 /// The content of the [`node-types.json`][] file for this grammar.
 ///
 /// [`node-types.json`]: https://tree-sitter.github.io/tree-sitter/using-parsers#static-node-types

package/grammar.js

@@ -13,10 +13,6 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
-const PREC = {
-  node: 1,
-};
-
 const ANNOTATION_BUILTINS = [
   'i8',
   'i16',
@@ -66,9 +62,9 @@ module.exports = grammar({
     [$.node_children],
   ],
 
-  extras: $ => [$.multi_line_comment],
+  externals: $ => [$._eof, $.multi_line_comment],
 
-  externals: $ => [$._eof],
+  extras: $ => [$.multi_line_comment],
 
   word: $ => $._normal_bare_identifier,
 
@@ -88,7 +84,7 @@ module.exports = grammar({
       ),
 
     // node := ('/-' node-space*)? type? identifier (node-space+ node-prop-or-arg)* (node-space* node-children ws*)? node-space* node-terminator
-    node: $ => prec(PREC.node,
+    node: $ => prec(1,
       seq(
         alias(optional(seq('/-', repeat($._node_space))), $.node_comment),
         optional($.type),
@@ -141,31 +137,31 @@ module.exports = grammar({
       ),
 
     // _normal_bare_identifier: $ => $.__identifier_char_no_digit_sign,
-    _normal_bare_identifier: () => token(
+    _normal_bare_identifier: _ => token(
       seq(
         /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\p{Emoji}_~!@#\$%\^&\*.:'\|\?&&[^\s\d\/(){}<>;\[\]=,"]]/,
         /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\p{Emoji}\-_~!@#\$%\^&\*.:'\|\?+&&[^\s\/(){}<>;\[\]=,"]]*/,
       ),
     ),
     // identifier-char := unicode - linespace - [\/(){}<>;[]=,"]
-    _identifier_char: () => token(
+    _identifier_char: _ => token(
       /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\-_~!@#\$%\^&\*.:'\|\?+&&[^\s\/(){}<>;\[\]=,"]]/,
     ),
 
     // can't start with a digit
-    __identifier_char_no_digit: () => token(
+    __identifier_char_no_digit: _ => token(
       /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\-_~!@#\$%\^&\*.:'\|\?+&&[^\s\d\/(){}<>;\[\]=,"]]/,
     ),
 
     // can't start with a digit or sign
-    __identifier_char_no_digit_sign: () => token(
+    __identifier_char_no_digit_sign: _ => token(
       /[\u4E00-\u9FFF\p{L}\p{M}\p{N}\-_~!@#\$%\^&\*.:'\|\?&&[^\s\d\+\-\/(){}<>;\[\]=,"]]/,
     ),
 
     // keyword := boolean | 'null'
     keyword: $ => choice($.boolean, 'null'),
     // type annotations
-    annotation_type: () => choice(...ANNOTATION_BUILTINS),
+    annotation_type: _ => choice(...ANNOTATION_BUILTINS),
     // prop := identifier '=' value
     prop: $ => seq($.identifier, '=', $.value),
     // value := type? (string | number | keyword)
@@ -181,18 +177,18 @@ module.exports = grammar({
     // character := '\' escape | [^\"]
     _character: $ => choice($.escape, /[^"]/),
     // escape := ["\\/bfnrt] | 'u{' hex-digit{1, 6} '}'
-    escape: () =>
+    escape: _ =>
       token.immediate(/\\\\|\\"|\\\/|\\b|\\f|\\n|\\r|\\t|\\u\{[0-9a-fA-F]{1,6}\}/),
     // hex-digit := [0-9a-fA-F]
-    _hex_digit: () => /[0-9a-fA-F]/,
+    _hex_digit: _ => /[0-9a-fA-F]/,
 
     // // raw-string := 'r' raw-string-hash
     // raw_string: $ => seq('r', $._raw_string_hash),
     // // raw-string-hash := '#' raw-string-hash '#' | raw-string-quotes
     // _raw_string_hash: $ => choice(seq('#', $._raw_string_hash, '#'), $._raw_string_quotes),
     // // raw-string-quotes := '"' .* '"'
-    // _raw_string_quotes: () => seq('"', /.*/, '"'),
-    _raw_string: () =>
+    // _raw_string_quotes: _ => seq('"', /.*/, '"'),
+    _raw_string: _ =>
       seq(
         choice(
           // raw-string-hash := '#' raw-string-hash '#' | raw-string-quotes
@@ -220,9 +216,9 @@ module.exports = grammar({
     // integer := digit (digit | '_')*
     _integer: $ => seq($._digit, repeat(choice($._digit, '_'))),
     // digit := [0-9]
-    _digit: () => /[0-9]/,
+    _digit: _ => /[0-9]/,
     // sign := '+' | '-'
-    _sign: () => choice('+', '-'),
+    _sign: _ => choice('+', '-'),
 
     // hex := sign? '0x' hex-digit (hex-digit | '_')*
     _hex: $ => seq(optional($._sign), '0x', $._hex_digit, repeat(choice($._hex_digit, '_'))),
@@ -232,7 +228,7 @@ module.exports = grammar({
     _binary: $ => seq(optional($._sign), '0b', choice('0', '1'), repeat(choice('0', '1', '_'))),
 
     // boolean := 'true' | 'false'
-    boolean: () => choice('true', 'false'),
+    boolean: _ => choice('true', 'false'),
 
     // escline := '\\' ws* (single-line-comment | newline)
     _escline: $ => seq('\\', repeat($._ws), choice($.single_line_comment, $._newline)),
@@ -255,13 +251,13 @@ module.exports = grammar({
     // │  PS       Paragraph Separator            U+2029          │
     // ╰──────────────────────────────────────────────────────────╯
     // Note that for the purpose of new lines, CRLF is considered a single newline.
-    _newline: () => choice(/\r'/, /\n/, /\r\n/, /\u0085/, /\u000C/, /\u2028/, /\u2029/),
+    _newline: _ => choice(/\r'/, /\n/, /\r\n/, /\u0085/, /\u000C/, /\u2028/, /\u2029/),
 
     // ws := bom | unicode-space | multi-line-comment
     _ws: $ => choice($._bom, $._unicode_space, $.multi_line_comment),
 
     // bom := '\u{FEFF}'
-    _bom: () => /\u{FEFF}/,
+    _bom: _ => /\u{FEFF}/,
 
     // unicode-space := See Table (All White_Space unicode characters which are not `newline`)
     // Whitespace
@@ -288,24 +284,15 @@ module.exports = grammar({
     // │  Medium Mathematical Space U+205F  │
     // │  Ideographic Space         U+3000  │
     // ╰────────────────────────────────────╯
-    _unicode_space: () =>
+    _unicode_space: _ =>
       /[\u0009\u0020\u00A0\u1680\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000]/,
 
     // single-line-comment := '//' ^newline+ (newline | eof)
     single_line_comment: $ =>
       seq(
         '//',
-        repeat1(/[^\r\n\u0085\u000C\u2028\u2029]/),
+        repeat(/[^\r\n\u0085\u000C\u2028\u2029]/),
         choice($._newline, $._eof),
       ),
-    // multi-line-comment := '/*' commented-block
-    multi_line_comment: $ =>
-      seq('/*', repeat(prec.right(2, choice($.commented_block, /[^*\/]/))), '*/'),
-    // commented-block := '*/' | (multi-line-comment | '*' | '/' | [^*/]+) commented-block
-    commented_block: $ =>
-      prec.right(1, seq(
-        /[^*\/]/,
-        repeat(choice($.multi_line_comment, /[^*\/]/)),
-      )),
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-kdl",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "KDL grammar for tree-sitter",
   "main": "bindings/node",
   "keywords": [

package/queries/highlights.scm

@@ -31,18 +31,21 @@
 
 (number (decimal) @float)
 (number (exponent) @float)
-(number (decimal) (exponent) @float)
 
 (boolean) @boolean
 
-; Misc
-
 "null" @constant.builtin
 
+; Punctuation
+
 ["{" "}"] @punctuation.bracket
 
 ["(" ")"] @punctuation.bracket
 
+[
+  ";"
+] @punctuation.delimiter
+
 ; Comments
 
 [

package/src/grammar.json

@@ -1282,7 +1282,7 @@
           "value": "//"
         },
         {
-          "type": "REPEAT1",
+          "type": "REPEAT",
           "content": {
             "type": "PATTERN",
             "value": "[^\\r\\n\\u0085\\u000C\\u2028\\u2029]"
@@ -1302,68 +1302,6 @@
           ]
         }
       ]
-    },
-    "multi_line_comment": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "/*"
-        },
-        {
-          "type": "REPEAT",
-          "content": {
-            "type": "PREC_RIGHT",
-            "value": 2,
-            "content": {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "commented_block"
-                },
-                {
-                  "type": "PATTERN",
-                  "value": "[^*\\/]"
-                }
-              ]
-            }
-          }
-        },
-        {
-          "type": "STRING",
-          "value": "*/"
-        }
-      ]
-    },
-    "commented_block": {
-      "type": "PREC_RIGHT",
-      "value": 1,
-      "content": {
-        "type": "SEQ",
-        "members": [
-          {
-            "type": "PATTERN",
-            "value": "[^*\\/]"
-          },
-          {
-            "type": "REPEAT",
-            "content": {
-              "type": "CHOICE",
-              "members": [
-                {
-                  "type": "SYMBOL",
-                  "name": "multi_line_comment"
-                },
-                {
-                  "type": "PATTERN",
-                  "value": "[^*\\/]"
-                }
-              ]
-            }
-          }
-        ]
-      }
     }
   },
   "extras": [
@@ -1388,6 +1326,10 @@
     {
       "type": "SYMBOL",
       "name": "_eof"
+    },
+    {
+      "type": "SYMBOL",
+      "name": "multi_line_comment"
     }
   ],
   "inline": [],

package/src/node-types.json

@@ -9,21 +9,6 @@
     "named": true,
     "fields": {}
   },
-  {
-    "type": "commented_block",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "multi_line_comment",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "decimal",
     "named": true,
@@ -87,21 +72,6 @@
       ]
     }
   },
-  {
-    "type": "multi_line_comment",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
-        {
-          "type": "commented_block",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "node",
     "named": true,
@@ -379,10 +349,6 @@
     "type": ")",
     "named": false
   },
-  {
-    "type": "*/",
-    "named": false
-  },
   {
     "type": "+",
     "named": false
@@ -395,10 +361,6 @@
     "type": ".",
     "named": false
   },
-  {
-    "type": "/*",
-    "named": false
-  },
   {
     "type": "//",
     "named": false
@@ -559,6 +521,10 @@
     "type": "isize",
     "named": false
   },
+  {
+    "type": "multi_line_comment",
+    "named": true
+  },
   {
     "type": "node_children_comment",
     "named": true