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

Fix panic loading language queries (#9506)

Browse source 
Release Notes:

- Fixed a panic when loading a language with queries but no grammar
This commit is contained in:
Conrad Irwin 2024-03-18 14:25:26 -06:00 • committed by GitHub
parent f738bfd703
commit 18fa84b17e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 44 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
crates/language/src/language_registry.rs
View file

@ -499,15 +499,15 @@ impl LanguageRegistry {
let language = async {
let (config, queries) = (language.load)()?;
let grammar = if let Some(grammar) = config.grammar.clone() {
Some(this.get_or_load_grammar(grammar).await?)
if let Some(grammar) = config.grammar.clone() {
let grammar = Some(this.get_or_load_grammar(grammar).await?);
Language::new_with_id(id, config, grammar)
.with_context_provider(provider)
.with_queries(queries)
} else {
None
};
Language::new_with_id(id, config, grammar)
.with_context_provider(provider)
.with_queries(queries)
Ok(Language::new_with_id(id, config, None)
.with_context_provider(provider))
}
}
.await;