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

Make HighlightConfiguration::configure use into iterator instead of a Vec<String>

Browse source
This commit is contained in:
Edgar 2021-05-17 21:44:41 +02:00 • committed by Edgar Luque
parent 12207c1f70
commit 9feca80b08
No known key found for this signature in database
GPG key ID: 8731E6C0166EAA85
4 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cli/loader/src/lib.rs
View file

@ -661,7 +661,7 @@ impl<'a> LanguageConfiguration<'a> {
}
}
}
result.configure(&all_highlight_names);
result.configure(&all_highlight_names.as_slice());
Ok(Some(result))
}
})

2
cli/src/tests/helpers/fixtures.rs
View file

@ -50,7 +50,7 @@ pub fn get_highlight_config(
&locals_query,
)
.unwrap();
result.configure(highlight_names);
result.configure(&highlight_names);
result
}

2
highlight/src/c_lib.rs
View file

@ -112,7 +112,7 @@ pub extern "C" fn ts_highlighter_add_language(
let mut config =
HighlightConfiguration::new(language, highlight_query, injection_query, locals_query)
.or(Err(ErrorCode::InvalidQuery))?;
config.configure(&this.highlight_names);
config.configure(&this.highlight_names.as_slice());
this.languages.insert(scope_name, (injection_regex, config));
Ok(())

10
highlight/src/lib.rs
View file

@ -293,7 +293,11 @@ impl HighlightConfiguration {
///
/// When highlighting, results are returned as `Highlight` values, which contain the index
/// of the matched highlight this list of highlight names.
pub fn configure(&mut self, recognized_names: &[String]) {
pub fn configure<'a, I, J>(&mut self, recognized_names: &I)
where
I: IntoIterator<Item = &'a J> + Copy,
J: AsRef<str> + 'a,
{
let mut capture_parts = Vec::new();
self.highlight_indices.clear();
self.highlight_indices
@ -303,10 +307,10 @@ impl HighlightConfiguration {
let mut best_index = None;
let mut best_match_len = 0;
for (i, recognized_name) in recognized_names.iter().enumerate() {
for (i, recognized_name) in recognized_names.into_iter().enumerate() {
let mut len = 0;
let mut matches = true;
for part in recognized_name.split('.') {
for part in recognized_name.as_ref().split('.') {
len += 1;
if !capture_parts.contains(&part) {
matches = false;