Skip to content

Commit 9dc676c

Browse files
committed
fix: fileWorkspaceFolder should respect current opened file
1 parent 2fe35c4 commit 9dc676c

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lua/overseer/vscode/variables.lua

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ M.get_selected_text = function()
3030
return table.concat(lines, "\n")
3131
end
3232

33-
local function get_workspace_folder()
34-
local vscode_dir =
35-
vim.fs.find(".vscode", { upward = true, type = "directory", path = vim.fn.getcwd() })[1]
33+
local function get_workspace_folder(path)
34+
local vscode_dir = vim.fs.find(".vscode", { upward = true, type = "directory", path = path })[1]
3635
if vscode_dir then
3736
return vim.fs.dirname(vscode_dir)
3837
else
@@ -46,7 +45,7 @@ M.precalculate_vars = function()
4645
workspaceFolder = get_workspace_folder(),
4746
workspaceFolderBasename = vim.fs.basename(vim.fn.getcwd()),
4847
file = vim.fn.expand("%:p"),
49-
fileWorkspaceFolder = get_workspace_folder(),
48+
fileWorkspaceFolder = get_workspace_folder(vim.fn.expand("%:p:h")),
5049
relativeFile = vim.fn.expand("%:."),
5150
relativeFileDirname = vim.fn.expand("%:.:h"),
5251
fileBasename = vim.fn.expand("%:t"),
@@ -88,7 +87,7 @@ M.replace_vars = function(str, params, precalculated_vars)
8887
elseif name == "file" then
8988
return vim.fn.expand("%:p")
9089
elseif name == "fileWorkspaceFolder" then
91-
return get_workspace_folder()
90+
return get_workspace_folder(vim.fn.expand("%:p:h"))
9291
elseif name == "relativeFile" then
9392
return vim.fn.expand("%:.")
9493
elseif name == "relativeFileDirname" then

0 commit comments

Comments
 (0)