Skip to content

[improvement] Improve active buffer context #164

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 18 commits into from
Aug 28, 2023
Merged

[improvement] Improve active buffer context #164

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2f1b376
Remove redundant function call
emil-vdw Aug 6, 2023
f6a78e8
Implement separate hooks for document events
emil-vdw Aug 6, 2023
b2c015a
Send actual changes instead of whole buffer
emil-vdw Aug 9, 2023
395ad20
Only send didFocus events for copilot buffers
emil-vdw Aug 10, 2023
25aa15b
Remove from opened buffers when leaving copilot mode
emil-vdw Aug 10, 2023
6eec056
Hook onto window-buffer-change-functions as well
emil-vdw Aug 10, 2023
66b9d06
Send close event for buffer when leaving mode
emil-vdw Aug 11, 2023
f13db5b
Only call on focus callback for window gaining focus
emil-vdw Aug 11, 2023
7614224
Fix comment grammar
emil-vdw Aug 11, 2023
2c184c8
Improve formatting and fix indentation
emil-vdw Aug 11, 2023
d21b2e5
Replace tab with space indentation
emil-vdw Aug 11, 2023
ef70825
Make copilot mode enter and exit functions private
emil-vdw Aug 11, 2023
d597a78
Always run on doc focus function on mode activate
emil-vdw Aug 11, 2023
f828ce6
Create unique URI for non-file buffers
emil-vdw Aug 19, 2023
c753e1a
Rework on change handler to work with modifications
emil-vdw Aug 19, 2023
06fc2b9
Replace tabs with spaces
emil-vdw Aug 19, 2023
3139dc4
Warn the user of too large buffer for didOpen text
emil-vdw Aug 19, 2023
596c508
Increase `copilot-max-char` default to 100_000
emil-vdw Aug 20, 2023
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
125 changes: 86 additions & 39 deletions copilot.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Enabling event logging may slightly affect performance."
:type 'string)


(defcustom copilot-max-char 30000
(defcustom copilot-max-char 100000
"Maximum number of characters to send to Copilot, -1 means no limit."
:group 'copilot
:type 'integer)
Expand Down Expand Up @@ -206,7 +206,7 @@ Enabling event logging may slightly affect performance."
(condition-case err
(copilot--request 'signInConfirm (list :userCode user-code))
(jsonrpc-error
(user-error "Authentication failure: %s" (alist-get 'jsonrpc-error-message (cddr err)))))
(user-error "Authentication failure: %s" (alist-get 'jsonrpc-error-message (cddr err)))))
(copilot--dbind (:user) (copilot--request 'checkStatus '(:dummy "checkStatus"))
(message "Authenticated as GitHub user %s." user))))

Expand Down Expand Up @@ -313,7 +313,7 @@ Enabling event logging may slightly affect performance."
"Get URI of current buffer."
(cond
((not buffer-file-name)
"")
(concat "buffer://" (url-encode-url (buffer-name (current-buffer)))))
((and (eq system-type 'windows-nt)
(not (s-starts-with-p "/" buffer-file-name)))
(concat "file:///" (url-encode-url buffer-file-name)))
Expand All @@ -326,6 +326,8 @@ Enabling event logging may slightly affect performance."
(pmax (point-max))
(pmin (point-min))
(half-window (/ copilot-max-char 2)))
(when (and (>= copilot-max-char 0) (> pmax copilot-max-char))
(warn "%s size exceeds 'copilot-max-char' (%s), copilot completions may not work" (current-buffer) copilot-max-char))
(cond
;; using whole buffer
((or (< copilot-max-char 0) (< pmax copilot-max-char))
Expand Down Expand Up @@ -375,7 +377,6 @@ Enabling event logging may slightly affect performance."
"Get completion cycling options with CALLBACK."
(if copilot--completion-cache
(funcall callback copilot--completion-cache)
(copilot--sync-doc)
(copilot--async-request 'getCompletionsCycling
(list :doc (copilot--generate-doc))
:success-fn callback)))
Expand Down Expand Up @@ -463,10 +464,9 @@ Enabling event logging may slightly affect performance."
(setq copilot--last-doc-version copilot--doc-version)
(setq copilot--panel-lang (copilot--get-language-id))

(copilot--sync-doc)
(copilot--get-panel-completions
(jsonrpc-lambda (&key solutionCountTarget)
(message "Copilot: Synthesizing %d solutions..." solutionCountTarget)))
(jsonrpc-lambda (&key solutionCountTarget)
(message "Copilot: Synthesizing %d solutions..." solutionCountTarget)))
(with-current-buffer (get-buffer-create "*copilot-panel*")
(org-mode)
(erase-buffer)))
Expand Down Expand Up @@ -566,7 +566,7 @@ Use TRANSFORM-FN to transform completion if provided."
(vterm-insert t-completion))
(delete-region start end)
(insert t-completion))
; if it is a partial completion
;; if it is a partial completion
(when (and (s-prefix-p t-completion completion)
(not (s-equals-p t-completion completion)))
(copilot--set-overlay-text (copilot--get-overlay) (s-chop-prefix t-completion completion)))
Expand Down Expand Up @@ -620,20 +620,51 @@ Use TRANSFORM-FN to transform completion if provided."
(goto-char p)
(copilot--display-overlay-completion balanced-text uuid start end))))))))

(defun copilot--sync-doc ()
"Sync current buffer."
(if (-contains-p copilot--opened-buffers (current-buffer))
(progn
(defun copilot--on-doc-focus (window)
"Notify that the document has been focussed or opened."
;; When switching windows, this function is called twice, once for the
;; window losing focus and once for the window gaining focus. We only want to
;; send a notification for the window gaining focus and only if the buffer has
;; copilot-mode enabled.
(when (and copilot-mode (eq window (selected-window)))
(if (-contains-p copilot--opened-buffers (current-buffer))
(copilot--notify ':textDocument/didFocus
(list :textDocument (list :uri (copilot--get-uri))))
(add-to-list 'copilot--opened-buffers (current-buffer))
(copilot--notify ':textDocument/didOpen
(list :textDocument (list :uri (copilot--get-uri)
:languageId (copilot--get-language-id)
:version copilot--doc-version
:text (copilot--get-source)))))))

(defun copilot--on-doc-change (&optional beg end chars-replaced)
"Notify that the document has changed."
(let* ((is-before-change (eq chars-replaced nil))
(is-after-change (not is-before-change))
;; for a deletion, the post-change beginning and end are at the same place.
(is-insertion (and is-after-change (not (equal beg end))))
(is-deletion (and is-before-change (not (equal beg end)))))
(when (or is-insertion is-deletion)
(let* ((range-start (list :line (- (line-number-at-pos beg) copilot--line-bias)
:character (- beg (save-excursion (goto-char beg) (line-beginning-position)))))
(range-end (if is-insertion range-start
(list :line (- (line-number-at-pos end) copilot--line-bias)
:character (- end (save-excursion (goto-char end) (line-beginning-position))))))
(text (if is-insertion (buffer-substring-no-properties beg end) ""))
(content-changes (vector (list :range (list :start range-start :end range-end)
:text text))))
(cl-incf copilot--doc-version)
(copilot--notify 'textDocument/didChange
(list :textDocument (list :uri (copilot--get-uri)
:version copilot--doc-version)
:contentChanges (vector (list :text (copilot--get-source))))))
(add-to-list 'copilot--opened-buffers (current-buffer))
(copilot--notify ':textDocument/didOpen
(list :textDocument (list :uri (copilot--get-uri)
:languageId (copilot--get-language-id)
:version copilot--doc-version
:text (copilot--get-source))))))
(list :textDocument (list :uri (copilot--get-uri) :version copilot--doc-version)
:contentChanges content-changes))))))

(defun copilot--on-doc-close (&rest _args)
"Notify that the document has been closed."
(when (-contains-p copilot--opened-buffers (current-buffer))
(copilot--notify 'textDocument/didClose
(list :textDocument (list :uri (copilot--get-uri))))
(setq copilot--opened-buffers (delete (current-buffer) copilot--opened-buffers))))


;;;###autoload
(defun copilot-complete ()
Expand All @@ -645,14 +676,13 @@ Use TRANSFORM-FN to transform completion if provided."
(setq copilot--completion-idx 0)

(let ((called-interactively (called-interactively-p 'interactive)))
(copilot--sync-doc)
(copilot--get-completion
(jsonrpc-lambda (&key completions &allow-other-keys)
(let ((completion (if (seq-empty-p completions) nil (seq-elt completions 0))))
(if completion
(copilot--show-completion completion)
(when called-interactively
(message "No completion is available."))))))))
(jsonrpc-lambda (&key completions &allow-other-keys)
(let ((completion (if (seq-empty-p completions) nil (seq-elt completions 0))))
(if completion
(copilot--show-completion completion)
(when called-interactively
(message "No completion is available."))))))))

;;
;; minor mode
Expand Down Expand Up @@ -703,6 +733,30 @@ Copilot will show completions only if all predicates return t."
"Keymap for Copilot minor mode.
Use this for custom bindings in `copilot-mode'.")

(defun copilot--mode-enter ()
"Set up copilot mode when entering."
(add-hook 'post-command-hook #'copilot--post-command nil 'local)
(add-hook 'before-change-functions #'copilot--on-doc-change nil 'local)
(add-hook 'after-change-functions #'copilot--on-doc-change nil 'local)
;; Hook onto both window-selection-change-functions and window-buffer-change-functions
;; since both are separate ways of 'focussing' a buffer.
(add-hook 'window-selection-change-functions #'copilot--on-doc-focus nil 'local)
(add-hook 'window-buffer-change-functions #'copilot--on-doc-focus nil 'local)
(add-hook 'kill-buffer-hook #'copilot--on-doc-close nil 'local)
;; The mode may be activated manually while focus remains on the current window/buffer.
(copilot--on-doc-focus (selected-window)))

(defun copilot--mode-exit ()
"Clean up copilot mode when exiting."
(remove-hook 'post-command-hook #'copilot--post-command 'local)
(remove-hook 'before-change-functions #'copilot--on-doc-change 'local)
(remove-hook 'after-change-functions #'copilot--on-doc-change 'local)
(remove-hook 'window-selection-change-functions #'copilot--on-doc-focus 'local)
(remove-hook 'window-buffer-change-functions #'copilot--on-doc-focus 'local)
(remove-hook 'kill-buffer-hook #'copilot--on-doc-close 'local)
;; Send the close event for the active buffer since activating the mode will open it again.
(copilot--on-doc-close))

;;;###autoload
(define-minor-mode copilot-mode
"Minor mode for Copilot."
Expand All @@ -711,11 +765,8 @@ Use this for custom bindings in `copilot-mode'.")
(copilot-clear-overlay)
(advice-add 'posn-at-point :before-until #'copilot--posn-advice)
(if copilot-mode
(progn
(add-hook 'post-command-hook #'copilot--post-command nil 'local)
(add-hook 'before-change-functions #'copilot--on-change nil 'local))
(remove-hook 'post-command-hook #'copilot--post-command 'local)
(remove-hook 'before-change-functions #'copilot--on-change 'local)))
(copilot--mode-enter)
(copilot--mode-exit)))

(defun copilot--posn-advice (&rest args)
"Remap posn if in copilot-mode."
Expand All @@ -728,11 +779,7 @@ Use this for custom bindings in `copilot-mode'.")

;;;###autoload
(define-global-minor-mode global-copilot-mode
copilot-mode copilot-mode)

(defun copilot--on-change (&rest _args)
"Handle `before-change-functions' hook."
(cl-incf copilot--doc-version))
copilot-mode copilot-mode)

(defun copilot--post-command ()
"Complete in `post-command-hook' hook."
Expand Down Expand Up @@ -773,7 +820,7 @@ command that triggered `post-command-hook'."
(equal (current-buffer) buffer)
copilot-mode
(copilot--satisfy-trigger-predicates))
(copilot-complete)))
(copilot-complete)))

(provide 'copilot)
;;; copilot.el ends here