Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Metals Tree View Protocol support. #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added icons/vscode/metals/book-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/book-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/bug-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/bug-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/class.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/enum.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/field.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/github-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/github-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/gitter-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/gitter-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/interface.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/issue-opened-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/issue-opened-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/method.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/object.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/trait.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/twitter-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/twitter-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/val.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/vscode/metals/var.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
182 changes: 182 additions & 0 deletions lsp-treemacs-tvp.el
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
;;; lsp-treemacs-tvp.el --- LSP Tree View Protocol -*- lexical-binding: t; -*-

;; Copyright (C) 2019 Evgeny Kurnevsky

;; Author: Evgeny Kurnevsky
;; Keywords: languages

;; This program is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.

;; This program is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <https://www.gnu.org/licenses/>.

;;; Commentary:

;; Metals Tree View Protocol implementation

;;; Code:
(require 'treemacs)
(require 'treemacs-extensions)
(require 'treemacs-icons)

(require 'lsp-mode)

(defgroup lsp-treemacs-tvp nil
"LSP Tree View Protocol."
:group 'lsp-treemacs
:link '(url-link "https://scalameta.org/metals/docs/editors/tree-view-protocol.html")
:package-version '(lsp-treemacs . "0.1"))

(defcustom lsp-treemacs-tvp-theme 'Metals-light
"The theme for Tree View icons."
:group 'lsp-treemacs-tvp
:type '(choice
(const :tag "Light" 'Metals-light)
(const :tag "Dark" 'Metals-dark))
:package-version '(lsp-treemacs . "0.1"))

(treemacs-create-theme "Metals"
:icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode/metals")
:config
(progn
(treemacs-create-icon :file "class.png" :extensions (class) :fallback "-")
(treemacs-create-icon :file "enum.png" :extensions (enum) :fallback "-")
(treemacs-create-icon :file "field.png" :extensions (field) :fallback "-")
(treemacs-create-icon :file "interface.png" :extensions (interface) :fallback "-")
(treemacs-create-icon :file "method.png" :extensions (method) :fallback "-")
(treemacs-create-icon :file "object.png" :extensions (object) :fallback "-")
(treemacs-create-icon :file "trait.png" :extensions (trait) :fallback "-")
(treemacs-create-icon :file "val.png" :extensions (val) :fallback "-")
(treemacs-create-icon :file "var.png" :extensions (var) :fallback "-")))

(treemacs-create-theme "Metals-dark"
:icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode/metals")
:config
(progn
(treemacs-create-icon :file "book-dark.png" :extensions (book) :fallback "-")
(treemacs-create-icon :file "bug-dark.png" :extensions (bug) :fallback "-")
(treemacs-create-icon :file "github-dark.png" :extensions (github) :fallback "-")
(treemacs-create-icon :file "gitter-dark.png" :extensions (gitter) :fallback "-")
(treemacs-create-icon :file "issue-opened-dark.png" :extensions (issue-opened) :fallback "-")
(treemacs-create-icon :file "twitter-dark.png" :extensions (twitter) :fallback "-")))

(treemacs-create-theme "Metals-light"
:icon-directory (f-join (f-dirname (or load-file-name buffer-file-name)) "icons/vscode/metals")
:config
(progn
(treemacs-create-icon :file "book-light.png" :extensions (book) :fallback "-")
(treemacs-create-icon :file "bug-light.png" :extensions (bug) :fallback "-")
(treemacs-create-icon :file "github-light.png" :extensions (github) :fallback "-")
(treemacs-create-icon :file "gitter-light.png" :extensions (gitter) :fallback "-")
(treemacs-create-icon :file "issue-opened-light.png" :extensions (issue-opened) :fallback "-")
(treemacs-create-icon :file "twitter-light.png" :extensions (twitter) :fallback "-")))

(defun lsp-treemacs-workspace-at-point ()
"Find the LSP workspace at the point in the treemacs buffer."
(lsp-find-workspace 'metals (treemacs-project->path (treemacs-project-at-point))))

(defun lsp-treemacs-tvp--children (viewId &optional nodeUri)
"Get children for NODEURI with VIEWID."
(with-lsp-workspace (lsp-treemacs-workspace-at-point)
(append (ht-get (lsp-request "metals/treeViewChildren" `(:viewId ,viewId
:nodeUri ,nodeUri)) "nodes") nil)))

(defun lsp-treemacs-tvp--ret-action (&rest _)
"Tree View RET action."
(with-lsp-workspace (lsp-treemacs-workspace-at-point)
(let ((command (treemacs--prop-at-point :command)))
(pcase (ht-get command "command")
(`"metals-echo-command" (lsp-send-execute-command (elt (ht-get command "arguments") 0)))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seq-first instead of elt

(`"metals.goto" (lsp-send-execute-command "goto" (ht-get command "arguments")))
(`"build-connect" (lsp-send-execute-command "build-connect"))
(`"build-import" (lsp-send-execute-command "build-import"))
(`"compile-cascade" (lsp-send-execute-command "compile-cascade"))
(`"compile-cancel" (lsp-send-execute-command "compile-cancel"))
(c (lsp-warn "Unknown metals Tree View command: %s" c))))))

(defun lsp-treemacs-tvp--icon (name &optional default)
"Get the icon for the NAME.
Return DEFAULT if there is no such icon."
(pcase name
(`"class" (treemacs-get-icon-value 'class nil 'Metals))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move the 'Metals theme icons into the dark and light theme and then use only lsp-treemacs-tvp-theme? This will allow you remove the switch and do (treemacs-get-icon-value (intern name) nil lsp-treemacs-tvp-theme) and it will make the creation of themes easier(no hardcoded themes).

(`"enum" (treemacs-get-icon-value 'enum nil 'Metals))
(`"field" (treemacs-get-icon-value 'field nil 'Metals))
(`"interface" (treemacs-get-icon-value 'interface nil 'Metals))
(`"method" (treemacs-get-icon-value 'method nil 'Metals))
(`"object" (treemacs-get-icon-value 'object nil 'Metals))
(`"trait" (treemacs-get-icon-value 'trait nil 'Metals))
(`"val" (treemacs-get-icon-value 'val nil 'Metals))
(`"var" (treemacs-get-icon-value 'var nil 'Metals))
(`"book" (treemacs-get-icon-value 'book nil lsp-treemacs-tvp-theme))
(`"bug" (treemacs-get-icon-value 'bug nil lsp-treemacs-tvp-theme))
(`"github" (treemacs-get-icon-value 'github nil lsp-treemacs-tvp-theme))
(`"gitter" (treemacs-get-icon-value 'gitter nil lsp-treemacs-tvp-theme))
(`"issue-opened" (treemacs-get-icon-value 'issue-opened nil lsp-treemacs-tvp-theme))
(`"twitter" (treemacs-get-icon-value 'twitter nil lsp-treemacs-tvp-theme))
(_ default)))

(treemacs-define-leaf-node tvp-leaf 'dynamic-icon
:ret-action #'lsp-treemacs-tvp--ret-action)

(treemacs-define-expandable-node tvp-node
:icon-open-form (lsp-treemacs-tvp--icon (treemacs-button-get node :icon) (treemacs-as-icon " ▾ "))
:icon-closed-form (lsp-treemacs-tvp--icon (treemacs-button-get node :icon) (treemacs-as-icon " ▸ "))
:ret-action #'lsp-treemacs-tvp--ret-action
:query-function (lsp-treemacs-tvp--children (treemacs-button-get node :viewId) (treemacs-button-get node :nodeUri))
:render-action (treemacs-render-node
:icon (lsp-treemacs-tvp--icon (ht-get item "icon") (if (ht-get item "collapseState")
(treemacs-as-icon " ▸ ")
(treemacs-as-icon " • ")))
:label-form (ht-get item "label")
:state (if (ht-get item "collapseState")
treemacs-tvp-node-closed-state
treemacs-tvp-leaf-state)
:face 'default
:key-form (ht-get item "nodeUri")
:more-properties (:viewId (ht-get item "viewId")
:nodeUri (ht-get item "nodeUri")
:command (ht-get item "command")
:icon (ht-get item "icon"))))

(treemacs-define-expandable-node tvp-root
:icon-open (treemacs-as-icon " ▾ ")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you use the expanded/collapsed icons like symbols/deps list views? This will make the lsp-treemacs related views consistent and also it will allow defining themes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please ignore that comment. I will do the opposite - will stitch the rest of the controls to use these symbols.

:icon-closed (treemacs-as-icon " ▸ ")
:query-function `(,(ht ("label" "Build") ("viewId" "metalsBuild"))
,(ht ("label" "Compile") ("viewId" "metalsCompile"))
,(ht ("label" "Help") ("viewId" "metalsHelp")))
:render-action (treemacs-render-node
:icon (treemacs-as-icon " ▸ ")
:label-form (ht-get item "label")
:state treemacs-tvp-node-closed-state
:face 'default
:key-form (ht-get item "label")
:more-properties (:viewId (ht-get item "viewId")
:nodeUri (ht-get item "nodeUri")))
:root-marker t
:root-label "Tree View"
:root-face 'default
:root-key-form 'TreeView)

(defun lsp-treemacs-tvp--predicate (project)
"Check if the Metals Tree View should be displayed for the PROJECT."
(lsp-find-workspace 'metals (treemacs-project->path project)))

(treemacs-define-project-extension
:extension #'treemacs-TVP-ROOT-extension
:predicate #'lsp-treemacs-tvp--predicate
:position 'top)

(provide 'lsp-treemacs-tvp)
;;; lsp-treemacs-tvp.el ends here

;; Local Variables:
;; flycheck-disabled-checkers: (emacs-lisp-checkdoc)
;; End:
1 change: 1 addition & 0 deletions lsp-treemacs.el
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
(require 'treemacs-icons)

(require 'lsp-mode)
(require 'lsp-treemacs-tvp)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed. Let users explicitly require it.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that this is the only thing in the review blocking the merge.


(defconst lsp-treemacs-deps-buffer-name "*Java Dependency List*")

Expand Down