tree-sitter-kdl 1.0.1 → 1.0.3

package/.gitattributes

@@ -1,4 +1,5 @@
-/src/** linguist-vendored
+/src/parser.c linguist-vendored
+/src/*.json linguist-vendored
 /examples/* linguist-vendored
 
 src/grammar.json -diff

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,16 +1,18 @@
 [package]
 name = "tree-sitter-kdl"
-description = "kdl grammar for the tree-sitter parsing library"
-version = "1.0.1"
+description = "KDL grammar for tree-sitter"
+version = "1.0.3"
 authors = [
 	"Amaan Qureshi <amaanq12@gmail.com>",
 	"Andrew Hlynskyi <ahlincq@gmail.com>",
 ]
+license = "MIT"
+readme = "bindings/rust/README.md"
 keywords = ["incremental", "parsing", "kdl"]
 categories = ["parsing", "text-editors"]
-repository = "https://github.com/tree-sitter/tree-sitter-kdl"
-edition = "2018"
-license = "MIT"
+repository = "https://github.com/amaanq/tree-sitter-kdl"
+edition = "2021"
+autoexamples = false
 
 build = "bindings/rust/build.rs"
 include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]

package/LICENSE

@@ -1,7 +1,21 @@
-Copyright (c) 2023 Amaan Qureshi <amaanq12@gmail.com>
+The MIT License (MIT)
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Copyright (c) 2023 Amaan Qureshi <amaanq12@gmail.com>, Andrew Hlynskyi <ahlincq@gmail.com>
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/Package.swift

@@ -0,0 +1,38 @@
+// swift-tools-version:5.3
+import PackageDescription
+
+let package = Package(
+    name: "TreeSitterKDL",
+    platforms: [.macOS(.v10_13), .iOS(.v11)],
+    products: [
+        .library(name: "TreeSitterKDL", targets: ["TreeSitterKDL"]),
+    ],
+    dependencies: [],
+    targets: [
+        .target(name: "TreeSitterKDL",
+                path: ".",
+                exclude: [
+                    "binding.gyp",
+                    "bindings",
+                    "Cargo.toml",
+                    "test",
+                    "examples",
+                    "grammar.js",
+                    "LICENSE",
+                    "package.json",
+                    "README.md",
+                    "script",
+                    "src/grammar.json",
+                    "src/node-types.json",
+                ],
+                sources: [
+                    "src/parser.c",
+                    "src/scanner.c",
+                ],
+                resources: [
+                    .copy("queries")
+                ],
+                publicHeadersPath: "bindings/swift",
+                cSettings: [.headerSearchPath("src")])
+    ]
+)

package/README.md

@@ -1,6 +1,6 @@
 # tree-sitter-kdl
 
-[![Build Status](https://github.com/amaanq/tree-sitter-kdl/workflows/CI/badge.svg)](https://github.com/amaanq/tree-sitter-kdl/workflows/CI/badge.svg)
+[![Build Status](https://github.com/amaanq/tree-sitter-kdl/actions/workflows/ci.yml/badge.svg)](https://github.com/amaanq/tree-sitter-kdl/actions/workflows/ci.yml)
 [![Discord](https://img.shields.io/discord/1063097320771698699?logo=discord)](https://discord.gg/w7nTvsVJhm)
 
 KDL grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter)

package/bindings/node/binding.cc

@@ -1,10 +1,10 @@
+#include "nan.h"
 #include "tree_sitter/parser.h"
 #include <node.h>
-#include "nan.h"
 
 using namespace v8;
 
-extern "C" TSLanguage * tree_sitter_kdl();
+extern "C" TSLanguage *tree_sitter_kdl();
 
 namespace {
 
@@ -16,13 +16,15 @@ void Init(Local<Object> exports, Local<Object> module) {
   tpl->InstanceTemplate()->SetInternalFieldCount(1);
 
   Local<Function> constructor = Nan::GetFunction(tpl).ToLocalChecked();
-  Local<Object> instance = constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
+  Local<Object> instance =
+      constructor->NewInstance(Nan::GetCurrentContext()).ToLocalChecked();
   Nan::SetInternalFieldPointer(instance, 0, tree_sitter_kdl());
 
-  Nan::Set(instance, Nan::New("name").ToLocalChecked(), Nan::New("kdl").ToLocalChecked());
+  Nan::Set(instance, Nan::New("name").ToLocalChecked(),
+           Nan::New("kdl").ToLocalChecked());
   Nan::Set(module, Nan::New("exports").ToLocalChecked(), instance);
 }
 
 NODE_MODULE(tree_sitter_kdl_binding, Init)
 
-}  // namespace
+} // namespace

package/bindings/node/index.js

@@ -1,19 +1,19 @@
 try {
-  module.exports = require("../../build/Release/tree_sitter_kdl_binding");
+  module.exports = require('../../build/Release/tree_sitter_kdl_binding');
 } catch (error1) {
   if (error1.code !== 'MODULE_NOT_FOUND') {
     throw error1;
   }
   try {
-    module.exports = require("../../build/Debug/tree_sitter_kdl_binding");
+    module.exports = require('../../build/Debug/tree_sitter_kdl_binding');
   } catch (error2) {
     if (error2.code !== 'MODULE_NOT_FOUND') {
       throw error2;
     }
-    throw error1
+    throw error1;
   }
 }
 
 try {
-  module.exports.nodeTypeInfo = require("../../src/node-types.json");
+  module.exports.nodeTypeInfo = require('../../src/node-types.json');
 } catch (_) {}

package/bindings/rust/README.md

@@ -0,0 +1,36 @@
+# tree-sitter-kdl
+
+This crate provides a KDL grammar for the [tree-sitter][] parsing library. To
+use this crate, add it to the `[dependencies]` section of your `Cargo.toml`
+file. (Note that you will probably also need to depend on the
+[`tree-sitter`][tree-sitter crate] crate to use the parsed result in any useful
+way.)
+
+```toml
+[dependencies]
+tree-sitter = "~0.20.3"
+tree-sitter-kdl = "1.0.2"
+```
+
+Typically, you will use the [language][language func] function to add this
+grammar to a tree-sitter [Parser][], and then use the parser to parse some code:
+
+```rust
+let code = r#"
+    fn double(x: i32) -> i32 {
+        x * 2
+    }
+"#;
+let mut parser = Parser::new();
+parser.set_language(tree_sitter_kdl::language()).expect("Error loading KDL grammar");
+let parsed = parser.parse(code, None);
+```
+
+If you have any questions, please reach out to us in the [tree-sitter
+discussions] page.
+
+[language func]: https://docs.rs/tree-sitter-kdl/*/tree_sitter_kdl/fn.language.html
+[parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+[tree-sitter]: https://tree-sitter.github.io/
+[tree-sitter crate]: https://crates.io/crates/tree-sitter
+[tree-sitter discussions]: https://github.com/tree-sitter/tree-sitter/discussions

package/bindings/rust/build.rs

@@ -10,29 +10,10 @@ fn main() {
     let parser_path = src_dir.join("parser.c");
     c_config.file(&parser_path);
 
-    // If your language uses an external scanner written in C,
-    // then include this block of code:
-
     let scanner_path = src_dir.join("scanner.c");
     c_config.file(&scanner_path);
     println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
 
     c_config.compile("parser");
     println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
-
-    // If your language uses an external scanner written in C++,
-    // then include this block of code:
-
-    /*
-    let mut cpp_config = cc::Build::new();
-    cpp_config.cpp(true);
-    cpp_config.include(&src_dir);
-    cpp_config
-        .flag_if_supported("-Wno-unused-parameter")
-        .flag_if_supported("-Wno-unused-but-set-variable");
-    let scanner_path = src_dir.join("scanner.cc");
-    cpp_config.file(&scanner_path);
-    cpp_config.compile("scanner");
-    println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
-    */
 }

package/bindings/rust/lib.rs

@@ -1,4 +1,9 @@
-//! This crate provides kdl language support for the [tree-sitter][] parsing library.
+// ------------------------------------------------------------------------------------------------
+// Copyright © 2023, Amaan Qureshi <amaanq12@gmail.com>, Andrew Hlynskyi <ahlincq@gmail.com>
+// See the LICENSE file in this repo for license details.
+// ------------------------------------------------------------------------------------------------
+
+//! This crate provides KDL language support for the [tree-sitter][] parsing library.
 //!
 //! Typically, you will use the [language][language func] function to add this language to a
 //! tree-sitter [Parser][], and then use the parser to parse some code:
@@ -6,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();
 //! ```
 //!
@@ -28,17 +33,28 @@ pub fn language() -> Language {
     unsafe { tree_sitter_kdl() }
 }
 
+/// 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");
+
 /// 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
-pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
-
-// Uncomment these to include any queries that this grammar contains
-
-// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm");
-// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.scm");
-// pub const LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
-// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
+pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
 
 #[cfg(test)]
 mod tests {
@@ -47,6 +63,6 @@ mod tests {
         let mut parser = tree_sitter::Parser::new();
         parser
             .set_language(super::language())
-            .expect("Error loading kdl language");
+            .expect("Error loading KDL grammar");
     }
 }

package/bindings/swift/kdl.h

@@ -0,0 +1,16 @@
+#ifndef TREE_SITTER_KDL_H_
+#define TREE_SITTER_KDL_H_
+
+typedef struct TSLanguage TSLanguage;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern TSLanguage *tree_sitter_kdl();
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // TREE_SITTER_KDL_H_

package/grammar.js

@@ -2,9 +2,8 @@
  * @file KDL grammar for tree-sitter
  * @author Amaan Qureshi <amaanq12@gmail.com>
  * @license MIT
- * @see {@link https://www.pathofexile.com/item-filter/about|official syntax spec}
- * @see {@link https://pathofexile.fandom.com/wiki/Guide:Item_filter#Syntax|wiki guide}
- * @see {@link https://www.filterblade.xyz/|filter generator}
+ * @see {@link https://kdl.dev|official website}
+ * @see {@link https://github.com/kdl-org/kdl/blob/main/SPEC.md|official syntax spec}
  */
 
 // deno-lint-ignore-file no-control-regex
@@ -14,10 +13,6 @@
 /// <reference types="tree-sitter-cli/dsl" />
 // @ts-check
 
-const PREC = {
-  node: 1,
-};
-
 const ANNOTATION_BUILTINS = [
   'i8',
   'i16',
@@ -67,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,
 
@@ -89,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),
@@ -142,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)
@@ -182,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
@@ -221,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, '_'))),
@@ -233,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)),
@@ -256,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
@@ -289,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.1",
+  "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": [],