diff options
author | Blaž Hrastnik | 2021-09-03 02:03:34 +0000 |
---|---|---|
committer | Blaž Hrastnik | 2021-09-03 02:03:34 +0000 |
commit | 4c410eef8720db0c92f39a050c4c5658636013fa (patch) | |
tree | ff0bc8dc19ac321675736a7e18ef8ca7aa95d414 /helix-syntax | |
parent | 9c64650a26cf03207f93c9eeddbafb12edccbf6e (diff) | |
parent | 7e1123680f474bff5113db189f63ca7f948781a5 (diff) |
Merge remote-tracking branch 'origin/master' into debug
Diffstat (limited to 'helix-syntax')
-rw-r--r-- | helix-syntax/build.rs | 3 | ||||
m--------- | helix-syntax/languages/tree-sitter-lua | 0 | ||||
m--------- | helix-syntax/languages/tree-sitter-ocaml | 0 | ||||
m--------- | helix-syntax/languages/tree-sitter-yaml | 0 |
4 files changed, 3 insertions, 0 deletions
diff --git a/helix-syntax/build.rs b/helix-syntax/build.rs index 75f8c970..473646fd 100644 --- a/helix-syntax/build.rs +++ b/helix-syntax/build.rs @@ -177,6 +177,7 @@ fn main() { let ignore = vec![ "tree-sitter-typescript".to_string(), "tree-sitter-haskell".to_string(), // aarch64 failures: https://github.com/tree-sitter/tree-sitter-haskell/issues/34 + "tree-sitter-ocaml".to_string(), ]; let dirs = collect_tree_sitter_dirs(&ignore).unwrap(); @@ -202,4 +203,6 @@ fn main() { build_dir("tree-sitter-typescript/tsx", "tsx"); build_dir("tree-sitter-typescript/typescript", "typescript"); + build_dir("tree-sitter-ocaml/ocaml", "ocaml"); + build_dir("tree-sitter-ocaml/interface", "ocaml-interface") } diff --git a/helix-syntax/languages/tree-sitter-lua b/helix-syntax/languages/tree-sitter-lua new file mode 160000 +Subproject 6f5d40190ec8a0aa8c8410699353d820f4f7d7a diff --git a/helix-syntax/languages/tree-sitter-ocaml b/helix-syntax/languages/tree-sitter-ocaml new file mode 160000 +Subproject 23d419ba45789c5a47d31448061557716b02750 diff --git a/helix-syntax/languages/tree-sitter-yaml b/helix-syntax/languages/tree-sitter-yaml new file mode 160000 +Subproject 0e36bed171768908f331ff7dff9d956bae016ef |