Skip to content

refactor(references.lua): move pipe chain column resolution logic before target definition check #596

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
jalvesaq merged 1 commit into from
Jun 23, 2026
Merged

refactor(references.lua): move pipe chain column resolution logic before target definition check #596

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
21 changes: 10 additions & 11 deletions lua/r/lsp/references.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,18 @@ function M.find_locations(line, col, bufnr)
return { locations = locs, word = word, resolved = false }
end

local pipe = require("r.lsp.pipe")
local pipe_locs = pipe.find_locations(bufnr, row, col, word)
if pipe_locs and #pipe_locs > 0 then
return {
locations = utils.deduplicate_locations(pipe_locs),
word = word,
resolved = true,
}
end

local target_definition = scope.resolve_symbol(word, current_scope)
if not target_definition then
-- Try pipe chain column resolution (tidyverse data-masking)
local pipe = require("r.lsp.pipe")
local pipe_locs = pipe.find_locations(bufnr, row, col, word)
if pipe_locs and #pipe_locs > 0 then
return {
locations = utils.deduplicate_locations(pipe_locs),
word = word,
resolved = true,
}
end

local locs = collect_workspace_references(word, bufnr)
return { locations = locs, word = word, resolved = false }
end
Expand Down
Loading