tree-sitter-sh 0.15.0 → 0.17.0

package/Cargo.toml

@@ -1,30 +1,32 @@
 [package]
 name = "tree-sitter-sh"
-version = "0.15.0"
+version = "0.17.0"
 edition = "2024"
 description = "Tree-sitter grammar for POSIX sh."
 readme = "README.md"
 repository = "https://github.com/konomanoasa/tree-sitter-sh"
 license = "MIT"
-keywords = ["incremental", "parsing", "sh", "tree-sitter"]
-categories = ["parser-implementations", "parsing", "text-editors"]
 build = "bindings/rust/build.rs"
+links = "tree-sitter-sh"
 include = [
   "/LICENSE",
   "/README.md",
   "/bindings/rust/*.rs",
-  "/grammar.js",
   "/queries/*.scm",
   "/src/*.c",
   "/src/*.h",
-  "/src/*.json",
+  "/src/node-types.json",
   "/src/tree_sitter/*.h",
-  "/tree-sitter.json",
+  "/test/bindings.test.rs",
 ]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
+[[test]]
+name = "bindings"
+path = "test/bindings.test.rs"
+
 [dependencies]
 tree-sitter-language = "0.1.8"
 
@@ -32,4 +34,4 @@ tree-sitter-language = "0.1.8"
 tree-sitter = "0.27.0"
 
 [build-dependencies]
-cc = "1.4.6"
+cc = "1.4"

package/README.md

@@ -1,6 +1,7 @@
 # tree-sitter-sh
 
-[![CI](https://github.com/konomanoasa/tree-sitter-sh/actions/workflows/ci.yml/badge.svg)](https://github.com/konomanoasa/tree-sitter-sh/actions/workflows/ci.yml)
+[![CI](https://github.com/konomanoasa/tree-sitter-sh/actions/workflows/ci.yaml/badge.svg)](https://github.com/konomanoasa/tree-sitter-sh/actions/workflows/ci.yaml)
+[![crates.io](https://img.shields.io/crates/v/tree-sitter-sh)](https://crates.io/crates/tree-sitter-sh)
 [![npm](https://img.shields.io/npm/v/tree-sitter-sh)](https://www.npmjs.com/package/tree-sitter-sh)
 
 [Tree-sitter](https://tree-sitter.github.io/tree-sitter/) grammar for the
@@ -14,9 +15,12 @@ npm install tree-sitter-sh
 
 ## Development
 
+Development uses Node.js 24 or later.
+
 ```sh
 npm install
-npm run parse -- script.sh
+npm run build
+npm test
 ```
 
 ## Specification

package/bindings/rust/build.rs

@@ -1,9 +1,23 @@
+use std::{env, path::Path};
+
 fn main() {
-    println!("cargo::rerun-if-changed=src");
+  let mut build = cc::Build::new();
+  build.std("c17");
+  if build.get_compiler().is_like_msvc() {
+    build.flag("-utf-8");
+  }
+  if env::var("TARGET").expect("Cargo must provide TARGET")
+    == "wasm32-unknown-unknown"
+  {
+    let headers = env::var_os("DEP_TREE_SITTER_LANGUAGE_WASM_HEADERS")
+      .expect("tree-sitter-language must provide WebAssembly headers");
+    build.include(&headers);
+    println!("cargo::rerun-if-changed={}", Path::new(&headers).display());
+  }
 
-    cc::Build::new()
-        .std("c17")
-        .include("src")
-        .files(["src/parser.c", "src/scanner.c"])
-        .compile("tree-sitter-sh");
+  println!("cargo::rerun-if-changed=src");
+  build
+    .include("src")
+    .files(["src/parser.c", "src/scanner.c"])
+    .compile("tree-sitter-sh");
 }

package/bindings/rust/lib.rs

@@ -1,56 +1,12 @@
-//! POSIX.1-2024 Shell Command Language support for Tree-sitter.
-//!
-//! ```
-//! let mut parser = tree_sitter::Parser::new();
-//! parser.set_language(&tree_sitter_sh::LANGUAGE.into()).unwrap();
-//! let tree = parser.parse("echo hello\n", None).unwrap();
-//! assert!(!tree.root_node().has_error());
-//! ```
-
 use tree_sitter_language::LanguageFn;
 
 unsafe extern "C" {
-    fn tree_sitter_sh() -> *const ();
+  fn tree_sitter_sh() -> *const ();
 }
 
-/// Grammar entry point for `tree_sitter::Parser::set_language`.
-pub const LANGUAGE: LanguageFn = unsafe { LanguageFn::from_raw(tree_sitter_sh) };
+pub const LANGUAGE: LanguageFn =
+  unsafe { LanguageFn::from_raw(tree_sitter_sh) };
 
-/// Public node types and fields in Tree-sitter's JSON format.
 pub const NODE_TYPES: &str = include_str!("../../src/node-types.json");
 
-/// Highlight query using standard Tree-sitter and Neovim captures.
 pub const HIGHLIGHTS_QUERY: &str = include_str!("../../queries/highlights.scm");
-
-#[cfg(test)]
-mod tests {
-    use tree_sitter::{Parser, Query, QueryCursor, StreamingIterator};
-
-    #[test]
-    fn parses_quoted_here_document_and_highlights_its_terminator() {
-        let source = "cat <<'EOF'\n$HOME\nEOF\n";
-        let language = super::LANGUAGE.into();
-        let mut parser = Parser::new();
-        parser.set_language(&language).unwrap();
-        let tree = parser.parse(source, None).unwrap();
-        let root = tree.root_node();
-        assert_eq!(root.kind(), "program");
-        assert_eq!(root.byte_range(), 0..source.len());
-        assert!(!root.has_error(), "{}", root.to_sexp());
-
-        let query = Query::new(&language, super::HIGHLIGHTS_QUERY).unwrap();
-        let mut cursor = QueryCursor::new();
-        let mut captures = cursor.captures(&query, root, source.as_bytes());
-        let mut terminators = 0;
-        while let Some((matched, index)) = captures.next() {
-            let capture = matched.captures()[*index];
-            if capture.node.kind() == "here_document_end_text" {
-                assert_eq!(query.capture_names()[capture.index as usize], "label");
-                assert_eq!(capture.node.byte_range(), 18..21);
-                assert_eq!(capture.node.utf8_text(source.as_bytes()).unwrap(), "EOF");
-                terminators += 1;
-            }
-        }
-        assert_eq!(terminators, 1);
-    }
-}