Skip to content

fix(lsp): use regex for pub workspace detection instead of YAML parsing #516

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
sidlatau merged 1 commit into from
Jan 14, 2026
Merged

fix(lsp): use regex for pub workspace detection instead of YAML parsing #516

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
42 changes: 21 additions & 21 deletions lua/flutter-tools/utils/path.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,36 +117,32 @@ local function find_nearest_root(patterns, startpath)
return M.search_ancestors(startpath, matcher)
end

---@param pubspec_path string
---@return table|nil
local function parse_pubspec(pubspec_path)
if not M.is_file(pubspec_path) then return nil end
local content = vim.fn.readfile(pubspec_path)
if not content or #content == 0 then return nil end
local joined_content = table.concat(content, "\n")
local ok, parsed = pcall(
function() return require("flutter-tools.utils.yaml_parser").parse(joined_content) end
)
if ok and parsed then return parsed end
return nil
end

--- Checks for `resolution: workspace` in pubspec.yaml
--- Pattern matches VS Code Dart extension: /^resolution\s*:\s*workspace/im
---@param pubspec_path string
---@return boolean
local function is_pub_workspace_member(pubspec_path)
local pubspec = parse_pubspec(pubspec_path)
if not pubspec then return false end
return pubspec.resolution == "workspace"
if not M.is_file(pubspec_path) then return false end
local content = vim.fn.readfile(pubspec_path)
if not content then return false end
for _, line in ipairs(content) do
if line:lower():match("^resolution%s*:%s*workspace") then return true end
end
return false
end

--- Checks for `workspace:` field in pubspec.yaml
--- Pattern matches VS Code Dart extension: /^workspace\s*:/im
---@param pubspec_path string
---@return boolean
local function is_pub_workspace_root(pubspec_path)
local pubspec = parse_pubspec(pubspec_path)
if not pubspec then return false end
return pubspec.workspace ~= nil
if not M.is_file(pubspec_path) then return false end
local content = vim.fn.readfile(pubspec_path)
if not content then return false end
for _, line in ipairs(content) do
if line:lower():match("^workspace%s*:") then return true end
end
return false
end

--- Find project root, traversing up to workspace root if in a pub workspace
Expand All @@ -164,8 +160,12 @@ function M.find_root(patterns, startpath)
local parent = M.dirname(root)
if not parent or parent == root then return root end

-- Check parent directly first (iterate_parents skips the starting path)
local workspace_pubspec = M.join(parent, "pubspec.yaml")
if is_pub_workspace_root(workspace_pubspec) then return parent end

for dir in M.iterate_parents(parent) do
local workspace_pubspec = M.join(dir, "pubspec.yaml")
workspace_pubspec = M.join(dir, "pubspec.yaml")
if is_pub_workspace_root(workspace_pubspec) then return dir end
end

Expand Down
Loading