Per #63: minimally support workspaceFolders

* README.md (Supported Protocol features): Declare workspaceFolders partially supported. * eglot.el (eglot-client-capabilities): Declare workspaceFolders supported. (eglot--connect): Maybe send :workspaceFolders in :initialize request.
joaotavora · Aug 7, 2018 · aa7398f · aa7398f
1 parent 4c019bd
commit aa7398f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -167,7 +167,7 @@ eglot-shutdown`.
 - [x] client/unregisterCapability  (ditto)
 
 ## Workspace
-- [ ] workspace/workspaceFolders (3.6.0)
+- [x] workspace/workspaceFolders (3.6.0, partial)
 - [ ] workspace/didChangeWorkspaceFolders (3.6.0)
 - [x] workspace/didChangeConfiguration
 - [ ] workspace/configuration (3.6.0)

diff --git a/eglot.el b/eglot.el
@@ -171,7 +171,8 @@ lasted more than that many seconds."
                         :executeCommand `(:dynamicRegistration :json-false)
                         :workspaceEdit `(:documentChanges :json-false)
                         :didChangeWatchedFiles `(:dynamicRegistration t)
-                        :symbol `(:dynamicRegistration :json-false))
+                        :symbol `(:dynamicRegistration :json-false)
+                        :workspaceFolders t)
             :textDocument
             (list
              :synchronization (list
@@ -512,12 +513,19 @@ This docstring appeases checkdoc, that's all."
             (jsonrpc-request
              server
              :initialize
-             (list :processId (unless (eq (jsonrpc-process-type server) 'network)
-                                (emacs-pid))
-                   :rootPath (expand-file-name default-directory)
-                   :rootUri (eglot--path-to-uri default-directory)
-                   :initializationOptions (eglot-initialization-options server)
-                   :capabilities (eglot-client-capabilities server)))
+             `(:processId
+               (unless (eq (jsonrpc-process-type server) 'network)
+                 (emacs-pid))
+               :rootPath (expand-file-name default-directory)
+               :rootUri (eglot--path-to-uri default-directory)
+               :initializationOptions (eglot-initialization-options server)
+               :capabilities (eglot-client-capabilities server)
+               ,@(when (cdr (project-roots project))
+                   `(:workspaceFolders
+                     [,@(mapcar (lambda (root)
+                                  (list :uri (eglot--path-to-uri root)
+                                        :name (file-name-base root)))
+                                (project-roots (eglot--project server)))]))))
           (setf (eglot--capabilities server) capabilities)
           (dolist (buffer (buffer-list))
             (with-current-buffer buffer