Update generated files, remove duplicated code, add syntax highlighting

.github/workflows/main.yml

@@ -0,0 +1,12 @@
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ tree_sitter_test:
+ name: tree-sitter check
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/checkout@v3
+ - uses: renjisann/[email protected]

.gitignore

@@ -104,3 +104,6 @@ dist
 .tern-port
 
 .eslintrc.js
+
+highlight_test.html
+/target/

Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "tree-sitter-xml"
+description = "xml grammar for the tree-sitter parsing library"
+version = "0.0.1"
+keywords = ["incremental", "parsing", "xml"]
+categories = ["parsing", "text-editors"]
+repository = "https://github.com/tree-sitter/tree-sitter-xml"
+edition = "2018"
+license = "MIT"
+
+build = "bindings/rust/build.rs"
+include = [
+ "bindings/rust/*",
+ "grammar.js",
+ "queries/*",
+ "src/*",
+]
+
+[lib]
+path = "bindings/rust/lib.rs"
+
+[dependencies]
+tree-sitter = "~0.20.3"
+
+[build-dependencies]
+cc = "1.0"

README.md

@@ -1,48 +1,10 @@
 # tree-sitter-xml
-XML Grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter)
+XML Grammar for [tree-sitter](https://github.com/tree-sitter/tree-sitter) forked
+from [dorgnarg/tree-sitter-xml](https://github.com/dorgnarg/tree-sitter-xml).
 
-[Based on the W3C XML 1.0 recommendation](https://www.w3.org/TR/REC-xml/)
+This fork brings **highlight**ing for the existing grammar. It also fixes errors
+in the grammar (typos in rules, confusion with `\s` and `\s+`).
 
-Example files come from W3C samples, [generated data](www.generatedata.com), and [wikimedia dumps](https://dumps.wikimedia.org/).
+Example files come from W3C samples, [generated data](www.generatedata.com),
+and [wikimedia dumps](https://dumps.wikimedia.org/).
 
-Finished sections from the XML specification:
-
-- [x] Document
-- [x] Character Range (currently doing with `/./`)
-- [x] White Space (currently doing with `/\s/`)
-- [x] Names and Tokens
-- [x] Literals
-- [x] Character Data
-- [x] Comments
-- [x] Processing Instructions (*haven't quite finished the pi_target definition*)
-- [x] CDATA Sections (*not sure about the cdata element, I need to test it more*)
-- [x] Prolog
-- [x] Document Type Definition
-- [x] External Subset
-- [x] Standalone Document Declaration
-- [x] Language Identification
-- [x] Element
-- [x] Start-tag
-- [x] End-tag
-- [x] Content of Elements
-- [x] Tags for Empty Elements
-- [x] Element Type Declaration
-- [x] Element-content Models
-- [x] Mixed-content Declaration
-- [x] Attribute-list Declaration
-- [x] Attribute Types
-- [x] Enumerated Attribute Types
-- [x] Attribute Defaults
-- [x] Conditional Section (*$.ignore might not be good enough*)
-- [x] Character Reference
-- [x] Entity Reference
-- [x] Entity Declaration
-- [x] External Entity Declaraion
-- [x] Text Declaration
-- [x] Well-Formed External Parsed Entity
-- [x] Encoding Declaration
-- [x] Encoding Declaration
-- [x] Notation Declarations
-- [x] Characters
-
-*Note that these just mean I have literally written them in, I'm still working on organization and figuring out what needs to be visible/hidden. Help is appreciated!*

binding.gyp

@@ -8,7 +8,7 @@
  ],
  "sources": [
  "src/parser.c",
- "src/binding.cc"
+ "bindings/node/binding.cc"
  ],
  "cflags_c": [
  "-std=c99",

bindings/node/index.js

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

bindings/rust/build.rs

@@ -0,0 +1,40 @@
+fn main() {
+ let src_dir = std::path::Path::new("src");
+
+ let mut c_config = cc::Build::new();
+ c_config.include(&src_dir);
+ c_config
+ .flag_if_supported("-Wno-unused-parameter")
+ .flag_if_supported("-Wno-unused-but-set-variable")
+ .flag_if_supported("-Wno-trigraphs");
+ 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());
+ */
+}

bindings/rust/lib.rs

@@ -0,0 +1,52 @@
+//! This crate provides xml 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:
+//!
+//! ```
+//! let code = "";
+//! let mut parser = tree_sitter::Parser::new();
+//! parser.set_language(tree_sitter_xml::language()).expect("Error loading xml grammar");
+//! let tree = parser.parse(code, None).unwrap();
+//! ```
+//!
+//! [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+//! [language func]: fn.language.html
+//! [Parser]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Parser.html
+//! [tree-sitter]: https://tree-sitter.github.io/
+
+use tree_sitter::Language;
+
+extern "C" {
+ fn tree_sitter_xml() -> Language;
+}
+
+/// Get the tree-sitter [Language][] for this grammar.
+///
+/// [Language]: https://docs.rs/tree-sitter/*/tree_sitter/struct.Language.html
+pub fn language() -> Language {
+ unsafe { tree_sitter_xml() }
+}
+
+/// 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");
+
+#[cfg(test)]
+mod tests {
+ #[test]
+ fn test_can_load_grammar() {
+ let mut parser = tree_sitter::Parser::new();
+ parser
+ .set_language(super::language())
+ .expect("Error loading xml language");
+ }
+}