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

Remove fanciful nomenclature.

Browse source
This commit is contained in:
Patrick Thomson 2020-11-23 12:01:08 -05:00
parent 6764b803a0
commit e1da6e554b
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/src/query.rs
View file

@ -57,8 +57,8 @@ pub fn query_files_at_paths(
)?;
results.push(query_testing::CaptureInfo {
name: capture_name.to_string(),
position: capture.node.start_position(),
terminus: capture.node.end_position(),
start: capture.node.start_position(),
end: capture.node.end_position(),
});
}
} else {
@ -85,8 +85,8 @@ pub fn query_files_at_paths(
}
results.push(query_testing::CaptureInfo {
name: capture_name.to_string(),
position: capture.node.start_position(),
terminus: capture.node.end_position(),
start: capture.node.start_position(),
end: capture.node.end_position(),
});
}
}

10
cli/src/query_testing.rs
View file

@ -12,8 +12,8 @@ lazy_static! {
#[derive(Debug, Eq, PartialEq)]
pub struct CaptureInfo {
pub name: String,
pub position: Point,
pub terminus: Point,
pub start: Point,
pub end: Point,
}
#[derive(Debug, PartialEq, Eq)]
@ -136,16 +136,14 @@ pub fn assert_expected_captures(
let pairs = parse_position_comments(parser, language, contents.as_bytes())?;
for info in &infos {
let found = pairs.iter().find(|p| {
p.position.row == info.position.row
&& p.position >= info.position
&& p.position < info.terminus
p.position.row == info.start.row && p.position >= info.start && p.position < info.end
});
if let Some(found) = found {
if found.expected_capture_name != info.name && info.name != "name" {
Err(error::Error::new(format!(
"Assertion failed: at {}, found {}, expected {}",
info.position, found.expected_capture_name, info.name
info.start, found.expected_capture_name, info.name
)))?
}
}