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

move shared code to query_testing

Browse source
This commit is contained in:
Patrick Thomson 2020-10-26 14:27:33 -04:00
parent 1012bea3f4
commit 6adeb7b40d
5 changed files with 160 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

11
cli/src/query.rs
View file

@ -1,13 +1,10 @@
use super::error::{Error, Result};
use crate::query_testing;
use std::fs;
use std::io::{self, Write};
use std::path::Path;
use tree_sitter::{Language, Node, Parser, Query, QueryCursor};
mod assert;
use assert::CaptureInfo;
pub fn query_files_at_paths(
language: Language,
paths: Vec<String>,
@ -58,7 +55,7 @@ pub fn query_files_at_paths(
capture.node.start_position().row,
capture.node.utf8_text(&source_code).unwrap_or("")
)?;
results.push(CaptureInfo {
results.push(query_testing::CaptureInfo {
name: capture_name.to_string(),
position: capture.node.start_position(),
});
@ -85,7 +82,7 @@ pub fn query_files_at_paths(
capture_name, start, end,
)?;
}
results.push(CaptureInfo {
results.push(query_testing::CaptureInfo {
name: capture_name.to_string(),
position: capture.node.start_position(),
});
@ -93,7 +90,7 @@ pub fn query_files_at_paths(
}
}
if should_test {
assert::assert_expected_captures(results, path, &mut parser, language)?
query_testing::assert_expected_captures(results, path, &mut parser, language)?
}
}