Skip to content

Commit 86d7e5d

Browse files
authored
Remove lsp-mode-line, implement modeline using built in capabilities (#2297)
* Remove lsp-mode-line, implement modeline using built in capabilities * Ignore lsp--cur-workspace in mode lighter
1 parent f306b1a commit 86d7e5d

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

lsp-mode.el

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2580,7 +2580,12 @@ an Elisp regexp."
25802580
(define-minor-mode lsp-mode ""
25812581
nil nil nil
25822582
:keymap lsp-mode-map
2583-
:lighter (:eval (lsp-mode-line))
2583+
:lighter
2584+
'(" LSP["
2585+
(lsp--buffer-workspaces
2586+
(:eval (mapconcat #'lsp--workspace-print lsp--buffer-workspaces "]["))
2587+
(:propertize "Disconnected" face warning))
2588+
"]")
25842589
:group 'lsp-mode)
25852590

25862591
(defvar lsp-mode-menu
@@ -2625,13 +2630,6 @@ an Elisp regexp."
26252630
:filter ,(lambda (_) (nthcdr 3 dap-ui-menu-items)))))
26262631
"Menu for lsp-mode.")
26272632

2628-
(defun lsp-mode-line ()
2629-
"Construct the mode line text."
2630-
(if-let ((workspaces (lsp-workspaces)))
2631-
(concat " LSP" (string-join (--map (format "[%s]" (lsp--workspace-print it))
2632-
workspaces)))
2633-
(concat " LSP" (propertize "[Disconnected]" 'face 'warning))))
2634-
26352633
(defalias 'make-lsp-client 'make-lsp--client)
26362634

26372635
(cl-defstruct lsp--registered-capability

0 commit comments

Comments
 (0)