lucas/ghpr.el
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: validate contents before submitting

Browse source
This commit is contained in:
Lucas Sta Maria 2025-08-27 17:04:43 +08:00
parent 3044a2611a
commit 22007c8a75
Signed by: lucas
GPG key ID: F07FB16A826E3B47
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ghpr-review.el
View file

@ -122,11 +122,11 @@
(erase-buffer) (erase-buffer)
(let* ((number (alist-get 'number pr)) (let* ((number (alist-get 'number pr))
(diff-content (ghpr--get-diff-content repo-name number)) (diff-content (ghpr--get-diff-content repo-name number))
(contents (ghpr--open-pr/collect-contents pr diff-content))) (contents (ghpr--prefix-lines (ghpr--open-pr/collect-contents pr diff-content))))
(setq ghpr--review-base-content contents) (setq ghpr--review-base-content contents)
(setq ghpr--review-pr-metadata pr) (setq ghpr--review-pr-metadata pr)
(setq ghpr--review-repo-name repo-name) (setq ghpr--review-repo-name repo-name)
(insert (ghpr--prefix-lines contents)))) (insert contents)))
(defun ghpr--open-pr (pr repo-name) (defun ghpr--open-pr (pr repo-name)
"Open a new buffer containing the body of the PR." "Open a new buffer containing the body of the PR."
@ -339,6 +339,14 @@ Returns an alist with comment, file-path, commit-sha, and diff-position, or nil
(commit-sha . ,(alist-get 'commit-sha context)) (commit-sha . ,(alist-get 'commit-sha context))
(diff-position . ,(alist-get 'diff-position context))))))) (diff-position . ,(alist-get 'diff-position context)))))))
(defun ghpr--validate-base-content-unchanged ()
"Validate that all base content (lines with > or < prefixes) remains unchanged.
Returns t if validation passes, nil otherwise."
(let* ((current-lines (split-string (buffer-string) "\n"))
(base-lines (split-string ghpr--review-base-content "\n"))
(current-base-lines (seq-filter #'ghpr--special-line-p current-lines)))
(equal current-base-lines base-lines)))
(defun ghpr--collect-review-comments () (defun ghpr--collect-review-comments ()
"Collect all inline review comments from the current buffer. "Collect all inline review comments from the current buffer.
Returns an alist of comments with their associated diff lines and GitHub API context. Returns an alist of comments with their associated diff lines and GitHub API context.
@ -367,6 +375,9 @@ Collects review body and inline comments from current buffer."
(error "No PR metadata found in buffer")) (error "No PR metadata found in buffer"))
(unless ghpr--review-repo-name (unless ghpr--review-repo-name
(error "No repository name found in buffer")) (error "No repository name found in buffer"))
;; TODO: needs better usability. maybe highlight which lines were broken/missing and restore.
(unless (ghpr--validate-base-content-unchanged)
(error "Base content has been modified. Please restore the original diff content before submitting"))
(let* ((body (ghpr--collect-review-body)) (let* ((body (ghpr--collect-review-body))
(inline-comments (ghpr--collect-review-comments)) (inline-comments (ghpr--collect-review-comments))