|
45 | 45 | (defvar cider-browse-ns-mode-map
|
46 | 46 | (let ((map (make-sparse-keymap)))
|
47 | 47 | (set-keymap-parent map cider-popup-buffer-mode-map)
|
48 |
| - (define-key map "d" #'cider-browse-ns-doc-at-point) |
49 |
| - (define-key map "s" #'cider-browse-ns-find-at-point) |
50 |
| - (define-key map [return] #'cider-browse-ns-doc-at-point) |
| 48 | + (define-key map "d" #'cider-browse-ns--doc-at-point) |
| 49 | + (define-key map "s" #'cider-browse-ns--find-at-point) |
| 50 | + (define-key map [return] #'cider-browse-ns--doc-at-point) |
51 | 51 | (define-key map "^" #'cider-browse-ns-all)
|
52 | 52 | (define-key map "n" #'next-line)
|
53 | 53 | (define-key map "p" #'previous-line)
|
54 | 54 | map))
|
55 | 55 |
|
56 | 56 | (defvar cider-browse-ns-mouse-map
|
57 | 57 | (let ((map (make-sparse-keymap)))
|
58 |
| - (define-key map [mouse-1] #'cider-browse-ns-handle-mouse) |
| 58 | + (define-key map [mouse-1] #'cider-browse-ns--handle-mouse) |
59 | 59 | map))
|
60 | 60 |
|
61 | 61 | (define-derived-mode cider-browse-ns-mode special-mode "browse-ns"
|
|
68 | 68 | (setq-local truncate-lines t)
|
69 | 69 | (setq-local cider-browse-ns-current-ns nil))
|
70 | 70 |
|
71 |
| -(defun cider-browse-ns-properties (text) |
| 71 | +(defun cider-browse-ns--properties (text) |
72 | 72 | "Decorate TEXT with a clickable keymap and function face."
|
73 | 73 | (propertize text
|
74 | 74 | 'font-lock-face 'font-lock-function-name-face
|
75 | 75 | 'mouse-face 'highlight
|
76 | 76 | 'keymap cider-browse-ns-mouse-map))
|
77 | 77 |
|
78 |
| -(defun cider-browse-ns-list (buffer title items) |
| 78 | +(defun cider-browse-ns--list (buffer title items) |
79 | 79 | "Reset contents of BUFFER. Then display TITLE at the top and ITEMS are indented underneath."
|
80 | 80 | (with-current-buffer buffer
|
81 | 81 | (cider-browse-ns-mode)
|
|
96 | 96 | (interactive (list (completing-read "Browse namespace: " (cider-sync-request:ns-list))))
|
97 | 97 | (with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
|
98 | 98 | (let ((vars (cider-sync-request:ns-vars namespace)))
|
99 |
| - (cider-browse-ns-list (current-buffer) |
| 99 | + (cider-browse-ns--list (current-buffer) |
100 | 100 | namespace
|
101 | 101 | (mapcar (lambda (var)
|
102 | 102 | (format "%s"
|
103 |
| - (cider-browse-ns-properties var))) |
| 103 | + (cider-browse-ns--properties var))) |
104 | 104 | vars))
|
105 | 105 | (setq-local cider-browse-ns-current-ns namespace))))
|
106 | 106 |
|
|
110 | 110 | (interactive)
|
111 | 111 | (with-current-buffer (cider-popup-buffer cider-browse-ns-buffer t)
|
112 | 112 | (let ((names (cider-sync-request:ns-list)))
|
113 |
| - (cider-browse-ns-list (current-buffer) |
114 |
| - "All loaded namespaces" |
115 |
| - (mapcar (lambda (name) |
116 |
| - (cider-browse-ns-properties name)) |
117 |
| - names)) |
| 113 | + (cider-browse-ns--list (current-buffer) |
| 114 | + "All loaded namespaces" |
| 115 | + (mapcar (lambda (name) |
| 116 | + (cider-browse-ns--properties name)) |
| 117 | + names)) |
118 | 118 | (setq-local cider-browse-ns-current-ns nil))))
|
119 | 119 |
|
120 | 120 | (defun cider-browse-ns--var-at-point ()
|
121 | 121 | (let ((line (buffer-substring-no-properties (line-beginning-position) (line-end-position))))
|
122 | 122 | (when (string-match " +\\(.+\\)" line)
|
123 | 123 | (format "%s/%s" cider-browse-ns-current-ns (match-string 1 line)))))
|
124 | 124 |
|
125 |
| -(defun cider-browse-ns-doc-at-point () |
| 125 | +(defun cider-browse-ns--doc-at-point () |
126 | 126 | "Expand browser according to thing at current point."
|
127 | 127 | (interactive)
|
128 | 128 | (-when-let (var (cider-browse-ns--var-at-point))
|
129 |
| - (cider-doc-lookup var))) |
| 129 | + ((cider-doc-lookup var)))) |
130 | 130 |
|
131 |
| -(defun cider-browse-ns-find-at-point () |
| 131 | +(defun cider-browse-ns--find-at-point () |
132 | 132 | (interactive)
|
133 | 133 | (when-let (var (cider-browse-ns--var-at-point))
|
134 | 134 | (cider-find-var current-prefix-arg var)))
|
135 | 135 |
|
136 |
| -(defun cider-browse-ns-handle-mouse (event) |
| 136 | +(defun cider-browse-ns--handle-mouse (event) |
137 | 137 | "Handle mouse click EVENT."
|
138 | 138 | (interactive "e")
|
139 |
| - (cider-browse-ns-doc-at-point)) |
| 139 | + (cider-browse-ns--doc-at-point)) |
140 | 140 |
|
141 | 141 | (provide 'cider-browse-ns)
|
142 | 142 |
|
|
0 commit comments