Improving documentation and treemacs/browse classpath

Author: yyoncho

README.md

@@ -1,6 +1,7 @@
 [![MELPA](https://melpa.org/packages/lsp-java-badge.svg)](https://melpa.org/#/lsp-java)
 [![Build Status](https://travis-ci.com/emacs-lsp/lsp-java.svg?branch=master)](https://travis-ci.com/emacs-lsp/lsp-java)
 [![Join the chat at https://gitter.im/emacs-lsp/lsp-mode](https://badges.gitter.im/emacs-lsp/lsp-mode.svg)](https://gitter.im/emacs-lsp/lsp-mode?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Emacs Java IDE using [Eclipse JDT Language Server](https://projects.eclipse.org/projects/eclipse.jdt.ls).
 ## Features
 LSP java mode supports the following JDT Features:
@@ -123,10 +124,10 @@ some of them are bound to Emacs commands:
 * `lsp-java-extract-method` - Extract method refactoring
 * `lsp-java-add-import` - Add missing import
 #### Treemacs
-[lsp-java](https://github.com/emacs-lsp/lsp-java) provides integration with [treemacs](https://github.com/Alexander-Miller/treemacs) which provides option to navigate through package dependecies, namespaces, classes and resources.
+[lsp-java](https://github.com/emacs-lsp/lsp-java) provides experimental integration with [treemacs](https://github.com/Alexander-Miller/treemacs) which provides option to navigate through package dependecies, namespaces, classes and resources.
 * `lsp-java-treemacs-register` activates [lsp-java](https://github.com/emacs-lsp/lsp-java)/[treemacs](https://github.com/Alexander-Miller/treemacs) integration.
 * `lsp-java-treemacs-unregister` deactivates [lsp-java](https://github.com/emacs-lsp/lsp-java)/[treemacs](https://github.com/Alexander-Miller/treemacs) integration.
-* `lsp-java-update-project-uris`
+* `lsp-java-update-project-uris` refresh the project URIs.
 #### Classpath browsing
 [lsp-java](https://github.com/emacs-lsp/lsp-java) the command `lsp-java-browse-classpath` which allows users to browse the structure of current projects classpath. From that view the users could go to the particular item.
 ![Classpath](images/classpath.png)

images/classpath.png

@@ -218,10 +218,13 @@ ADDED and REMOVED are pointing which are the changed folders."
    :position 'project-start
    :predicate 'lsp-java-treemacs--is-root)
 
+  (require 'treemacs)
+  (unless (eq 'visible (treemacs-current-visibility))
+    (treemacs))
 
   (maphash (lambda (root-path workspace)
-             (unless (or (f-equal? root-path lsp-java-workspace-dir)
-                         (f-equal? root-path lsp-java-workspace-cache-dir))
+             (unless (or (s-equals? (f-canonical root-path) (f-canonical lsp-java-workspace-dir))
+                         (s-equals? (f-canonical root-path) (f-canonical lsp-java-workspace-cache-dir)))
                (treemacs-do-add-project-to-workspace root-path (f-filename root-path))))
            lsp--workspaces)
   (add-hook 'lsp-workspace-folders-change 'lsp-java-treemacs--folders-change))
@@ -230,8 +233,10 @@ ADDED and REMOVED are pointing which are the changed folders."
   "Unregister extension."
   (interactive)
   (remove-hook 'lsp-workspace-folders-change 'lsp-java-treemacs--folders-change)
-  (treemacs-remove-extension 'treemacs-EXTERNAL-LIBRARY-extension
-                             'project-start))
+  (treemacs-remove-project-extension 'treemacs-EXTERNAL-LIBRARY-extension
+                                     'project-start)
+  (treemacs-remove-directory-extension 'treemacs-EXTERNAL-LIBRARY-extension
+                                       'directory-start))
 
 (provide 'lsp-java-treemacs )
 ;;; lsp-java-treemacs.el ends here

lsp-java-treemacs.el

@@ -919,13 +919,14 @@ PROJECT-URI uri of the item."
   "Show currently active sessions."
   (interactive)
   (let ((uri (lsp--path-to-uri (or buffer-file-name (f-canonical default-directory)))))
-    (--if-let (lsp-java--find-workspace uri)
+    (--if-let (or lsp--cur-workspace (lsp-java--find-workspace uri))
         (with-lsp-workspace it
           (if-let (project-uri (lsp-java--find-project-uri buffer-file-name))
               (let ((inhibit-read-only t)
                     (buf (get-buffer-create "*classpath*")))
                 (with-current-buffer buf
                   (erase-buffer)
+                  (lsp-java-classpath-mode)
                   (setq-local lsp--cur-workspace it)
 
                   (when lsp-java-themes-directory
@@ -943,7 +944,6 @@ PROJECT-URI uri of the item."
                      ,@lsp-java-icons-default-root-folder
                      ,@(--map (lsp-java--classpath-render-classpath it project-uri)
                               (lsp-send-execute-command "che.jdt.ls.extension.classpathTree" project-uri))))
-                  (lsp-java-classpath-mode)
                   (run-hooks 'lsp-java-classpath-mode-hook))
                 (funcall lsp-java-pop-buffer-function buf)
                 (goto-char (point-min)))