aboutsummaryrefslogtreecommitdiff
path: root/helix-syntax
diff options
context:
space:
mode:
authorDmitry Sharshakov2021-09-25 20:14:59 +0000
committerDmitry Sharshakov2021-09-25 20:14:59 +0000
commitbf53aff27d2d90b41bab01f4d628f0bd9fbcd589 (patch)
tree568d745540acd05ae7526e8a3eed7ee8e31e3cea /helix-syntax
parent413e477dc2d4792596f99979140d2879ec3d4f4f (diff)
parentdf55eaae69d0388de26448e82f9ded483fca2f44 (diff)
Merge branch 'master' into debug
Diffstat (limited to 'helix-syntax')
-rw-r--r--helix-syntax/Cargo.toml2
-rw-r--r--helix-syntax/build.rs3
m---------helix-syntax/languages/tree-sitter-julia0
m---------helix-syntax/languages/tree-sitter-ledger0
m---------helix-syntax/languages/tree-sitter-svelte0
5 files changed, 2 insertions, 3 deletions
diff --git a/helix-syntax/Cargo.toml b/helix-syntax/Cargo.toml
index 73eda472..9c2b8275 100644
--- a/helix-syntax/Cargo.toml
+++ b/helix-syntax/Cargo.toml
@@ -11,7 +11,7 @@ homepage = "https://helix-editor.com"
include = ["src/**/*", "languages/**/*", "build.rs", "!**/docs/**/*", "!**/test/**/*", "!**/examples/**/*", "!**/build/**/*"]
[dependencies]
-tree-sitter = "0.19"
+tree-sitter = "0.20"
libloading = "0.7"
anyhow = "1"
diff --git a/helix-syntax/build.rs b/helix-syntax/build.rs
index 473646fd..28f85e74 100644
--- a/helix-syntax/build.rs
+++ b/helix-syntax/build.rs
@@ -158,10 +158,9 @@ fn build_dir(dir: &str, language: &str) {
.is_none()
{
eprintln!(
- "The directory {} is empty, did you use 'git clone --recursive'?",
+ "The directory {} is empty, you probably need to use 'git submodule update --init --recursive'?",
dir
);
- eprintln!("You can fix in using 'git submodule init && git submodule update --recursive'.");
std::process::exit(1);
}
diff --git a/helix-syntax/languages/tree-sitter-julia b/helix-syntax/languages/tree-sitter-julia
-Subproject 0ba7a24b062b671263ae08e707e9e94383b25bb
+Subproject 12ea597262125fc22fd2e91aa953ac69b19c26c
diff --git a/helix-syntax/languages/tree-sitter-ledger b/helix-syntax/languages/tree-sitter-ledger
-Subproject 72319504776f14193472a6ad14abec0af0225cb
+Subproject 0cdeb0e51411a3ba5493662952c3039de08939c
diff --git a/helix-syntax/languages/tree-sitter-svelte b/helix-syntax/languages/tree-sitter-svelte
new file mode 160000
+Subproject 349a5984513b4a4a9e143a6e746120c6ff6cf6e