Skip to content

fix: fileWorkspaceFolder should respect current opened file #434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stevearc merged 1 commit into from
Nov 18, 2025
Merged

fix: fileWorkspaceFolder should respect current opened file #434

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions lua/overseer/vscode/variables.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ M.get_selected_text = function()
return table.concat(lines, "\n")
end

local function get_workspace_folder()
local vscode_dir =
vim.fs.find(".vscode", { upward = true, type = "directory", path = vim.fn.getcwd() })[1]
local function get_workspace_folder(path)
local vscode_dir = vim.fs.find(".vscode", { upward = true, type = "directory", path = path })[1]
if vscode_dir then
return vim.fs.dirname(vscode_dir)
else
Expand All @@ -46,7 +45,7 @@ M.precalculate_vars = function()
workspaceFolder = get_workspace_folder(),
workspaceFolderBasename = vim.fs.basename(vim.fn.getcwd()),
file = vim.fn.expand("%:p"),
fileWorkspaceFolder = get_workspace_folder(),
fileWorkspaceFolder = get_workspace_folder(vim.fn.expand("%:p:h")),
relativeFile = vim.fn.expand("%:."),
relativeFileDirname = vim.fn.expand("%:.:h"),
fileBasename = vim.fn.expand("%:t"),
Expand Down Expand Up @@ -88,7 +87,7 @@ M.replace_vars = function(str, params, precalculated_vars)
elseif name == "file" then
return vim.fn.expand("%:p")
elseif name == "fileWorkspaceFolder" then
return get_workspace_folder()
return get_workspace_folder(vim.fn.expand("%:p:h"))
elseif name == "relativeFile" then
return vim.fn.expand("%:.")
elseif name == "relativeFileDirname" then
Expand Down