From 98d74f9317763516a33e35ead2dc0c08b580b7af Mon Sep 17 00:00:00 2001
From: Kirill Bulatov <kirill@zed.dev>
Date: Wed, 28 Aug 2024 18:00:38 +0300
Subject: [PATCH] Use a proper settings location for yaml (#17006)

Release Notes:

- N/A

Co-authored-by: Marshall Bowers <marshall@zed.dev>
---
 crates/languages/src/yaml.rs | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/crates/languages/src/yaml.rs b/crates/languages/src/yaml.rs
index c42907889e..01b071d79c 100644
--- a/crates/languages/src/yaml.rs
+++ b/crates/languages/src/yaml.rs
@@ -3,11 +3,12 @@ use async_trait::async_trait;
 use futures::StreamExt;
 use gpui::AsyncAppContext;
 use language::{
-    language_settings::all_language_settings, LanguageServerName, LspAdapter, LspAdapterDelegate,
+    language_settings::AllLanguageSettings, LanguageServerName, LspAdapter, LspAdapterDelegate,
 };
 use lsp::LanguageServerBinary;
 use node_runtime::NodeRuntime;
 use serde_json::Value;
+use settings::{Settings, SettingsLocation};
 use smol::fs;
 use std::{
     any::Any,
@@ -95,11 +96,16 @@ impl LspAdapter for YamlLspAdapter {
 
     async fn workspace_configuration(
         self: Arc<Self>,
-        _: &Arc<dyn LspAdapterDelegate>,
+        delegate: &Arc<dyn LspAdapterDelegate>,
         cx: &mut AsyncAppContext,
     ) -> Result<Value> {
+        let location = SettingsLocation {
+            worktree_id: delegate.worktree_id() as usize,
+            path: delegate.worktree_root_path(),
+        };
+
         let tab_size = cx.update(|cx| {
-            all_language_settings(None, cx)
+            AllLanguageSettings::get(Some(location), cx)
                 .language(Some("YAML"))
                 .tab_size
         })?;