Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tasks: Fix runnables retrieval to not bail when a single tag can't be matched (#12113)

Browse source 
This can happen with queries without `@run` indicator.

Release Notes:

- N/A
This commit is contained in:
Piotr Osiewicz 2024-05-22 13:26:12 +02:00 • committed by GitHub
parent e68ef944d9
commit c440f3a71b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 46 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/language/src/buffer.rs
View file

@ -3005,9 +3005,9 @@ impl BufferSnapshot {
.map(|grammar| grammar.runnable_config.as_ref()) .map(|grammar| grammar.runnable_config.as_ref())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
iter::from_fn(move || { iter::from_fn(move || loop {
let test_range = syntax_matches.peek().and_then(|mat| { let mat = syntax_matches.peek()?;
test_configs[mat.grammar_index].and_then(|test_configs| { let test_range = test_configs[mat.grammar_index].and_then(|test_configs| {
let mut tags: SmallVec<[(Range<usize>, RunnableTag); 1]> = let mut tags: SmallVec<[(Range<usize>, RunnableTag); 1]> =
SmallVec::from_iter(mat.captures.iter().filter_map(|capture| { SmallVec::from_iter(mat.captures.iter().filter_map(|capture| {
test_configs test_configs
@ -3047,10 +3047,14 @@ impl BufferSnapshot {
extra_captures, extra_captures,
buffer_id: self.remote_id(), buffer_id: self.remote_id(),
}) })
})
}); });
syntax_matches.advance(); syntax_matches.advance();
test_range if test_range.is_some() {
// It's fine for us to short-circuit on .peek()? returning None. We don't want to return None from this iter if we
// had a capture that did not contain a run marker, hence we'll just loop around for the next capture.
return test_range;
}
}) })
} }