Skip to content

Use error handling to deal with older jsonrpc #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 17, 2024
Merged

Use error handling to deal with older jsonrpc #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 23 additions & 30 deletions copilot.el
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; copilot.el --- An unofficial Copilot plugin for Emacs -*- lexical-binding:t -*-

;; Package-Requires: ((emacs "27.2") (s "1.12.0") (dash "2.19.1") (editorconfig "0.8.2") (jsonrpc "1.0.23"))
;; Package-Requires: ((emacs "27.2") (s "1.12.0") (dash "2.19.1") (editorconfig "0.8.2") (jsonrpc "1.0.14"))
;; Version: 0.0.1
;;; URL: https://github.com/copilot-emacs/copilot.el

Expand Down Expand Up @@ -125,17 +125,6 @@ indentation offset."
(defvar copilot--opened-buffers nil
"List of buffers that have been opened in Copilot.")

;;
;; jsonrpc
;;

(defun copilot--jsonrpc-version ()
"Return the jsonrpc version."
(let* ((desc (package-get-descriptor 'jsonrpc))
(vlist (package-desc-version desc))
(version (package-version-join vlist)))
version))

;;
;; agent
;;
Expand Down Expand Up @@ -177,6 +166,26 @@ indentation offset."
(funcall ,success-fn result)))
,@args))))

(defun copilot--make-connection ()
"Establish copilot jsonrpc connection."
(let ((make-fn (apply-partially
#'make-instance
'jsonrpc-process-connection
:name "copilot"
:notification-dispatcher #'copilot--handle-notification
:process (make-process :name "copilot agent"
:command (list copilot-node-executable
(concat copilot--base-dir "/dist/agent.js"))
:coding 'utf-8-emacs-unix
:connection-type 'pipe
:stderr (get-buffer-create "*copilot stderr*")
:noquery t))))
(condition-case nil
(funcall make-fn :events-buffer-config `(:size ,copilot-log-max))
(invalid-slot-name
;; handle older jsonrpc versions
(funcall make-fn :events-buffer-scrollback-size copilot-log-max)))))

(defun copilot--start-agent ()
"Start the copilot agent process in local."
(if (not (locate-file copilot-node-executable exec-path))
Expand All @@ -185,27 +194,11 @@ indentation offset."
(call-process copilot-node-executable nil standard-output nil "--version"))
(s-trim)
(s-chop-prefix "v")
(string-to-number)))
(old-jsonrpc (version< (copilot--jsonrpc-version) "1.0.23")))
(string-to-number))))
(cond ((< node-version 18)
(user-error "Node 18+ is required but found %s" node-version))
(t
(setq copilot--connection
(funcall #'make-instance
'jsonrpc-process-connection
:name "copilot"
(if old-jsonrpc :events-buffer-scrollback-size
:events-buffer-config)
(if old-jsonrpc copilot-log-max
`(:size ,copilot-log-max))
:notification-dispatcher #'copilot--handle-notification
:process (make-process :name "copilot agent"
:command (list copilot-node-executable
(concat copilot--base-dir "/dist/agent.js"))
:coding 'utf-8-emacs-unix
:connection-type 'pipe
:stderr (get-buffer-create "*copilot stderr*")
:noquery t)))
(setq copilot--connection (copilot--make-connection))
(message "Copilot agent started.")
(copilot--request 'initialize '(:capabilities (:workspace (:workspaceFolders t))))
(copilot--async-request 'setEditorInfo
Expand Down