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

refactor!: remove the apply-all-captures flag, make last-wins precedence the default

Browse source
This commit is contained in:
Amaan Qureshi 2024-02-07 02:02:32 -05:00
parent bf9154febe
commit e996c32108
9 changed files with 31 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -781,7 +781,6 @@ impl Loader {
pub fn highlight_config_for_injection_string<'a>(
&'a self,
string: &str,
apply_all_captures: bool,
) -> Option<&'a HighlightConfiguration> {
match self.language_configuration_for_injection_string(string) {
Err(e) => {
@ -790,7 +789,7 @@ impl Loader {
}
Ok(None) => None,
Ok(Some((language, configuration))) => {
match configuration.highlight_config(language, apply_all_captures, None) {
match configuration.highlight_config(language, None) {
Err(e) => {
eprintln!(
"Failed to load property sheet for injection string '{string}': {e}",
@ -1050,7 +1049,6 @@ impl<'a> LanguageConfiguration<'a> {
pub fn highlight_config(
&self,
language: Language,
apply_all_captures: bool,
paths: Option<&[String]>,
) -> Result<Option<&HighlightConfiguration>> {
let (highlights_filenames, injections_filenames, locals_filenames) = match paths {
@ -1115,7 +1113,6 @@ impl<'a> LanguageConfiguration<'a> {
&highlights_query,
&injections_query,
&locals_query,
apply_all_captures,
)
.map_err(|error| match error.kind {
QueryErrorKind::Language => Error::from(error),