Skip to content

Add configuration for excluding declarations from xrefs/references #3655

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
yyoncho merged 2 commits into from
Aug 5, 2022
Merged

Add configuration for excluding declarations from xrefs/references #3655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ef9c55
Add configuration for excluding declarations from xrefs/references
deejayem Aug 4, 2022
2c2548c
Merge branch 'master' into add-configuration-for-excluding-declaratio…
deejayem Aug 5, 2022
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
2 changes: 1 addition & 1 deletion CHANGELOG.org
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* Add setting UPDATE_EXPECT=1 when running `expect!` tests ~lsp-rust~
* Add ~lsp-use-workspace-root-for-server-default-directory~.
* Add [[https://github.com/artempyanykh/marksman][marksman]] support.
* ~lsp-find-references~ to include declaration by default
* ~lsp-find-references~ to include declaration by default (configurable with ~lsp-references-exclude-definition~)
* Add [[https://github.com/ruby-syntax-tree/syntax_tree][syntax_tree]] support for Ruby code.
** Release 8.0.0
* Add ~lsp-clients-angular-node-get-prefix-command~ to get the Angular server from another location which is still has ~/lib/node_modules~ in it.
Expand Down
9 changes: 7 additions & 2 deletions lsp-mode.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,11 @@ If this is set to nil, `eldoc' will show only the symbol information."
:type 'boolean
:group 'lsp-mode)

(defcustom lsp-references-exclude-definition nil
"If non-nil, exclude declarations when finding references."
:type 'boolean
:group 'lsp-mode)

(defcustom lsp-enable-indentation t
"Indent regions using the file formatting functionality provided by the
language server."
Expand Down Expand Up @@ -5984,7 +5989,7 @@ perform the request synchronously."
(goto-char (cl-rest (or (assoc identifier lsp--symbols-cache)
(user-error "Unable to find symbol %s" identifier)))))
(lsp--locations-to-xref-items (lsp-request "textDocument/references"
(lsp--make-reference-params)))))
(lsp--make-reference-params nil lsp-references-exclude-definition)))))

(cl-defmethod xref-backend-apropos ((_backend (eql xref-lsp)) pattern)
(seq-map #'lsp--symbol-information-to-xref
Expand Down Expand Up @@ -6155,7 +6160,7 @@ REFERENCES? t when METHOD returns references."
"Find references of the symbol under point."
(interactive "P")
(lsp-find-locations "textDocument/references"
(list :context `(:includeDeclaration ,(lsp-json-bool (not exclude-declaration))))
(list :context `(:includeDeclaration ,(lsp-json-bool (not (or exclude-declaration lsp-references-exclude-definition)))))
:display-action display-action
:references? t))

Expand Down