traxys/tree-sitter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

highlight: Sipmlify injection API w/ new injection.combined property

Browse source
This commit is contained in:
Max Brunsfeld 2020-01-16 12:43:31 -08:00
parent f3747863df
commit 9dfd03e79a
3 changed files with 234 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cli/benches/benchmark.rs
View file

@ -17,7 +17,6 @@ lazy_static! {
static ref REPETITION_COUNT: usize = env::var("TREE_SITTER_BENCHMARK_REPETITION_COUNT")
.map(|s| usize::from_str_radix(&s, 10).unwrap())
.unwrap_or(5);
static ref TEST_LOADER: Loader = Loader::new(SCRATCH_DIR.clone());
static ref EXAMPLE_PATHS_BY_LANGUAGE_DIR: BTreeMap<PathBuf, Vec<PathBuf>> = {
fn process_dir(result: &mut BTreeMap<PathBuf, Vec<PathBuf>>, dir: &Path) {
@ -137,7 +136,7 @@ fn main() {
eprintln!("");
}
fn aggregate(speeds: &Vec<(usize)>) -> Option<(usize, usize)> {
fn aggregate(speeds: &Vec<usize>) -> Option<(usize, usize)> {
if speeds.is_empty() {
return None;
}

17
cli/src/tests/highlight_test.rs
View file

@ -317,8 +317,8 @@ fn test_highlighting_empty_lines() {
}
#[test]
fn test_highlighting_ejs() {
let source = vec!["<div><% foo() %></div>"].join("\n");
fn test_highlighting_ejs_with_html_and_javascript() {
let source = vec!["<div><% foo() %></div><script> bar() </script>"].join("\n");
assert_eq!(
&to_token_vector(&source, &EJS_HIGHLIGHT).unwrap(),
@ -335,7 +335,18 @@ fn test_highlighting_ejs() {
("%>", vec!["keyword"]),
("</", vec!["punctuation.bracket"]),
("div", vec!["tag"]),
(">", vec!["punctuation.bracket"])
(">", vec!["punctuation.bracket"]),
("<", vec!["punctuation.bracket"]),
("script", vec!["tag"]),
(">", vec!["punctuation.bracket"]),
(" ", vec![]),
("bar", vec!["function"]),
("(", vec!["punctuation.bracket"]),
(")", vec!["punctuation.bracket"]),
(" ", vec![]),
("</", vec!["punctuation.bracket"]),
("script", vec!["tag"]),
(">", vec!["punctuation.bracket"]),
]],
);
}