From 267a2c7c323333929ca598d589e1797dd5e3277a Mon Sep 17 00:00:00 2001
From: Lucas CHOLLET <lucas.chollet@free.fr>
Date: Sun, 24 Jul 2022 15:58:46 +0200
Subject: [PATCH] Base: Launch LanguageServers at session start-up

---
 Base/etc/SystemServer.ini                        | 16 ----------------
 Base/home/anon/.config/SystemServer.ini          | 14 ++++++++++++++
 .../LanguageClients/ConnectionsToServer.h        |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Base/etc/SystemServer.ini b/Base/etc/SystemServer.ini
index f736c313a5..576b031b49 100644
--- a/Base/etc/SystemServer.ini
+++ b/Base/etc/SystemServer.ini
@@ -39,22 +39,6 @@ Environment=TERM=xterm
 KeepAlive=true
 SystemModes=text
 
-[CppLanguageServer]
-Socket=/tmp/portal/language/cpp
-SocketPermissions=600
-Lazy=true
-User=anon
-MultiInstance=true
-AcceptSocketConnections=true
-
-[ShellLanguageServer]
-Socket=/tmp/portal/language/shell
-SocketPermissions=600
-Lazy=true
-User=anon
-MultiInstance=true
-AcceptSocketConnections=true
-
 [SQLServer]
 Socket=/tmp/portal/sql
 SocketPermissions=600
diff --git a/Base/home/anon/.config/SystemServer.ini b/Base/home/anon/.config/SystemServer.ini
index e1ed44be1a..3a7c560c97 100644
--- a/Base/home/anon/.config/SystemServer.ini
+++ b/Base/home/anon/.config/SystemServer.ini
@@ -63,6 +63,20 @@ Priority=high
 KeepAlive=true
 SystemModes=text,graphical
 
+[CppLanguageServer]
+Socket=/tmp/user/%uid/portal/language/cpp
+SocketPermissions=600
+Lazy=true
+MultiInstance=true
+AcceptSocketConnections=true
+
+[ShellLanguageServer]
+Socket=/tmp/user/%uid/portal/language/shell
+SocketPermissions=600
+Lazy=true
+MultiInstance=true
+AcceptSocketConnections=true
+
 [LaunchServer]
 Socket=/tmp/user/%uid/portal/launch
 SocketPermissions=600
diff --git a/Userland/DevTools/HackStudio/LanguageClients/ConnectionsToServer.h b/Userland/DevTools/HackStudio/LanguageClients/ConnectionsToServer.h
index 3022290ce6..a32aa84747 100644
--- a/Userland/DevTools/HackStudio/LanguageClients/ConnectionsToServer.h
+++ b/Userland/DevTools/HackStudio/LanguageClients/ConnectionsToServer.h
@@ -15,7 +15,7 @@
 #define LANGUAGE_CLIENT(language_name_, socket_name)                                                    \
     namespace language_name_ {                                                                          \
     class ConnectionToServer final : public HackStudio::ConnectionToServer {                            \
-        IPC_CLIENT_CONNECTION(ConnectionToServer, "/tmp/portal/language/" socket_name)                  \
+        IPC_CLIENT_CONNECTION(ConnectionToServer, "/tmp/user/%uid/portal/language/" socket_name)        \
     public:                                                                                             \
         static char const* language_name() { return #language_name_; }                                  \
                                                                                                         \