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

Reload extensions more robustly when manually modifying installed extensions directory (#7749)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Marshall <marshall@zed.dev>
This commit is contained in:
Max Brunsfeld 2024-02-13 16:15:19 -08:00 • committed by GitHub
parent c3176392c6
commit c357e37dde
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 335 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,11 +151,6 @@ impl LanguageRegistry {
self.state.write().reload();
}
/// Clears out the given languages and reload them from scratch.
pub fn reload_languages(&self, languages: &[Arc<str>], grammars: &[Arc<str>]) {
self.state.write().reload_languages(languages, grammars);
}
/// Removes the specified languages and grammars from the registry.
pub fn remove_languages(
&self,
@ -209,6 +204,9 @@ impl LanguageRegistry {
lsp_adapters,
loaded: false,
});
state.version += 1;
state.reload_count += 1;
*state.subscription.0.borrow_mut() = ();
}
/// Adds grammars to the registry. Language configurations reference a grammar by name. The
@ -229,11 +227,15 @@ impl LanguageRegistry {
&self,
grammars: impl IntoIterator<Item = (impl Into<Arc<str>>, PathBuf)>,
) {
self.state.write().grammars.extend(
let mut state = self.state.write();
state.grammars.extend(
grammars
.into_iter()
.map(|(name, path)| (name.into(), AvailableGrammar::Unloaded(path))),
);
state.version += 1;
state.reload_count += 1;
*state.subscription.0.borrow_mut() = ();
}
pub fn language_names(&self) -> Vec<String> {
@ -679,6 +681,10 @@ impl LanguageRegistryState {
languages_to_remove: &[Arc<str>],
grammars_to_remove: &[Arc<str>],
) {
if languages_to_remove.is_empty() && grammars_to_remove.is_empty() {
return;
}
self.languages
.retain(|language| !languages_to_remove.contains(&language.name()));
self.available_languages
@ -690,45 +696,6 @@ impl LanguageRegistryState {
*self.subscription.0.borrow_mut() = ();
}
fn reload_languages(
&mut self,
languages_to_reload: &[Arc<str>],
grammars_to_reload: &[Arc<str>],
) {
for (name, grammar) in self.grammars.iter_mut() {
if grammars_to_reload.contains(name) {
if let AvailableGrammar::Loaded(path, _) = grammar {
*grammar = AvailableGrammar::Unloaded(path.clone());
}
}
}
self.languages.retain(|language| {
let should_reload = languages_to_reload.contains(&language.config.name)
|| language
.config
.grammar
.as_ref()
.map_or(false, |grammar| grammars_to_reload.contains(&grammar));
!should_reload
});
for language in &mut self.available_languages {
if languages_to_reload.contains(&language.name)
|| language
.grammar
.as_ref()
.map_or(false, |grammar| grammars_to_reload.contains(grammar))
{
language.loaded = false;
}
}
self.version += 1;
self.reload_count += 1;
*self.subscription.0.borrow_mut() = ();
}
/// Mark the given language as having been loaded, so that the
/// language registry won't try to load it again.
fn mark_language_loaded(&mut self, id: LanguageId) {