Skip to content

Use absolute path #26

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 2 commits into from
May 27, 2018
Merged

Use absolute path #26

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
807da75
Improve phpacor-executable, support path-expansion and local installed
zonuexe May 27, 2018
47b965b
Add phpactor--expand-local-file-name
zonuexe May 27, 2018
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
25 changes: 17 additions & 8 deletions phpactor.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,24 @@
;; Utility functions
(defun phpactor-find-executable ()
"Return Phpactor command or path to executable."
(or phpactor-executable
(executable-find phpactor-command-name)))
(or (when phpactor-executable
(php-project--eval-bootstrap-scripts phpactor-executable))
(executable-find phpactor-command-name)
(let ((vendor-executable (f-join (phpactor-get-working-dir) "vendor/bin/phpactor")))
(when (file-exists-p vendor-executable)
vendor-executable))))

(defun phpactor-get-working-dir ()
"Return working directory of Phpactor."
(directory-file-name
(expand-file-name
(or phpactor-working-dir (php-project-get-root-dir)))))

(defun phpactor--expand-local-file-name (name)
"Expand file name by `NAME'."
;; TODO: Support TRAMP
(expand-file-name name))

(defun phpactor--make-command-string (sub-command &rest args)
"Return command string by `SUB-COMMAND' and `ARGS'."
(declare (indent 1))
Expand Down Expand Up @@ -199,9 +208,10 @@
(cl-case key
(:source (buffer-substring-no-properties
(point-min) (point-max)))
(:path buffer-file-name)
(:path (phpactor--expand-local-file-name buffer-file-name))
(:source_path (phpactor--expand-local-file-name buffer-file-name))
(:offset (1- (point)))
(:current_path buffer-file-name)
(:current_path (phpactor--expand-local-file-name buffer-file-name))
(t (error "`%s' is unknown argument" key))))

(defun phpactor--command-argments (&rest arg-keys)
Expand Down Expand Up @@ -300,14 +310,14 @@
(defun phpactor-copy-class ()
"Execute Phpactor RPC copy_class command."
(interactive)
(let ((arguments (list :source_path (expand-file-name buffer-file-name))))
(let ((arguments (phpactor--command-argments :source_path)))
(apply #'phpactor-action-dispatch (phpactor--rpc "copy_class" arguments))))

;;;###autoload
(defun phpactor-move-class ()
"Execute Phpactor RPC move_class command."
(interactive)
(let ((arguments (list :source_path (expand-file-name buffer-file-name))))
(let ((arguments (phpactor--command-argments :source_path)))
(apply #'phpactor-action-dispatch (phpactor--rpc "move_class" arguments))))

;;;###autoload
Expand Down Expand Up @@ -335,8 +345,7 @@
(defun phpactor-navigate ()
"Execute Phpactor RPC navigate command."
(interactive)
(let ((arguments (list :source_path (file-relative-name buffer-file-name
(phpactor-get-working-dir)))))
(let ((arguments (phpactor--command-argments :source_path)))
(apply #'phpactor-action-dispatch (phpactor--rpc "navigate" arguments))))

;;;###autoload
Expand Down