From 0d281c1b89531547879e666320728a47336b47a9 Mon Sep 17 00:00:00 2001 From: Max Brunsfeld Date: Wed, 31 May 2023 15:13:01 -0700 Subject: [PATCH] :art: --- crates/language/src/language_settings.rs | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/crates/language/src/language_settings.rs b/crates/language/src/language_settings.rs index b03dd6a6b9f363ab7c70a94aca0501b0ec54638f..332e789b4d7e364ab24c382a4daa9928291967cd 100644 --- a/crates/language/src/language_settings.rs +++ b/crates/language/src/language_settings.rs @@ -19,21 +19,16 @@ pub fn language_settings<'a>( file: Option<&Arc>, cx: &'a AppContext, ) -> &'a LanguageSettings { - settings::get_local::( - file.map(|f| (f.worktree_id(), f.path().as_ref())), - cx, - ) - .language(language.map(|l| l.name()).as_deref()) + let language_name = language.map(|l| l.name()); + all_language_settings(file, cx).language(language_name.as_deref()) } pub fn all_language_settings<'a>( file: Option<&Arc>, cx: &'a AppContext, ) -> &'a AllLanguageSettings { - settings::get_local::( - file.map(|f| (f.worktree_id(), f.path().as_ref())), - cx, - ) + let location = file.map(|f| (f.worktree_id(), f.path().as_ref())); + settings::get_local(location, cx) } #[derive(Debug, Clone)]