@willbooster/tree-sitter-ruby 6.0.5 → 8.0.0

package/README.md

@@ -5,7 +5,7 @@
 [![Test](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test.yml)
 [![Test rust](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test-rust.yml/badge.svg)](https://github.com/WillBooster/tree-sitter-ruby/actions/workflows/test-rust.yml)
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
-[![wbfy](https://img.shields.io/badge/wbfy-20.48.9-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
+[![wbfy](https://img.shields.io/badge/wbfy-21.3.0-1e90ff.svg)](https://github.com/WillBooster/shared/tree/main/packages/wbfy)
 [![crates.io](https://img.shields.io/crates/v/willbooster-tree-sitter-ruby.svg)](https://crates.io/crates/willbooster-tree-sitter-ruby)
 
 Ruby grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter), forked from
@@ -20,6 +20,13 @@ The scanner preserves long heredoc identifiers
 when their state fits the runtime's serialization buffer. If the open heredocs cannot fit, their bodies are parsed as
 code instead of aborting the process.
 
+## Support Scope
+
+This fork maintains only full parsing: valid input yields a correct tree, and invalid input yields `ERROR` or `MISSING`
+nodes without crashing, hanging, or taking more than linear time. Incremental parsing works as in upstream tree-sitter
+but is not tested here, and no queries (highlights, locals, injections, tags) are shipped. Node types, field names, and
+the trees that error recovery produces may change; such changes are released as new major versions.
+
 ## Usage
 
 The npm package ships `tree-sitter-ruby.wasm` for
@@ -64,16 +71,15 @@ const parser = new Parser();
 parser.setLanguage(await Language.load(ruby));
 ```
 
-The package also ships the queries in `queries/` and the node types in `src/node-types.json`.
+The package also ships the node types in `src/node-types.json`.
 
 In Rust, depend on the [crate](https://crates.io/crates/willbooster-tree-sitter-ruby) and on
 [willbooster-tree-sitter](https://crates.io/crates/willbooster-tree-sitter), the runtime this package is tested and
 fuzzed with. The parser requires runtime 15.x:
 
-```toml
-[dependencies]
-tree-sitter = { package = "willbooster-tree-sitter", version = "15.0.0" }
-tree-sitter-ruby = { package = "willbooster-tree-sitter-ruby", version = "6" }
+```sh
+cargo add willbooster-tree-sitter@15.0.0 --rename tree-sitter
+cargo add willbooster-tree-sitter-ruby --rename tree-sitter-ruby
 ```
 
 ```rust
@@ -108,11 +114,8 @@ Profiles in `.tmp/generation-profiles/` are temporary and must not be committed.
 `bun run test` runs:
 
 - the corpus in `test/corpus`, with the native build and with the Wasm build (the first run downloads the WASI SDK);
-- an incremental-parsing check (`test/unit/incremental.test.ts`): `script/fuzz-corpus` runs `tree-sitter fuzz`, which
-  edits each corpus case at random, reparses it, undoes the edits, and reparses again. `TREE_SITTER_SEED`,
-  `TREE_SITTER_ITERATIONS`, and `TREE_SITTER_EDITS` run other or more edits;
-- included-range comment and incremental-edit checks (`test/unit/includedRanges.test.ts`), which load the Wasm build
-  produced by `bun run build/ci`;
+- included-range comment checks (`test/unit/includedRanges.test.ts`), which load the Wasm build produced by
+  `bun run build/ci`;
 - a check that the real-world Ruby files of [ruby/spec](https://github.com/ruby/spec) cloned into `examples/` fail to
   parse exactly as listed in `script/known-failures.txt`. The first run clones the repository, which is pinned to a
   commit in `script/parse-examples`. After a grammar change or a moved pin alters that list, `script/parse-examples`
@@ -123,7 +126,7 @@ Profiles in `.tmp/generation-profiles/` are temporary and must not be committed.
   Node.js compatibility (`test/unit/workerd.test.ts`). Run `bun run test/ci-setup` once to install Chromium.
 
 The tests and `script/parse-examples` compile the parser into `.tmp/tree-sitter-lib` rather than the CLI's cache shared
-by every checkout; `script/fuzz-corpus` builds a per-run parser in `.tmp/fuzz` and deletes it afterwards.
+by every checkout.
 
 CI also runs these tests on Linux arm64 and macOS, where the Rust binding compiles the parser natively, and fuzzes the
 parser with libFuzzer and sanitizers (`.github/workflows/robustness.yml`).

package/grammar.js

@@ -94,6 +94,7 @@ module.exports = grammar({
     $._heredoc_resume,
     $._body_comment,
     $._body_line_break,
+    $._end_of_source,
   ],
 
   extras: ($) => [$.comment, $.heredoc_body, $._heredoc_resume, /\s/, /\\\r?\n/],
@@ -228,7 +229,7 @@ module.exports = grammar({
   ],
 
   rules: {
-    program: ($) => seq(optional($._statements), optional(choice(seq(/__END__/, $.uninterpreted)))),
+    program: ($) => seq(optional($._statements), optional(seq(alias($._end_of_source, '__END__'), $.uninterpreted))),
 
     // External extras must yield to the internal lexer after __END__.
     uninterpreted: ($) => choice(/(.|\s)*/, $._uninterpreted),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@willbooster/tree-sitter-ruby",
-  "version": "6.0.5",
+  "version": "8.0.0",
   "description": "Ruby grammar for tree-sitter",
   "keywords": [
     "incremental",
@@ -16,7 +16,6 @@
   },
   "files": [
     "grammar.js",
-    "queries/*.scm",
     "tree-sitter.json",
     "src/node-types.json",
     "*.wasm"
@@ -46,20 +45,20 @@
   },
   "devDependencies": {
     "@tsconfig/bun": "1.0.11",
-    "@types/bun": "1.4.3",
+    "@types/bun": "1.4.4",
     "@vitest/browser-playwright": "5.0.5",
     "@willbooster/oxlint-config": "1.4.9",
-    "@willbooster/wb": "22.29.3",
+    "@willbooster/wb": "23.0.2",
     "@willbooster/web-tree-sitter": "15.0.0",
     "conventional-changelog-conventionalcommits": "10.4.1",
     "lefthook": "2.2.2",
-    "oxlint": "1.88.0",
-    "oxlint-tsgolint": "7.0.2004",
+    "oxlint": "1.89.0",
+    "oxlint-tsgolint": "7.0.2005",
     "playwright": "1.64.1",
     "semantic-release": "25.0.9",
-    "vite": "8.3.4",
+    "vite": "8.3.5",
     "vitest": "5.0.5",
-    "wrangler": "4.151.1"
+    "wrangler": "4.152.0"
   },
   "peerDependencies": {
     "@willbooster/web-tree-sitter": "^15.0.0"

package/src/node-types.json

@@ -4112,6 +4112,10 @@
     "type": "^=",
     "named": false
   },
+  {
+    "type": "__END__",
+    "named": false
+  },
   {
     "type": "`",
     "named": false

package/tree-sitter.json

@@ -9,17 +9,11 @@
       "file-types": [
         "rb"
       ],
-      "highlights": [
-        "queries/highlights.scm"
-      ],
-      "tags": [
-        "queries/tags.scm"
-      ],
       "injection-regex": "ruby"
     }
   ],
   "metadata": {
-    "version": "6.0.5",
+    "version": "8.0.0",
     "license": "MIT",
     "description": "Ruby grammar for tree-sitter",
     "authors": [

package/queries/highlights.scm

@@ -1,151 +0,0 @@
-(identifier) @variable
-
-((identifier) @function.method
- (#is-not? local))
-
-[
-  "alias"
-  "and"
-  "begin"
-  "break"
-  "case"
-  "class"
-  "def"
-  "do"
-  "else"
-  "elsif"
-  "end"
-  "ensure"
-  "for"
-  "if"
-  "in"
-  "module"
-  "next"
-  "or"
-  "rescue"
-  "retry"
-  "return"
-  "then"
-  "unless"
-  "until"
-  "when"
-  "while"
-  "yield"
-] @keyword
-
-(constant) @constructor
-
-; Function calls
-
-"defined?" @function.method.builtin
-
-(call
-  method: [(identifier) (constant)] @function.method)
-
-((identifier) @function.method.builtin
- (#eq? @function.method.builtin "require"))
-
-; Function definitions
-
-(alias (identifier) @function.method)
-(setter (identifier) @function.method)
-(method name: [(identifier) (constant)] @function.method)
-(singleton_method name: [(identifier) (constant)] @function.method)
-
-; Identifiers
-
-[
-  (class_variable)
-  (instance_variable)
-] @property
-
-((identifier) @constant.builtin
- (#match? @constant.builtin "^__(FILE|LINE|ENCODING)__$"))
-
-(file) @constant.builtin
-(line) @constant.builtin
-(encoding) @constant.builtin
-
-(hash_splat_nil
-  "**" @operator) @constant.builtin
-
-((constant) @constant
- (#match? @constant "^[A-Z\\d_]+$"))
-
-[
-  (self)
-  (super)
-] @variable.builtin
-
-(block_parameter (identifier) @variable.parameter)
-(block_parameters (identifier) @variable.parameter)
-(destructured_parameter (identifier) @variable.parameter)
-(hash_splat_parameter (identifier) @variable.parameter)
-(lambda_parameters (identifier) @variable.parameter)
-(method_parameters (identifier) @variable.parameter)
-(splat_parameter (identifier) @variable.parameter)
-
-(keyword_parameter name: (identifier) @variable.parameter)
-(optional_parameter name: (identifier) @variable.parameter)
-
-; Literals
-
-[
-  (string)
-  (bare_string)
-  (subshell)
-  (heredoc_body)
-  (heredoc_beginning)
-] @string
-
-[
-  (simple_symbol)
-  (delimited_symbol)
-  (hash_key_symbol)
-  (bare_symbol)
-] @string.special.symbol
-
-(regex) @string.special.regex
-(escape_sequence) @escape
-
-[
-  (integer)
-  (float)
-] @number
-
-[
-  (nil)
-  (true)
-  (false)
-] @constant.builtin
-
-(interpolation
-  "#{" @punctuation.special
-  "}" @punctuation.special) @embedded
-
-(comment) @comment
-
-; Operators
-
-[
-"="
-"=>"
-"->"
-] @operator
-
-[
-  ","
-  ";"
-  "."
-] @punctuation.delimiter
-
-[
-  "("
-  ")"
-  "["
-  "]"
-  "{"
-  "}"
-  "%w("
-  "%i("
-] @punctuation.bracket

package/queries/locals.scm

@@ -1,27 +0,0 @@
-((method) @local.scope
- (#set! local.scope-inherits false))
-
-[
-  (lambda)
-  (block)
-  (do_block)
-] @local.scope
-
-(block_parameter (identifier) @local.definition)
-(block_parameters (identifier) @local.definition)
-(destructured_parameter (identifier) @local.definition)
-(hash_splat_parameter (identifier) @local.definition)
-(lambda_parameters (identifier) @local.definition)
-(method_parameters (identifier) @local.definition)
-(splat_parameter (identifier) @local.definition)
-
-(keyword_parameter name: (identifier) @local.definition)
-(optional_parameter name: (identifier) @local.definition)
-
-(identifier) @local.reference
-
-(assignment left: (identifier) @local.definition)
-(operator_assignment left: (identifier) @local.definition)
-(left_assignment_list (identifier) @local.definition)
-(rest_assignment (identifier) @local.definition)
-(destructured_left_assignment (identifier) @local.definition)

package/queries/tags.scm

@@ -1,64 +0,0 @@
-; Method definitions
-
-(
-  (comment)* @doc
-  .
-  [
-    (method
-      name: (_) @name) @definition.method
-    (singleton_method
-      name: (_) @name) @definition.method
-  ]
-  (#strip! @doc "^#\\s*")
-  (#select-adjacent! @doc @definition.method)
-)
-
-(alias
-  name: (_) @name) @definition.method
-
-(setter
-  (identifier) @ignore)
-
-; Class definitions
-
-(
-  (comment)* @doc
-  .
-  [
-    (class
-      name: [
-        (constant) @name
-        (scope_resolution
-          name: (_) @name)
-      ]) @definition.class
-    (singleton_class
-      value: [
-        (constant) @name
-        (scope_resolution
-          name: (_) @name)
-      ]) @definition.class
-  ]
-  (#strip! @doc "^#\\s*")
-  (#select-adjacent! @doc @definition.class)
-)
-
-; Module definitions
-
-(
-  (module
-    name: [
-      (constant) @name
-      (scope_resolution
-        name: (_) @name)
-    ]) @definition.module
-)
-
-; Calls
-
-(call method: (identifier) @name) @reference.call
-
-(
-  [(identifier) (constant)] @name @reference.call
-  (#is-not? local)
-  (#not-match? @name "^(lambda|load|require|require_relative|__FILE__|__LINE__)$")
-)