From d9539aab5924ba46a3edd0ddb85a3f6343ddea79 Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Tue, 24 Sep 2024 03:58:09 +0000
Subject: [PATCH 1/2] add: placeholder for paths

---
 script/files.lua | 39 ++++++++++++++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 7 deletions(-)

diff --git a/script/files.lua b/script/files.lua
index b9df56957..886a303b3 100644
--- a/script/files.lua
+++ b/script/files.lua
@@ -908,18 +908,43 @@ function m.countStates()
     return n
 end
 
+---Resolve path variables/placeholders like ${3rd} and ${addons}
 ---@param path string
----@return string
-function m.normalize(path)
-    path = path:gsub('%$%{(.-)%}', function (key)
-        if key == '3rd' then
-            return (ROOT / 'meta' / '3rd'):string()
-        end
-        if key:sub(1, 4) == 'env:' then
+---@return string resolvedPath
+function m.resolvePathPlaceholders(path)
+    path = path:gsub("%$%{(.-)%}", function(key)
+        if key == "3rd" then
+            return (ROOT / "meta" / "3rd"):string()
+        elseif key == "addons" then
+            -- Common path across OSes
+            local dataPath = "User/globalStorage/sumneko.lua/addonManager/addons"
+
+            if platform.os == "windows" then
+                return "$APPDATA/Code/" .. dataPath
+            elseif platform.os == "linux" then
+                local serverPath = util.expandPath(fs.path("~/.vscode-server/data"):string())
+                if fs.exists(serverPath) then
+                    -- addons are installed via SSH remote
+                    return serverPath .."/" .. dataPath
+                else
+                    return "~/.config/Code/" .. dataPath
+                end
+            elseif platform.os == "macos" then
+                return "~/Library/Application/Support/Code/" .. dataPath
+            end
+        elseif key:sub(1, 4) == "env:" then
             local env = os.getenv(key:sub(5))
             return env
         end
     end)
+
+    return path
+end
+
+---@param path string
+---@return string
+function m.normalize(path)
+    path = m.resolvePathPlaceholders(path)
     path = util.expandPath(path)
     path = path:gsub('^%.[/\\]+', '')
     for _ = 1, 1000 do

From 7a2921b2e88e905ba8ec79bccf7d8b142e9bc5bd Mon Sep 17 00:00:00 2001
From: carsakiller <carsakiller@gmail.com>
Date: Tue, 24 Sep 2024 04:37:31 +0000
Subject: [PATCH 2/2] chore: add changelog entry

---
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index e41293f60..1bffd4762 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@
 * `FIX` Eliminate floating point error in test benchmark output
 * `FIX` Remove luamake install from make scripts
 * `NEW` Types with literal fields can be narrowed.
+* `NEW` Reference addons installed via the addon manager with `${addons}` [#2866](https://github.com/LuaLS/lua-language-server/pull/2866).
 
 ## 3.10.6
 `2024-9-10`