Skip to content

Use native JSON functionality if available #115

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
May 31, 2019
Merged

Use native JSON functionality if available #115

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
32 changes: 26 additions & 6 deletions phpactor.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
(expand-file-name (locate-user-emacs-file "phpactor/")))
"Directory for setup Phactor. (default `~/.emacs.d/phpactor/')."
:type 'directory)

(defcustom phpactor-use-native-json t
"If non-nil, use native json parsing if available."
:group 'phpactor
:type 'boolean)

;; Variables
;;;###autoload
Expand Down Expand Up @@ -191,10 +196,8 @@ of GitHub.")
(defun phpactor--rpc (action arguments)
"Execute Phpactor `ACTION' subcommand with `ARGUMENTS'."
(phpactor--add-history 'phpactor--rpc (list action arguments))
(let ((json (json-encode (list :action action
:parameters arguments)))
(json-object-type 'plist)
(json-array-type 'list)
(let ((json (phpactor--serialize-json (list :action action
:parameters arguments)))
(output (get-buffer-create "*Phpactor Output*"))
(phpactor-executable (phpactor-find-executable))
(cwd (phpactor-get-working-dir)))
Expand All @@ -205,9 +208,26 @@ of GitHub.")
(erase-buffer)
(insert json)
(call-process-region (point-min) (point-max) phpactor-executable nil output nil "rpc" (format "--working-dir=%s" default-directory))
(with-current-buffer output
(goto-char (point-min))
(phpactor--parse-json output))))

(defun phpactor--parse-json (buffer)
"Read JSON string from BUFFER."
(with-current-buffer buffer
(goto-char (point-min))
(if (and phpactor-use-native-json
(fboundp 'json-serialize))
(with-no-warnings
(json-parse-buffer :object-type 'plist :array-type 'list))
(let ((json-object-type 'plist) (json-array-type 'list))
(json-read-object)))))

(defun phpactor--serialize-json (params)
"Serialize PARAMS in to a JSON string."
(if (and phpactor-use-native-json
(fboundp 'json-serialize))
(with-no-warnings
(json-serialize params :null-object nil :false-object :json-false))
(json-encode params)))

;;; Phpactor Action

Expand Down