|
90 | 90 | (let ((vendor-executable (f-join (phpactor-package-directory) "vendor/bin/phpactor"))) |
91 | 91 | (when (file-exists-p vendor-executable) |
92 | 92 | vendor-executable)) |
93 | | - (error "Phpactor not found. Please run phpactor-update"))) |
| 93 | + (error "Phpactor not found. Please run phpactor-update"))) |
94 | 94 |
|
95 | 95 | (defun phpactor-update () |
96 | 96 | "Install or update phpactor inside phpactor.el's folder." |
97 | 97 | (interactive) |
98 | 98 | (let ((package-folder (phpactor-package-directory)) |
99 | 99 | (composer-executable (car (composer--find-executable)))) |
100 | | - (unless composer-executable (error ("composer not found."))) |
| 100 | + (unless composer-executable (error "`composer' not found")) |
101 | 101 | (setq default-directory package-folder) |
102 | | - (call-process composer-executable nil (get-buffer-create phpactor-action--buffer-name) nil "install" "--no-dev"))) |
| 102 | + (call-process composer-executable nil (get-buffer-create phpactor--buffer-name) nil "install" "--no-dev"))) |
103 | 103 |
|
104 | 104 | (defun phpactor-package-directory () |
105 | 105 | "Return the folder where phpactor.el is installed." |
|
325 | 325 | (vector (list |
326 | 326 | (phpactor-truncate-left in-project-path phpactor-references-list-col1-width) |
327 | 327 | . ('action |
328 | | - (lambda (event) (phpactor-open-file-other-window path (plist-get references :start))) |
| 328 | + (lambda (_event) (phpactor-open-file-other-window path (plist-get references :start))) |
329 | 329 | 'help-echo path)) |
330 | 330 | (number-to-string (plist-get references :line_no)))))) |
331 | 331 |
|
|
361 | 361 |
|
362 | 362 | (let ((buf (find-buffer-visiting path))) |
363 | 363 | (when (and force_reload buf) |
364 | | - (progn |
365 | | - (set-buffer buf) |
366 | | - (revert-buffer t t t)))) |
| 364 | + (progn |
| 365 | + (set-buffer buf) |
| 366 | + (revert-buffer t t t)))) |
367 | 367 | (find-file path) |
368 | 368 | (goto-char (1+ (byte-to-position (max 1 offset))))) |
369 | 369 |
|
@@ -480,7 +480,7 @@ function." |
480 | 480 | (when (and version (not (equal phpactor--supported-rpc-version version))) |
481 | 481 | (if (phpactor-executable) |
482 | 482 | (error "Phpactor uses rpc protocol %s but this package requires %s" version phpactor--supported-rpc-version) |
483 | | - (error "Phpactor should be upgraded. Please run phpactor-update"))) |
| 483 | + (error "Phpactor should be upgraded. Please run phpactor-update"))) |
484 | 484 | (phpactor--add-history 'phpactor-action-dispatch (list :action action :parameters parameters :version version)) |
485 | 485 | (let ((func (cdr-safe (assq (intern action) phpactor-action-table)))) |
486 | 486 | (if func |
|
0 commit comments