Skip to content

Document highlight refactor #911

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
davidanthoff merged 4 commits into from
May 20, 2021
Merged

Document highlight refactor #911

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43d8aa2
refactor
pfitzseb Mar 15, 2021
d9c6239
Merge branch 'master' into sp/document-highlight
davidanthoff Mar 17, 2021
5d516cf
Merge branch 'master' into sp/document-highlight
pfitzseb May 20, 2021
3a549f6
fix tests
pfitzseb May 20, 2021
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
15 changes: 10 additions & 5 deletions src/requests/features.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,19 +126,24 @@ function find_references(textDocument::TextDocumentIdentifier, position::Positio
locations = Location[]
doc = getdocument(server, URI2(textDocument.uri))
offset = get_offset(doc, position)
x = get_identifier(getcst(doc), offset)
x = get_expr1(getcst(doc), offset)
for_each_ref(x) do r, doc1, o
push!(locations, Location(doc1._uri, Range(doc1, o .+ (0:r.span))))
end
return locations
end

if x isa EXPR && StaticLint.hasref(x) && refof(x) isa StaticLint.Binding
for r in refof(x).refs
function for_each_ref(f, identifier::EXPR)
if identifier isa EXPR && StaticLint.hasref(identifier) && refof(identifier) isa StaticLint.Binding
for r in refof(identifier).refs
if r isa EXPR
doc1, o = get_file_loc(r)
if doc1 isa Document
push!(locations, Location(doc1._uri, Range(doc1, o .+ (0:r.span))))
f(r, doc1, o)
end
end
end
end
return locations
end

function textDocument_references_request(params::ReferenceParams, server::LanguageServerInstance, conn)
Expand Down
11 changes: 4 additions & 7 deletions src/requests/highlight.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ function textDocument_documentHighlight_request(params::DocumentHighlightParams,
identifier = get_identifier(getcst(doc), offset)
identifier !== nothing || return nothing
highlights = DocumentHighlight[]
if StaticLint.hasref(identifier) && refof(identifier) isa StaticLint.Binding
for ref in refof(identifier).refs
doc1, o = get_file_loc(ref)
if ref isa EXPR && doc1._uri == doc._uri
kind = StaticLint.hasbinding(ref) ? DocumentHighlightKinds.Write : DocumentHighlightKinds.Read
push!(highlights, DocumentHighlight(Range(doc, o .+ (0:ref.span)), kind))
end
for_each_ref(identifier) do ref, doc1, o
if doc1._uri == doc._uri
kind = StaticLint.hasbinding(ref) ? DocumentHighlightKinds.Write : DocumentHighlightKinds.Read
push!(highlights, DocumentHighlight(Range(doc, o .+ (0:ref.span)), kind))
end
end
return isempty(highlights) ? nothing : highlights
Expand Down