Skip to content

feat: Switch to Arborium #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zharinov merged 8 commits into from
Dec 19, 2025
Merged

feat: Switch to Arborium #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
59eaf89
feat: Switch to `arborium`
zharinov Dec 19, 2025
8a2a335
Fix test
zharinov Dec 19, 2025
292b196
Support all languages
zharinov Dec 19, 2025
67ef42a
Fix warnings
zharinov Dec 19, 2025
af24616
Fix
zharinov Dec 19, 2025
02b0b9b
Update build.rs
zharinov Dec 19, 2025
f18ea1a
Clean Up Tree-sitter Import and Alias
zharinov Dec 19, 2025
3ffe7b6
Remove `unstable-child-type-validation`
zharinov Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,628 changes: 1,309 additions & 319 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

261 changes: 210 additions & 51 deletions crates/plotnik-cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,62 +17,221 @@ path = "src/main.rs"

[features]
default = [
"bash",
"c",
"cpp",
"csharp",
"css",
"elixir",
"go",
"haskell",
"hcl",
"html",
"java",
"javascript",
"json",
"kotlin",
"lua",
"nix",
"php",
"python",
"ruby",
"rust",
"scala",
"solidity",
"swift",
"typescript",
"yaml",
"lang-bash",
"lang-c",
"lang-cpp",
"lang-css",
"lang-go",
"lang-html",
"lang-java",
"lang-javascript",
"lang-json",
"lang-python",
"lang-rust",
"lang-toml",
"lang-tsx",
"lang-typescript",
"lang-yaml",
]
bash = ["plotnik-langs/bash"]
c = ["plotnik-langs/c"]
cpp = ["plotnik-langs/cpp"]
csharp = ["plotnik-langs/csharp"]
css = ["plotnik-langs/css"]
elixir = ["plotnik-langs/elixir"]
go = ["plotnik-langs/go"]
haskell = ["plotnik-langs/haskell"]
hcl = ["plotnik-langs/hcl"]
html = ["plotnik-langs/html"]
java = ["plotnik-langs/java"]
javascript = ["plotnik-langs/javascript"]
json = ["plotnik-langs/json"]
kotlin = ["plotnik-langs/kotlin"]
lua = ["plotnik-langs/lua"]
nix = ["plotnik-langs/nix"]
php = ["plotnik-langs/php"]
python = ["plotnik-langs/python"]
ruby = ["plotnik-langs/ruby"]
rust = ["plotnik-langs/rust"]
scala = ["plotnik-langs/scala"]
solidity = ["plotnik-langs/solidity"]
swift = ["plotnik-langs/swift"]
typescript = ["plotnik-langs/typescript"]
yaml = ["plotnik-langs/yaml"]
all-languages = [
"lang-ada",
"lang-agda",
"lang-asciidoc",
"lang-asm",
"lang-awk",
"lang-bash",
"lang-batch",
"lang-c",
"lang-c-sharp",
"lang-caddy",
"lang-capnp",
"lang-clojure",
"lang-cmake",
"lang-commonlisp",
"lang-cpp",
"lang-css",
"lang-d",
"lang-dart",
"lang-devicetree",
"lang-diff",
"lang-dockerfile",
"lang-dot",
"lang-elisp",
"lang-elixir",
"lang-elm",
"lang-erlang",
"lang-fish",
"lang-fsharp",
"lang-gleam",
"lang-glsl",
"lang-go",
"lang-graphql",
"lang-haskell",
"lang-hcl",
"lang-hlsl",
"lang-html",
"lang-idris",
"lang-ini",
"lang-java",
"lang-javascript",
"lang-jinja2",
"lang-jq",
"lang-json",
"lang-julia",
"lang-kdl",
"lang-kotlin",
"lang-lean",
"lang-lua",
"lang-markdown",
"lang-matlab",
"lang-meson",
"lang-nginx",
"lang-ninja",
"lang-nix",
"lang-objc",
"lang-ocaml",
"lang-perl",
"lang-php",
"lang-postscript",
"lang-powershell",
"lang-prolog",
"lang-python",
"lang-query",
"lang-r",
"lang-rescript",
"lang-ron",
"lang-ruby",
"lang-rust",
"lang-scala",
"lang-scheme",
"lang-scss",
"lang-sparql",
"lang-sql",
"lang-ssh-config",
"lang-starlark",
"lang-svelte",
"lang-swift",
"lang-textproto",
"lang-thrift",
"lang-tlaplus",
"lang-toml",
"lang-tsx",
"lang-typescript",
"lang-typst",
"lang-uiua",
"lang-vb",
"lang-verilog",
"lang-vhdl",
"lang-vim",
"lang-vue",
"lang-x86asm",
"lang-xml",
"lang-yaml",
"lang-yuri",
"lang-zig",
"lang-zsh",
]
lang-ada = ["plotnik-langs/lang-ada"]
lang-agda = ["plotnik-langs/lang-agda"]
lang-asciidoc = ["plotnik-langs/lang-asciidoc"]
lang-asm = ["plotnik-langs/lang-asm"]
lang-awk = ["plotnik-langs/lang-awk"]
lang-bash = ["plotnik-langs/lang-bash"]
lang-batch = ["plotnik-langs/lang-batch"]
lang-c = ["plotnik-langs/lang-c"]
lang-c-sharp = ["plotnik-langs/lang-c-sharp"]
lang-caddy = ["plotnik-langs/lang-caddy"]
lang-capnp = ["plotnik-langs/lang-capnp"]
lang-clojure = ["plotnik-langs/lang-clojure"]
lang-cmake = ["plotnik-langs/lang-cmake"]
lang-commonlisp = ["plotnik-langs/lang-commonlisp"]
lang-cpp = ["plotnik-langs/lang-cpp"]
lang-css = ["plotnik-langs/lang-css"]
lang-d = ["plotnik-langs/lang-d"]
lang-dart = ["plotnik-langs/lang-dart"]
lang-devicetree = ["plotnik-langs/lang-devicetree"]
lang-diff = ["plotnik-langs/lang-diff"]
lang-dockerfile = ["plotnik-langs/lang-dockerfile"]
lang-dot = ["plotnik-langs/lang-dot"]
lang-elisp = ["plotnik-langs/lang-elisp"]
lang-elixir = ["plotnik-langs/lang-elixir"]
lang-elm = ["plotnik-langs/lang-elm"]
lang-erlang = ["plotnik-langs/lang-erlang"]
lang-fish = ["plotnik-langs/lang-fish"]
lang-fsharp = ["plotnik-langs/lang-fsharp"]
lang-gleam = ["plotnik-langs/lang-gleam"]
lang-glsl = ["plotnik-langs/lang-glsl"]
lang-go = ["plotnik-langs/lang-go"]
lang-graphql = ["plotnik-langs/lang-graphql"]
lang-haskell = ["plotnik-langs/lang-haskell"]
lang-hcl = ["plotnik-langs/lang-hcl"]
lang-hlsl = ["plotnik-langs/lang-hlsl"]
lang-html = ["plotnik-langs/lang-html"]
lang-idris = ["plotnik-langs/lang-idris"]
lang-ini = ["plotnik-langs/lang-ini"]
lang-java = ["plotnik-langs/lang-java"]
lang-javascript = ["plotnik-langs/lang-javascript"]
lang-jinja2 = ["plotnik-langs/lang-jinja2"]
lang-jq = ["plotnik-langs/lang-jq"]
lang-json = ["plotnik-langs/lang-json"]
lang-julia = ["plotnik-langs/lang-julia"]
lang-kdl = ["plotnik-langs/lang-kdl"]
lang-kotlin = ["plotnik-langs/lang-kotlin"]
lang-lean = ["plotnik-langs/lang-lean"]
lang-lua = ["plotnik-langs/lang-lua"]
lang-markdown = ["plotnik-langs/lang-markdown"]
lang-matlab = ["plotnik-langs/lang-matlab"]
lang-meson = ["plotnik-langs/lang-meson"]
lang-nginx = ["plotnik-langs/lang-nginx"]
lang-ninja = ["plotnik-langs/lang-ninja"]
lang-nix = ["plotnik-langs/lang-nix"]
lang-objc = ["plotnik-langs/lang-objc"]
lang-ocaml = ["plotnik-langs/lang-ocaml"]
lang-perl = ["plotnik-langs/lang-perl"]
lang-php = ["plotnik-langs/lang-php"]
lang-postscript = ["plotnik-langs/lang-postscript"]
lang-powershell = ["plotnik-langs/lang-powershell"]
lang-prolog = ["plotnik-langs/lang-prolog"]
lang-python = ["plotnik-langs/lang-python"]
lang-query = ["plotnik-langs/lang-query"]
lang-r = ["plotnik-langs/lang-r"]
lang-rescript = ["plotnik-langs/lang-rescript"]
lang-ron = ["plotnik-langs/lang-ron"]
lang-ruby = ["plotnik-langs/lang-ruby"]
lang-rust = ["plotnik-langs/lang-rust"]
lang-scala = ["plotnik-langs/lang-scala"]
lang-scheme = ["plotnik-langs/lang-scheme"]
lang-scss = ["plotnik-langs/lang-scss"]
lang-sparql = ["plotnik-langs/lang-sparql"]
lang-sql = ["plotnik-langs/lang-sql"]
lang-ssh-config = ["plotnik-langs/lang-ssh-config"]
lang-starlark = ["plotnik-langs/lang-starlark"]
lang-svelte = ["plotnik-langs/lang-svelte"]
lang-swift = ["plotnik-langs/lang-swift"]
lang-textproto = ["plotnik-langs/lang-textproto"]
lang-thrift = ["plotnik-langs/lang-thrift"]
lang-tlaplus = ["plotnik-langs/lang-tlaplus"]
lang-toml = ["plotnik-langs/lang-toml"]
lang-tsx = ["plotnik-langs/lang-tsx"]
lang-typescript = ["plotnik-langs/lang-typescript"]
lang-typst = ["plotnik-langs/lang-typst"]
lang-uiua = ["plotnik-langs/lang-uiua"]
lang-vb = ["plotnik-langs/lang-vb"]
lang-verilog = ["plotnik-langs/lang-verilog"]
lang-vhdl = ["plotnik-langs/lang-vhdl"]
lang-vim = ["plotnik-langs/lang-vim"]
lang-vue = ["plotnik-langs/lang-vue"]
lang-x86asm = ["plotnik-langs/lang-x86asm"]
lang-xml = ["plotnik-langs/lang-xml"]
lang-yaml = ["plotnik-langs/lang-yaml"]
lang-yuri = ["plotnik-langs/lang-yuri"]
lang-zig = ["plotnik-langs/lang-zig"]
lang-zsh = ["plotnik-langs/lang-zsh"]

[dependencies]
clap = { version = "4.5", features = ["derive"] }
plotnik-core = { version = "0.1.0", path = "../plotnik-core" }
plotnik-langs = { version = "0.1.0", path = "../plotnik-langs", default-features = false }
plotnik-lib = { version = "0.1.0", path = "../plotnik-lib" }
serde_json = "1.0"
tree-sitter = "0.26"
arborium-tree-sitter = "2.3.2"
1 change: 1 addition & 0 deletions crates/plotnik-cli/src/commands/debug/source.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::fs;
use std::io::{self, Read};
use std::path::PathBuf;

use arborium_tree_sitter as tree_sitter;
use plotnik_langs::Lang;

pub fn load_source(text: &Option<String>, file: &Option<PathBuf>) -> String {
Expand Down
Loading