Skip to content

Commit 3adf416

Browse files
authored
Merge pull request #10 from kurnevsky/derived-modes
Use derived modes instead of setting mode-line-format
2 parents 9690853 + 312dc87 commit 3adf416

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

lsp-treemacs.el

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,9 @@
331331
:keymap lsp-treemacs-error-list-mode-map
332332
:group 'lsp-treeemacs)
333333

334+
(define-derived-mode lsp-treemacs-errors-mode treemacs-mode "LSP Errors View"
335+
"A major mode for displaying LSP Errors.")
336+
334337
;;;###autoload
335338
(defun lsp-treemacs-errors-list ()
336339
"Display error list."
@@ -345,12 +348,12 @@
345348
(select-window window)
346349
(set-window-dedicated-p window t)
347350
(treemacs-initialize)
351+
(lsp-treemacs-errors-mode)
348352
(lsp-treemacs-error-list-mode 1)
349353

350354
(setq-local treemacs-default-visit-action 'treemacs-RET-action)
351355

352356
(treemacs-LSP-ERROR-LIST-extension)
353-
(setq-local mode-line-format (propertize "LSP Errors View" 'face 'shadow))
354357

355358
(add-hook 'lsp-diagnostics-updated-hook #'lsp-treemacs--after-diagnostics)
356359
(add-hook 'kill-buffer-hook 'lsp-treemacs--kill-buffer nil t))))
@@ -580,6 +583,9 @@
580583
(defun lsp-treemacs--kill-symbols-buffer ()
581584
(and lsp-treemacs--symbols-timer (cancel-timer lsp-treemacs--symbols-timer)))
582585

586+
(define-derived-mode lsp-treemacs-symbols-mode treemacs-mode "LSP Symbols View"
587+
"A major mode for displaying LSP Symbols.")
588+
583589
;;;###autoload
584590
(defun lsp-treemacs-symbols ()
585591
"Show symbols view."
@@ -592,10 +598,10 @@
592598
(select-window window)
593599
(set-window-dedicated-p window t)
594600
(treemacs-initialize)
601+
(lsp-treemacs-symbols-mode)
595602
(setq-local treemacs-default-visit-action 'treemacs-RET-action)
596603
(treemacs-LSP-SYMBOLS-LIST-extension)
597604
(setq lsp-treemacs--symbols-timer (run-at-time 0 1.0 #'lsp-treemacs--update))
598-
(setq-local mode-line-format (propertize "LSP Symbols View" 'face 'shadow))
599605
(add-hook 'kill-buffer-hook 'lsp-treemacs--kill-symbols-buffer nil t)))
600606
(with-current-buffer original-buffer (lsp-treemacs--update))))
601607

@@ -744,6 +750,9 @@
744750
(lsp--info "Refresh completed")))
745751
(error)))
746752

753+
(define-derived-mode lsp-treemacs-java-deps-mode treemacs-mode "Java Dependencies"
754+
"A major mode for displaying Java Dependencies.")
755+
747756
;;;###autoload
748757
(defun lsp-treemacs-java-deps-list ()
749758
"Display error list."
@@ -757,9 +766,9 @@
757766
(select-window window)
758767
(set-window-dedicated-p window t)
759768
(treemacs-initialize)
769+
(lsp-treemacs-java-deps-mode)
760770
(lsp-treemacs-deps-list-mode t)
761771
(setq-local treemacs-default-visit-action 'treemacs-RET-action)
762-
(setq-local mode-line-format (propertize "Java Dependencies" 'face 'shadow))
763772
(treemacs-LSP-TREEMACS-DEPS-LIST-extension))))
764773

765774
(defun lsp-treemacs--deps-find-children-for-key (node key)

0 commit comments

Comments
 (0)