From aad5a6909be34ed00b1fbc55af3732de70ea9e65 Mon Sep 17 00:00:00 2001
From: Marcus Tillmanns <marcus.tillmanns@qt.io>
Date: Thu, 28 Nov 2024 14:25:09 +0100
Subject: [PATCH] Lua LS: Use applySettings with specific settings

LanguageClientManager::applySettings() does not know when to apply
custom settings so we make sure that we explicitly apply our own.

Change-Id: I316e94d0fc50eafe59ca83142b367dd07fa5b353
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 .../lualanguageclient/lualanguageclient.cpp            | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
index 83e9ff4abe2..1ce806cf25e 100644
--- a/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
+++ b/src/plugins/languageclient/lualanguageclient/lualanguageclient.cpp
@@ -308,7 +308,15 @@ public:
         if (m_aspects) {
             connect(m_aspects, &AspectContainer::applied, this, [this] {
                 updateOptions();
-                LanguageClientManager::applySettings();
+                auto settings = Utils::findOr(
+                    LanguageClientManager::currentSettings(), nullptr, [this](BaseSettings *s) {
+                        return s->m_id == m_clientSettingsId;
+                    });
+
+                if (settings)
+                    LanguageClientManager::applySettings(settings);
+                else
+                    LanguageClientManager::applySettings();
             });
         }