Make lsp-clients-go-server configurable

Current logic ignored `lsp-clients-go-server` and fixed to `gopls`, while `gopls` does not work all the time.
emacs-lsp · Apr 1, 2019 · 9d42168 · 9d42168
1 parent 22a2319
commit 9d42168
Showing 1 changed file with 3 additions and 20 deletions.
diff --git a/lsp-clients.el b/lsp-clients.el
@@ -381,7 +381,8 @@ finding the executable with `exec-path'."
   :tag "Go language")
 
 (defcustom lsp-clients-go-server "bingo"
-  "The go language server executable to use."
+  "The go language server executable to use.  One of `bingo',
+`gopls', `go-langserver' to use. Defaults to `bingo'."
   :group 'lsp-clients-go
   :risky t
   :type 'file)
@@ -452,32 +453,14 @@ defaults to half of your CPU cores."
     :diagnosticsEnabled ,lsp-clients-go-diagnostics-enabled))
 
 
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection "gopls")
-                  :major-modes '(go-mode)
-                  :priority 0
-                  :initialization-options 'lsp-clients-go--make-init-options
-                  :server-id 'gopls
-                  :library-folders-fn (lambda (_workspace)
-                                        lsp-clients-go-library-directories)))
-
 (lsp-register-client
  (make-lsp-client :new-connection (lsp-stdio-connection
                                    (lambda () (cons lsp-clients-go-server
                                                     lsp-clients-go-server-args)))
                   :major-modes '(go-mode)
                   :priority -1
                   :initialization-options 'lsp-clients-go--make-init-options
-                  :server-id 'go-bingo
-                  :library-folders-fn (lambda (_workspace)
-                                        lsp-clients-go-library-directories)))
-
-(lsp-register-client
- (make-lsp-client :new-connection (lsp-stdio-connection "go-langserver")
-                  :major-modes '(go-mode)
-                  :priority -2
-                  :initialization-options 'lsp-clients-go--make-init-options
-                  :server-id 'go-ls
+                  :server-id (intern (concat "go-" lsp-clients-go-server))
                   :library-folders-fn (lambda (_workspace)
                                         lsp-clients-go-library-directories)))