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

Merge pull request #1113 from edg-l/pr-highlight-intoiter

Browse source 
Make HighlightConfiguration::configure use IntoIterator
This commit is contained in:
Max Brunsfeld 2021-06-17 10:35:41 -07:00 • committed by GitHub
commit 0fea8c02ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 12 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
}

8
highlight/README.md
View file

@ -18,7 +18,7 @@ tree-sitter-javascript = "0.19"
Define the list of highlight names that you will recognize:
```rust
let highlight_names : Vec<String> = [
let highlight_names = &[
"attribute",
"constant",
"function.builtin",
@ -37,11 +37,7 @@ let highlight_names : Vec<String> = [
"variable",
"variable.builtin",
"variable.parameter",
]
.iter()
.cloned()
.map(String::from)
.collect();
];
```
Create a highlighter. You need one of these for each thread that you're using for syntax highlighting:

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(())

6
highlight/src/lib.rs
View file

@ -293,7 +293,7 @@ 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(&mut self, recognized_names: &[impl AsRef<str>]) {
let mut capture_parts = Vec::new();
self.highlight_indices.clear();
self.highlight_indices
@ -303,10 +303,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;