Add a generic method lsp-initialization-options and delete lsp-clients-go-* custom variables

Author: MaskRay

lsp-clients.el

@@ -382,73 +382,15 @@ finding the executable with `exec-path'."
   :type '(repeat string)
   :group 'lsp-clients-go)
 
-(defcustom lsp-clients-go-func-snippet-enabled t
-  "Enable the returning of argument snippets on `func' completions, eg.
-`func(foo string, arg2 bar)'.  Requires code completion to be enabled."
-  :type 'boolean
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-gocode-completion-enabled t
-  "Enable code completion feature (using gocode)."
-  :type 'boolean
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-format-tool "goimports"
-  "The tool to be used for formatting documents.  Defaults to `goimports' if nil."
-  :type '(choice (const :tag "goimports" "goimports")
-                 (const :tag "gofmt" "gofmt"))
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-imports-local-prefix ""
-  "The local prefix (comma-separated string) that goimports will use."
-  :type 'string
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-max-parallelism nil
-  "The maximum number of goroutines that should be used to fulfill requests.
-This is useful in editor environments where users do not want results ASAP,
-but rather just semi quickly without eating all of their CPU.  When nil,
-defaults to half of your CPU cores."
-  :type '(choice integer (const nil "Half of CPU cores."))
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-use-binary-pkg-cache t
-  "Whether or not $GOPATH/pkg binary .a files should be used."
-  :type 'boolean
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-diagnostics-enabled t
-  "Whether diagnostics are enabled."
-  :type 'boolean
-  :group 'lsp-clients-go)
-
-(defcustom lsp-clients-go-library-directories '("/usr")
-  "List of directories which will be considered to be libraries."
-  :group 'lsp-clients-go
-  :risky t
-  :type '(repeat string))
-
 (define-inline lsp-clients-go--bool-to-json (val)
   (inline-quote (if ,val t :json-false)))
 
-(defun lsp-clients-go--make-init-options ()
-  "Init options for golang."
-  `(:funcSnippetEnabled ,(lsp-clients-go--bool-to-json lsp-clients-go-func-snippet-enabled)
-    :disableFuncSnippet ,(lsp-clients-go--bool-to-json (not lsp-clients-go-func-snippet-enabled))
-    :gocodeCompletionEnabled ,(lsp-clients-go--bool-to-json lsp-clients-go-gocode-completion-enabled)
-    :formatTool ,lsp-clients-go-format-tool
-    :goimportsLocalPrefix ,lsp-clients-go-imports-local-prefix
-    :maxParallelism ,lsp-clients-go-max-parallelism
-    :useBinaryPkgCache ,lsp-clients-go-use-binary-pkg-cache
-    :diagnosticsEnabled ,lsp-clients-go-diagnostics-enabled))
-
 (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)))
@@ -457,7 +399,6 @@ defaults to half of your CPU cores."
  (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
                   :library-folders-fn (lambda (_workspace)
                                         lsp-clients-go-library-directories)))

lsp-mode.el

@@ -525,6 +525,10 @@ must be used for handling a particular message.")
 (cl-defgeneric lsp-execute-command (server command arguments)
   "Ask SERVER to execute COMMAND with ARGUMENTS.")
 
+(cl-defgeneric lsp-initialization-options (server)
+  "JSON object to send under `initializationOptions'"
+  (:method (_s) nil))
+
 (defun lsp--info (format &rest args)
   "Display lsp info message with FORMAT with ARGS."
   (message "%s :: %s" (propertize "LSP" 'face 'success) (apply #'format format args)))
@@ -756,8 +760,6 @@ INHERIT-INPUT-METHOD will be proxied to `completing-read' without changes."
   (server-id)
   ;; defines whether the client supports multi root workspaces.
   (multi-root)
-  ;; Initialization options or a function that returns initialization options.
-  (initialization-options)
   ;; Function which returns the folders that are considered to be not projects but library files.
   ;; The function accepts one parameter currently active workspace.
   ;; See: https://github.com/emacs-lsp/lsp-mode/issues/225.
@@ -3926,10 +3928,8 @@ remote machine and vice versa."
   "Create initialization-options from SESSION and CLIENT.
 Add workspace folders depending on server being multiroot and
 session workspce folder configuration for the server."
-  (let* ((initialization-options-or-fn (lsp--client-initialization-options client))
-         (initialization-options (if (functionp initialization-options-or-fn)
-                                     (funcall initialization-options-or-fn)
-                                   initialization-options-or-fn)))
+  (let ((initialization-options
+         (lsp-initialization-options (lsp--client-server-id client))))
     (if (lsp--client-multi-root client)
         (or (-some->> session
                       (lsp-session-server-id->folders)