|
118 | 118 | (cons string face) |
119 | 119 | (cons string face))) |
120 | 120 |
|
121 | | -(eval-when-compile |
122 | | - (lsp-interface |
123 | | - (lsp-ivy:FormattedSymbolInformation |
124 | | - (:kind :name :location :textualRepresentation) |
125 | | - (:containerName :deprecated)))) |
126 | | - |
127 | | -(lsp-defun lsp-ivy--workspace-symbol-action |
| 121 | +(lsp-defun lsp-ivy--workspace-goto-symbol |
128 | 122 | ((&SymbolInformation |
129 | 123 | :location (&Location :uri :range (&Range :start (&Position :line :character))))) |
130 | 124 | "Jump to selected candidate." |
@@ -156,8 +150,7 @@ FILTER-REGEXPS?, otherwise convert it to an `lsp-ivy:FormattedSymbolInformation' |
156 | 150 | (let ((textual-representation |
157 | 151 | (lsp-ivy--format-symbol-match symbol-information workspace-root))) |
158 | 152 | (when (--all? (string-match-p it textual-representation) filter-regexps?) |
159 | | - (lsp-put symbol-information :textualRepresentation textual-representation) |
160 | | - symbol-information)))) |
| 153 | + (cons textual-representation symbol-information))))) |
161 | 154 |
|
162 | 155 | (defun lsp-ivy--workspace-symbol (workspaces prompt initial-input) |
163 | 156 | "Search against WORKSPACES with PROMPT and INITIAL-INPUT." |
@@ -194,14 +187,9 @@ FILTER-REGEXPS?, otherwise convert it to an `lsp-ivy:FormattedSymbolInformation' |
194 | 187 | :dynamic-collection t |
195 | 188 | :require-match t |
196 | 189 | :initial-input initial-input |
197 | | - :action #'lsp-ivy--workspace-symbol-action |
| 190 | + :action (lambda (c) (lsp-ivy--workspace-goto-symbol (cdr c))) |
198 | 191 | :caller 'lsp-ivy-workspace-symbol))) |
199 | 192 |
|
200 | | -(ivy-configure 'lsp-ivy-workspace-symbol |
201 | | - :display-transformer-fn |
202 | | - (-lambda ((&lsp-ivy:FormattedSymbolInformation :textual-representation)) |
203 | | - textual-representation)) |
204 | | - |
205 | 193 | ;;;###autoload |
206 | 194 | (defun lsp-ivy-workspace-symbol (arg) |
207 | 195 | "`ivy' for lsp workspace/symbol. |
|
0 commit comments