Skip to content

Commit

Permalink
fix: Byte-compile warnings (#786)
Browse files Browse the repository at this point in the history
  • Loading branch information
@jcs090218
jcs090218 authored Apr 6, 2024
1 parent ed360fd commit 06594a5
Show file tree
Hide file tree
Showing 21 changed files with 529 additions and 548 deletions.
4 changes: 0 additions & 4 deletions dap-chrome.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
;; You should have received a copy of the GNU General Public License
;; along with this program. If not, see <https://www.gnu.org/licenses/>.

;; URL: https://github.com/emacs-lsp/dap-mode
;; Package-Requires: ((emacs "25.1") (dash "2.14.1") (lsp-mode "4.0"))
;; Version: 0.2

;;; Commentary:
;; Adapter for https://github.com/chromeide/vscode-chrome

Expand Down
294 changes: 150 additions & 144 deletions dap-dlv-go.el
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@

(require 'dap-mode)
(require 'dap-utils)
(require 'dap-ui)
(require 'f)
(require 'lsp-mode)
(require 'dash)

(defcustom dap-dlv-go-delve-path
(or (executable-find "dlv")
(expand-file-name
"dlv" (expand-file-name "bin" (or (getenv "GOPATH")
(f-join (getenv "HOME") "go")))))
(expand-file-name
"dlv" (expand-file-name "bin" (or (getenv "GOPATH")
(f-join (getenv "HOME") "go")))))
"The path to the delve command."
:group 'dap-dlv-go
:type 'string)
Expand All @@ -47,69 +48,74 @@
:group 'dap-dlv-go
:type 'string)

(defvar vterm-shell)
(defvar vterm-kill-buffer-on-exit)
(declare-function vterm-mode "ext:vterm.el")

(defun dap-dlv-go--populate-default-args (conf)
"Populate CONF with the default arguments."
(setq conf (pcase (plist-get conf :mode)
("auto"
(dap-dlv-go--populate-auto-args conf))
("test"
(dap-dlv-go--populate-test-args conf))
("debug"
(dap--put-if-absent
conf :program (f-dirname (buffer-file-name))))
("exec"
(dap--put-if-absent
conf :program
(f-expand (read-file-name "enter path to executable: "))))
("remote"
(dap--put-if-absent conf :host (read-string "enter host: " "127.0.0.1"))
(dap--put-if-absent conf :debugPort
(string-to-number (read-string "enter port: " "2345"))))
("local"
(dap--put-if-absent conf :cwd (f-dirname (buffer-file-name)))
(dap--put-if-absent
conf :processId (string-to-number (read-string "enter pid: " "2345"))))))
(setq conf
(pcase (plist-get conf :mode)
("auto"
(dap-dlv-go--populate-auto-args conf))
("test"
(dap-dlv-go--populate-test-args conf))
("debug"
(dap--put-if-absent
conf :program (f-dirname (buffer-file-name))))
("exec"
(dap--put-if-absent
conf :program
(f-expand (read-file-name "enter path to executable: "))))
("remote"
(dap--put-if-absent conf :host (read-string "enter host: " "127.0.0.1"))
(dap--put-if-absent conf :debugPort
(string-to-number (read-string "enter port: " "2345"))))
("local"
(dap--put-if-absent conf :cwd (f-dirname (buffer-file-name)))
(dap--put-if-absent
conf :processId (string-to-number (read-string "enter pid: " "2345"))))))

(when-let ((env-file (plist-get conf :envFile)))
(plist-put conf :env (dap-dlv-go--parse-env-file env-file)))
(plist-put conf :env (dap-dlv-go--parse-env-file env-file)))

(let ((debug-port (if (string= (plist-get conf :mode)
"remote")
(plist-get conf :debugPort)
(dap--find-available-port))))
(dap--put-if-absent conf :host "localhost")
(when (not (string= "remote" (plist-get conf :mode)))
(plist-put
conf :program-to-start
(format "%s dap --listen 127.0.0.1:%s %s" dap-dlv-go-delve-path debug-port dap-dlv-go-extra-args)))
(plist-put conf :debugServer debug-port))
"remote")
(plist-get conf :debugPort)
(dap--find-available-port))))
(dap--put-if-absent conf :host "localhost")
(when (not (string= "remote" (plist-get conf :mode)))
(plist-put
conf :program-to-start
(format "%s dap --listen 127.0.0.1:%s %s" dap-dlv-go-delve-path debug-port dap-dlv-go-extra-args)))
(plist-put conf :debugServer debug-port))

(if (stringp (plist-get conf :args)) (plist-put conf :args (split-string (plist-get conf :args))) ())

(when (string= (plist-get conf :name) "Test function")
(-when-let (name (dap-dlv-go--extract-current--method-or-function-name t))
(dap--put-if-absent conf :args (list (format "-test.run=^%s$" name)))))
(-when-let (name (dap-dlv-go--extract-current--method-or-function-name t))
(dap--put-if-absent conf :args (list (format "-test.run=^%s$" name)))))

(when (string= (plist-get conf :name) "Test subtest")
(-when-let (name (concat
(dap-dlv-go--extract-current--method-or-function-name t)
"/"
(shell-quote-argument (dap-dlv-go--extract-current-subtest-name t))))
(dap--put-if-absent conf :args (list (format "-test.run=^%s" name)))))
(-when-let (name (concat
(dap-dlv-go--extract-current--method-or-function-name t)
"/"
(shell-quote-argument (dap-dlv-go--extract-current-subtest-name t))))
(dap--put-if-absent conf :args (list (format "-test.run=^%s" name)))))

(-> conf
(dap--put-if-absent :dlvToolPath dap-dlv-go-delve-path)
(dap--put-if-absent :type "go")
(dap--put-if-absent :name "Go Dlv Debug")))
(dap--put-if-absent :dlvToolPath dap-dlv-go-delve-path)

(dap--put-if-absent :type "go")
(dap--put-if-absent :name "Go Dlv Debug")))

(defun dap-dlv-go--populate-auto-args (conf)
"Populate auto arguments according to CONF."
(dap--put-if-absent conf :program (buffer-file-name))

(if (string-suffix-p "_test.go" (buffer-file-name))
(plist-put conf :mode "test")
(plist-put conf :mode "debug")))
(plist-put conf :mode "test")
(plist-put conf :mode "debug")))

(defun dap-dlv-go--populate-test-args (conf)
"Populate auto arguments according to CONF."
Expand All @@ -118,59 +124,59 @@
(defun dap-dlv-go--extract-current--method-or-function-name (&optional no-signal?)
"Extract current method or function name."
(let ((symbols (lsp--get-document-symbols)))
(or (->> symbols
(-keep
(-lambda ((&DocumentSymbol :kind :range :selection-range))
(-let (((beg . end) (lsp--range-to-region range)))
(and (or (= lsp/symbol-kind-method kind)
(= lsp/symbol-kind-function kind))
(<= beg (point) end)
(lsp-region-text selection-range)))))
(car))
(unless no-signal?
(user-error "No method or function at point")))))
(or (->> symbols
(-keep
(-lambda ((&DocumentSymbol :kind :range :selection-range))
(-let (((beg . end) (lsp--range-to-region range)))
(and (or (= lsp/symbol-kind-method kind)
(= lsp/symbol-kind-function kind))
(<= beg (point) end)
(lsp-region-text selection-range)))))
(car))
(unless no-signal?
(user-error "No method or function at point")))))

(defun dap-dlv-go--extract-current-subtest-name (&optional no-signal?)
"Extract current subtest name."
(save-excursion
(save-restriction
(search-backward-regexp "^[[:space:]]*{" nil t)
(search-forward-regexp "name:[[:space:]]+[\"`]\\(.*\\)[\"`]\," nil t)
(or (match-string-no-properties 1)
(unless no-signal?
(user-error "No subtest at point"))))))
(save-restriction
(search-backward-regexp "^[[:space:]]*{" nil t)
(search-forward-regexp "name:[[:space:]]+[\"`]\\(.*\\)[\"`]\," nil t)
(or (match-string-no-properties 1)
(unless no-signal?
(user-error "No subtest at point"))))))

(defun dap-dlv-go--parse-env-file (file)
"Parse env FILE."
(with-temp-buffer
(save-match-data
(find-file file)
(setq-local buffer-file-name nil)
(replace-regexp "[[:space:]]*#.*$" "" nil (point-min) (point-max))
(let ((res (make-hash-table)))
(goto-char (point-min))
(while (search-forward-regexp "\\(^[^=].*\\)=\\(.*\\)$" nil t)
(ht-set res (match-string 1) (match-string 2)))
(kill-buffer)
res))))
(save-match-data
(find-file file)
(setq-local buffer-file-name nil)
(replace-regexp "[[:space:]]*#.*$" "" nil (point-min) (point-max))
(let ((res (make-hash-table)))
(goto-char (point-min))
(while (search-forward-regexp "\\(^[^=].*\\)=\\(.*\\)$" nil t)
(ht-set res (match-string 1) (match-string 2)))
(kill-buffer)
res))))

(defun dap-dlv-go--get-cmd-pid (cmd)
"Return pid of CMD."
(string-to-number
(cadr
(s-split-words
(car
(seq-filter
(lambda(s) (s-contains? cmd s))
(process-lines (executable-find "ps") "aux")))))))
(s-split-words
(car
(seq-filter
(lambda(s) (s-contains? cmd s))
(process-lines (executable-find "ps") "aux")))))))

(defun dap-dlv-go--run-cmd-in-vterm (cmd buf)
"Run CMD with vterm in BUF."
(with-current-buffer buf
(require 'vterm)
(let ((vterm-shell cmd)
(vterm-kill-buffer-on-exit nil))
(vterm-mode))))
(require 'vterm)
(let ((vterm-shell cmd)
(vterm-kill-buffer-on-exit nil))
(vterm-mode))))

(defun dap-dlv-go--run-cmd-in-vterm-get-pid (cmd buf)
"Run CMD in vterm inside BUF and return pid."
Expand All @@ -182,80 +188,80 @@
With `C-u' you can edit command before run."
(interactive)
(let* ((exe (f-expand (read-file-name "enter path to executable: ")))
(cmd (if (equal (car current-prefix-arg) 4)
(read-string "command: " exe)
exe))
(buf (generate-new-buffer
(format "*%s console*"
(f-base exe))))
(debug-port (dap--find-available-port))
(pid (dap-dlv-go--run-cmd-in-vterm-get-pid cmd buf)))
(dap-start-debugging-noexpand (list :type "go"
:request "attach"
:name "Attach to running process"
:mode "local"
:host "localhost"
:debugServer debug-port
:processId pid
:dlvToolPath dap-dlv-go-delve-path
:program-to-start
(format
"%s dap --listen 127.0.0.1:%s %s"
dap-dlv-go-delve-path
debug-port
dap-dlv-go-extra-args)))
(display-buffer buf)
(dap-ui--show-buffer buf)))
(cmd (if (equal (car current-prefix-arg) 4)
(read-string "command: " exe)
exe))
(buf (generate-new-buffer
(format "*%s console*"
(f-base exe))))
(debug-port (dap--find-available-port))
(pid (dap-dlv-go--run-cmd-in-vterm-get-pid cmd buf)))
(dap-start-debugging-noexpand (list :type "go"
:request "attach"
:name "Attach to running process"
:mode "local"
:host "localhost"
:debugServer debug-port
:processId pid
:dlvToolPath dap-dlv-go-delve-path
:program-to-start
(format
"%s dap --listen 127.0.0.1:%s %s"
dap-dlv-go-delve-path
debug-port
dap-dlv-go-extra-args)))
(display-buffer buf)
(dap-ui--show-buffer buf)))

(dap-register-debug-provider "go" 'dap-dlv-go--populate-default-args)

(dap-register-debug-template "Go Dlv Launch File Configuration"
(list :type "go"
:request "launch"
:name "Launch File"
:mode "auto"
:program nil
:buildFlags nil
:args nil
:env nil))
(list :type "go"
:request "launch"
:name "Launch File"
:mode "auto"
:program nil
:buildFlags nil
:args nil
:env nil))

(dap-register-debug-template "Go Dlv Attach Configuration"
(list :type "go"
:request "attach"
:name "Attach to running process"
:mode "auto"))
(list :type "go"
:request "attach"
:name "Attach to running process"
:mode "auto"))

(dap-register-debug-template "Go Dlv Launch Executable Configuration"
(list :type "go"
:request "launch"
:name "Launch Executable"
:mode "exec"
:program nil
:args nil
:env nil))
(list :type "go"
:request "launch"
:name "Launch Executable"
:mode "exec"
:program nil
:args nil
:env nil))

(dap-register-debug-template "Go Dlv Remote Debug"
(list :type "go"
:request "attach"
:name "Dlv Remote Debug"
:mode "remote"))
(list :type "go"
:request "attach"
:name "Dlv Remote Debug"
:mode "remote"))

(dap-register-debug-template "Go Dlv Test Current Function Configuration"
(list :type "go"
:request "launch"
:name "Test function"
:mode "test"
:program nil
:args nil
:env nil))
(list :type "go"
:request "launch"
:name "Test function"
:mode "test"
:program nil
:args nil
:env nil))

(dap-register-debug-template "Go Dlv Test Current Subtest Configuration"
(list :type "go"
:request "launch"
:name "Test subtest"
:mode "test"
:program nil
:args nil
:env nil))
(list :type "go"
:request "launch"
:name "Test subtest"
:mode "test"
:program nil
:args nil
:env nil))
(provide 'dap-dlv-go)
;;; dap-dlv-go.el ends here
Loading

0 comments on commit 06594a5

Please sign in to comment.