Merge pull request #7 from hatoo/update

update
hatoo · Jun 7, 2024 · 6ba1067 · 6ba1067
2 parents 07cf31d + 371be86
commit 6ba1067
Show file tree

Hide file tree

Showing 29 changed files with 1,627 additions and 756 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/egglog-language-server/Cargo.toml b/egglog-language-server/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2021"
 tokio = { version = "1.32.0", features = ["full"] }
 tower-lsp = "0.20.0"
 tree-sitter-egglog = { path = "../tree-sitter-egglog" }
-tree-sitter = "0.21.0"
-tree-sitter-highlight = "0.21.0"
+tree-sitter = "0.22.6"
+tree-sitter-highlight = "0.22.6"
 dashmap = "5.5.1"
 anyhow = "1.0.75"
diff --git a/tree-sitter-egglog/.editorconfig b/tree-sitter-egglog/.editorconfig
@@ -0,0 +1,39 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{json,toml,yml,gyp}]
+indent_style = space
+indent_size = 2
+
+[*.js]
+indent_style = space
+indent_size = 2
+
+[*.rs]
+indent_style = space
+indent_size = 4
+
+[*.{c,cc,h}]
+indent_style = space
+indent_size = 4
+
+[*.{py,pyi}]
+indent_style = space
+indent_size = 4
+
+[*.swift]
+indent_style = space
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 8
+
+[Makefile]
+indent_style = tab
+indent_size = 8
diff --git a/tree-sitter-egglog/.gitattributes b/tree-sitter-egglog/.gitattributes
@@ -0,0 +1,11 @@
+* text eol=lf
+
+src/*.json linguist-generated
+src/parser.c linguist-generated
+src/tree_sitter/* linguist-generated
+
+bindings/** linguist-generated
+binding.gyp linguist-generated
+setup.py linguist-generated
+Makefile linguist-generated
+Package.swift linguist-generated
diff --git a/tree-sitter-egglog/Cargo.toml b/tree-sitter-egglog/Cargo.toml
@@ -9,18 +9,13 @@ edition = "2018"
 license = "MIT"
 
 build = "bindings/rust/build.rs"
-include = [
-  "bindings/rust/*",
-  "grammar.js",
-  "queries/*",
-  "src/*",
-]
+include = ["bindings/rust/*", "grammar.js", "queries/*", "src/*"]
 
 [lib]
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = "~0.21.0"
+tree-sitter = "~0.22.6"
 
 [build-dependencies]
 cc = "1.0"
diff --git a/tree-sitter-egglog/Makefile b/tree-sitter-egglog/Makefile
diff --git a/tree-sitter-egglog/Package.swift b/tree-sitter-egglog/Package.swift
diff --git a/tree-sitter-egglog/binding.gyp b/tree-sitter-egglog/binding.gyp
diff --git a/tree-sitter-egglog/bindings/c/tree-sitter-egglog.h b/tree-sitter-egglog/bindings/c/tree-sitter-egglog.h
diff --git a/tree-sitter-egglog/bindings/c/tree-sitter-egglog.pc.in b/tree-sitter-egglog/bindings/c/tree-sitter-egglog.pc.in
diff --git a/tree-sitter-egglog/bindings/go/binding.go b/tree-sitter-egglog/bindings/go/binding.go
diff --git a/tree-sitter-egglog/bindings/go/binding_test.go b/tree-sitter-egglog/bindings/go/binding_test.go
diff --git a/tree-sitter-egglog/bindings/go/go.mod b/tree-sitter-egglog/bindings/go/go.mod
diff --git a/tree-sitter-egglog/bindings/node/binding.cc b/tree-sitter-egglog/bindings/node/binding.cc