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

Avoid panic in get_injections

Browse source
This commit is contained in:
Julia 2023-05-18 11:59:59 -04:00
parent 7d11329e80
commit 5ab1ae1521
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/language/src/syntax_map.rs
View file

@ -1114,6 +1114,8 @@ fn get_injections(
let mut query_cursor = QueryCursorHandle::new(); let mut query_cursor = QueryCursorHandle::new();
let mut prev_match = None; let mut prev_match = None;
// Ensure that a `ParseStep` is created for every combined injection language, even
// if there currently no matches for that injection.
combined_injection_ranges.clear(); combined_injection_ranges.clear();
for pattern in &config.patterns { for pattern in &config.patterns {
if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined) { if let (Some(language_name), true) = (pattern.language.as_ref(), pattern.combined) {
@ -1174,8 +1176,8 @@ fn get_injections(
if let Some(language) = language { if let Some(language) = language {
if combined { if combined {
combined_injection_ranges combined_injection_ranges
.get_mut(&language.clone()) .entry(language.clone())
.unwrap() .or_default()
.extend(content_ranges); .extend(content_ranges);
} else { } else {
queue.push(ParseStep { queue.push(ParseStep {