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

🎨

Browse source
This commit is contained in:
Max Brunsfeld 2023-05-31 15:13:01 -07:00
parent 0dd7694ff5
commit 0d281c1b89
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
crates/language/src/language_settings.rs
View file

@ -19,21 +19,16 @@ pub fn language_settings<'a>(
file: Option<&Arc<dyn File>>, file: Option<&Arc<dyn File>>,
cx: &'a AppContext, cx: &'a AppContext,
) -> &'a LanguageSettings { ) -> &'a LanguageSettings {
settings::get_local::<AllLanguageSettings>( let language_name = language.map(|l| l.name());
file.map(|f| (f.worktree_id(), f.path().as_ref())), all_language_settings(file, cx).language(language_name.as_deref())
cx,
)
.language(language.map(|l| l.name()).as_deref())
} }
pub fn all_language_settings<'a>( pub fn all_language_settings<'a>(
file: Option<&Arc<dyn File>>, file: Option<&Arc<dyn File>>,
cx: &'a AppContext, cx: &'a AppContext,
) -> &'a AllLanguageSettings { ) -> &'a AllLanguageSettings {
settings::get_local::<AllLanguageSettings>( let location = file.map(|f| (f.worktree_id(), f.path().as_ref()));
file.map(|f| (f.worktree_id(), f.path().as_ref())), settings::get_local(location, cx)
cx,
)
} }
#[derive(Debug, Clone)] #[derive(Debug, Clone)]