diff options
author | Yuchen Pei <hi@ypei.me> | 2022-10-05 10:32:41 +1100 |
---|---|---|
committer | Yuchen Pei <hi@ypei.me> | 2022-10-05 10:32:41 +1100 |
commit | 3de0aca80d056901b4c355942e33581ec3ce7acb (patch) | |
tree | 24d31a759efbec579430f1acc64e90bd43b5e61b /hcel-results.el | |
parent | dfa70bf16724a5a29e054af89fcf126438181e38 (diff) |
clarifying names w.r.t identifiers
- identifier should refer to an IdentifierInfo type on server
- internal-id <-> InternalId
- external-id <-> ExternalId
Diffstat (limited to 'hcel-results.el')
-rw-r--r-- | hcel-results.el | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/hcel-results.el b/hcel-results.el index 75b35a0..1e0dbb0 100644 --- a/hcel-results.el +++ b/hcel-results.el @@ -103,7 +103,8 @@ "hcel refs number of results per page." :group 'hcel-refs :type '(natnum)) -(defvar-local hcel-refs-id nil) +(defvar-local hcel-refs-id nil + "External ID of the identifier we are looking for refs in the current buffer") (defvar-local hcel-refs-package-id nil) (define-compilation-mode hcel-refs-mode "hcel-refs" @@ -209,24 +210,25 @@ Start by choosing a package." "Find references of the identifier at point." (interactive) (hcel-find-references-internal hcel-package-id hcel-module-path - (hcel-text-property-near-point 'identifier))) + (hcel-text-property-near-point 'internal-id))) (define-key hcel-mode-map (kbd "M-?") #'hcel-find-references-at-point) -(defun hcel-find-references-internal (package-id module-path identifier) - (when (and package-id module-path identifier) +(defun hcel-find-references-internal (package-id module-path internal-id) + (when (and package-id module-path internal-id) (let ((hcel-buffer (hcel-buffer-name package-id module-path))) (when (or (get-buffer hcel-buffer) (and (y-or-n-p "Open module source?") (hcel-load-module-source package-id module-path)))) (with-current-buffer hcel-buffer - (when-let* ((id (alist-get - 'externalId - (alist-get (intern identifier) hcel-identifiers))) - (buffer-name (hcel-refs-format-id id))) + (when-let* ((external-id + (alist-get + 'externalId + (alist-get (intern internal-id) hcel-identifiers))) + (buffer-name (hcel-refs-format-id external-id))) (with-current-buffer (get-buffer-create buffer-name) (hcel-refs-mode) - (setq hcel-refs-id id) + (setq hcel-refs-id external-id) (hcel-refs-update-references-package)) (switch-to-buffer-other-window buffer-name)))))) ;; hcel-ids-mode @@ -286,7 +288,7 @@ Start by choosing a package." (concat (propertize (format "%s :: %s\n" - (alist-get 'demangledOccName result) + (alist-get 'occName result) (hcel-render-id-type (alist-get 'idType result))) 'location-info location-info 'match-line t) |