Skip to content

Commit 8f8e244

Browse files
author
Carlos Noguera
committed
wip fix object explorer lsp treemacs
- see emacs-lsp/lsp-treemacs#137 (comment)
1 parent e7b903e commit 8f8e244

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

lsp-mssql.el

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929

3030
(require 'lsp-mode)
3131
(require 'lsp-treemacs)
32+
(require 'lsp-treemacs-generic)
3233
(require 'gnutls)
3334

3435
(defgroup lsp-mssql nil
@@ -205,7 +206,7 @@ PARAMS Session created handler."
205206
(prog1 (save-excursion
206207
(let ((inhibit-read-only t))
207208
,@body))
208-
(org-show-all '(headings blocks)))))
209+
(org-fold-show-all '(headings blocks)))))
209210

210211
(defun lsp-mssql--connection-complete (_workspace params)
211212
"Connection completed handler.
@@ -367,7 +368,7 @@ PARAMS the params."
367368
"Hanler for batch complete.")
368369

369370
(defun lsp-mssql--complete (_workspace _params)
370-
"Hanler for complete."
371+
"Handler for complete."
371372
(lsp-mssql-with-result-buffer))
372373

373374
(defvar-local lsp-mssql--markers (ht))
@@ -663,14 +664,19 @@ NODES - all nodes."
663664
"Show explorer.
664665
TREE is the data to display, TITLE will be used for the
665666
modeline in the result buffer."
666-
(with-current-buffer (get-buffer-create "*SQL Object explorer*")
667-
(lsp-treemacs-initialize)
668-
(setq-local lsp-treemacs-tree tree)
669-
(setq-local face-remapping-alist '((button . default)))
670-
(lsp-treemacs-generic-refresh)
671-
(display-buffer-in-side-window (current-buffer) '((side . right)))
672-
(setq-local mode-name title)
673-
(lsp-mssql-object-explorer-mode)))
667+
(lsp-treemacs-render tree title 0
668+
"*SQL Object explorer*" nil)
669+
(with-current-buffer "*SQL Object explorer*"
670+
(display-buffer-in-side-window (current-buffer) '((side . right)))
671+
(lsp-mssql-object-explorer-mode)))
672+
673+
;; - (with-current-buffer (get-buffer-create "*SQL Object explorer*")
674+
;; - (lsp-treemacs-initialize)
675+
;; - (setq-local lsp-treemacs-tree tree)
676+
;; - (setq-local face-remapping-alist '((button . default)))
677+
;; - (lsp-treemacs-generic-refresh);; -
678+
;; - (setq-local mode-name title)
679+
674680

675681

676682

0 commit comments

Comments
 (0)