sascha
/
difftastic
mirror of https://github.com/Wilfred/difftastic/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

embed highlights and locals queries in rust library

pull/361/head
Yuya Nishihara 2022-03-03 19:30:10 +07:00
parent b2213c7d6a
commit 768cd53258
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
Unescape Escape View File

@ -7,6 +7,8 @@
/examples/qtdeclarative /examples/qtdeclarative
/node_modules/ /node_modules/
/package-lock.json /package-lock.json
/queries/highlights-javascript.scm
/queries/highlights-typescript.scm
/target/ /target/
# Workaround for https://github.com/tree-sitter/tree-sitter/issues/730 # Workaround for https://github.com/tree-sitter/tree-sitter/issues/730

7
Makefile
Unescape Escape View File

@ -11,9 +11,16 @@ help:
.PHONY: generate .PHONY: generate
generate: generate:
$(MAKE) queries/highlights-javascript.scm queries/highlights-typescript.scm
$(MAKE) src/typescript-scanner.h $(MAKE) src/typescript-scanner.h
$(TREE_SITTER) generate $(TREE_SITTER) generate
# create symlinks out of sub packages so cargo can pick them up
queries/highlights-javascript.scm: node_modules/tree-sitter-javascript/queries/highlights.scm
ln -sf ../$< $@
queries/highlights-typescript.scm: node_modules/tree-sitter-typescript/queries/highlights.scm
ln -sf ../$< $@
src/typescript-scanner.h: \ src/typescript-scanner.h: \
node_modules/tree-sitter-typescript/common/scanner.h \ node_modules/tree-sitter-typescript/common/scanner.h \
node_modules/tree-sitter-typescript/LICENSE \ node_modules/tree-sitter-typescript/LICENSE \

8
bindings/rust/lib.rs
Unescape Escape View File

@ -35,9 +35,13 @@ pub const NODE_TYPES: &'static str = include_str!("../../src/node-types.json");
// Uncomment these to include any queries that this grammar contains // Uncomment these to include any queries that this grammar contains
// pub const HIGHLIGHTS_QUERY: &'static str = include_str!("../../queries/highlights.scm"); pub const HIGHLIGHTS_QUERY: &'static str = concat!(
include_str!("../../queries/highlights.scm"),
include_str!("../../queries/highlights-typescript.scm"),
include_str!("../../queries/highlights-javascript.scm"),
);
// pub const INJECTIONS_QUERY: &'static str = include_str!("../../queries/injections.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 LOCALS_QUERY: &'static str = include_str!("../../queries/locals.scm");
// pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm"); // pub const TAGS_QUERY: &'static str = include_str!("../../queries/tags.scm");
#[cfg(test)] #[cfg(test)]