From 1752d1ca139a329938eebe1713f90756e268f33e Mon Sep 17 00:00:00 2001 From: Rodrigo Kassick Date: Sat, 7 Dec 2024 10:23:57 -0300 Subject: [PATCH] refactor: use copilot-ls / copilot-ls-remote as server ids --- clients/lsp-copilot.el | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/clients/lsp-copilot.el b/clients/lsp-copilot.el index a6f988c3d4..0e9c32ea57 100644 --- a/clients/lsp-copilot.el +++ b/clients/lsp-copilot.el @@ -91,7 +91,7 @@ lsp-install-server to fetch an emacs-local version of the LSP." :type 'boolean :group 'lsp-copilot) -(lsp-dependency 'lsp-copilot +(lsp-dependency 'copilot-ls `(:system ,lsp-copilot-executable) '(:npm :package "copilot-node-server" :path "language-server.js")) @@ -143,7 +143,7 @@ lsp-install-server to fetch an emacs-local version of the LSP." This function is automatically called during the client initialization if needed" (interactive) - (-when-let (workspace (--some (lsp-find-workspace it) '(lsp-copilot lsp-copilot-remote))) + (-when-let (workspace (--some (lsp-find-workspace it) '(copilot-ls copilot-ls-remote))) (with-lsp-workspace workspace (-when-let* ((response (lsp-request "signInInitiate" '(:dummy "dummy")))) (-let (((&copilot-ls:SignInInitiateResponse? :status :user-code :verification-uri :expires-in :interval :user) response)) @@ -203,7 +203,7 @@ automatically, browse to %s." user-code verification-uri)) ;; Server installed by emacs (lsp-register-client (make-lsp-client - :server-id 'lsp-copilot + :server-id 'copilot-ls :new-connection (lsp-stdio-connection #'lsp-copilot--cmdline) :activation-fn #'lsp-copilot--client-active-for-mode-p :multi-root lsp-copilot-server-multi-root @@ -223,12 +223,12 @@ automatically, browse to %s." user-code verification-uri)) (lsp-register-client (make-lsp-client - :server-id 'lsp-copilot-remote + :server-id 'copilot-ls-remote :new-connection (lsp-stdio-connection (lambda () - `(,lsp-copilot-executable ,@lsp-copilot-langserver-command-args))) + `(,(lsp-package-path 'copilot-ls) ,@lsp-copilot-langserver-command-args))) :activation-fn #'lsp-copilot--client-active-for-mode-p :multi-root lsp-copilot-server-multi-root - :priority -2 + :priority -1 :add-on? t :completion-in-comments? t :initialization-options #'lsp-copilot--server-initialization-options