Merge develop branch #112

zonuexe · 2019-03-25T16:01:49Z

This PR rebased develop from master. After merging this branch into master, we can create a new develop branch again.

Diff

git diff origin/develop origin/merge/develop

diff --git a/composer.json b/composer.json
index c406c4e..9cbb67f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,8 +21,10 @@
         "phpactor/phpactor": "^0.12.0"
     },
     "config": {
-        "optimize-autoloader": true,
         "classmap-authoritative": true,
+        "discard-changes": true,
+        "optimize-autoloader": true,
+        "preferred-install": "dist",
         "sort-packages": true,
         "platform": {
             "php": "7.1.3"
diff --git a/phpactor.el b/phpactor.el
index 161242b..a22fa64 100644
--- a/phpactor.el
+++ b/phpactor.el
@@ -372,8 +372,8 @@ of GitHub.")
             (insert-text-button (phpactor-truncate-left path phpactor-references-list-col1-width)
                                 'action (lambda (_) (find-file path) (goto-char (plist-get reference :start)))
                                 'help-echo "mouse-2: visit this file in other window")
-          (insert ": ")
-          (insert (number-to-string (plist-get reference :line_no)))
+            (insert ": ")
+            (insert (number-to-string (plist-get reference :line_no)))
             (insert "\n")))))
     (goto-char 0)
     (grep-mode)))

Invoke action as if it was chosen from the context menu. Phpactor seems to have an issue with this rpc action invoked directly. As long as it's not fixed, this does the job.

Thanks Steve Purcell use of pcase instead of cl-case

…rary

Instead of the package's directory, copy the file to the user's .emacs.d directory and install it.

The term "Package" is ambiguous for both Lisp package (ELPA) and PHP package (Composer). Here we used Composer to try to set up Phpactor in a different directory with package.el, which meant Composer package.

Before the change, when phpactor-install-directory was NIL, it falls back to the directory of the Lisp package. However, there is no demand for that function, so we no longer have such an option.

The purpose of this change is to resolve the "package" ambiguity between Lisp and PHP.

add travis conf in order to run buttercup tests test phpactor installation test phpactor-get-working-dir (remove unused phpactor-working-dir variable) test phpactor--lisp-directory and add a fix for it

That was a temporary solution for bug phpactor/phpactor#622

It was too soon to remove replace_file_source as it is sometimes invoked from a callback

Add function for those refactoring, making them accesible directly (ie not only via context menu)

ensime-mode has a similar implementation, which does not rely on tabulated mode and I liked the shorter implementation (grep-mode makes it easy to kill the buffer with a single keystroke). Besides, set-window-dedicated-p helps make the buffer sticky.

)

we're using phpactor-install-or-update now

this time, targeting develop

This allows user add extra behaviour (like code formatting) after buffer is modified by phpactor.

without working-directory, phpactor isn't very helpful.

also remove useless call to all-completions

kermorgant

LGTM, thx

zonuexe · 2019-04-03T02:16:11Z

@kermorgant Thanks!

kermorgant and others added 30 commits March 26, 2019 00:38

add support for generate_accessor rpc action

1a992f9

Invoke action as if it was chosen from the context menu. Phpactor seems to have an issue with this rpc action invoked directly. As long as it's not fixed, this does the job.

remove cl-lib dependency from company-phpactor

467fe56

Thanks Steve Purcell use of pcase instead of cl-case

Documentation of phpactor's company backend setup

9cd235c

Add a pair after completing with a function.

e8dc244

Add customize variable phpactor-package-directory

6d2c6a7

Require php-runtime package for PHP's copy() function

5c03373

Add constant phpactor--base-directory and prioritize it to locate-lib…

514509f

…rary

Rename and refactor phpactor-install-or-update

7d71ff9

Instead of the package's directory, copy the file to the user's .emacs.d directory and install it.

Modify doc comment to clarify intent

0f011b2

Rename phpactor-package-directory to phpactor-install-directory

10d9339

The term "Package" is ambiguous for both Lisp package (ELPA) and PHP package (Composer). Here we used Composer to try to set up Phpactor in a different directory with package.el, which meant Composer package.

Expand phpactor--get-package-directory call to a variable

411d8e5

Before the change, when phpactor-install-directory was NIL, it falls back to the directory of the Lisp package. However, there is no demand for that function, so we no longer have such an option.

Refactory phpactor--base-directory and modify doc comment

c7747a4

Rename phpactor--lisp-directory and add strict check of file system

bd19ca0

The purpose of this change is to resolve the "package" ambiguity between Lisp and PHP.

Add comment about reason not to use f-join

c1e4047

removal of redundant or unused code

914e404

Create .gitignore to prevent unnecessary files from being copied

661d7fa

add support for add_missing_assignments transform

38f1fc7

buttercup first tests with linked changes in phactor.el

c63db83

add travis conf in order to run buttercup tests test phpactor installation test phpactor-get-working-dir (remove unused phpactor-working-dir variable) test phpactor--lisp-directory and add a fix for it

upgrade to phpactor 0.12.0

a95821a

Avoid use of context_menu rpc action for generate_accessor action

f7d2caa

That was a temporary solution for bug phpactor/phpactor#622

Map replace_file_source to phpactor-action-update-file-source (#92)

bcc702a

It was too soon to remove replace_file_source as it is sometimes invoked from a callback

add support for class_new, class_inflect and extract_constant (#93)

343020e

Add function for those refactoring, making them accesible directly (ie not only via context menu)

add support for generate_method refactoring (#97)

fed223b

add support for hover rpc action + documentation for it with eldoc (#102

782a5ee

)

update notices after rename of phpactor-update (#104)

df6e511

we're using phpactor-install-or-update now

bugfix for bug #95, using find-file-noselect (#105)

a380dc6

this time, targeting develop

update composer.lock (#107)

94885b4

add phpactor-update-file-hook (#109)

1b4642a

This allows user add extra behaviour (like code formatting) after buffer is modified by phpactor.

return default-directory when php-project-get-root-dir fails (#110)

125bb1c

without working-directory, phpactor isn't very helpful.

kermorgant and others added 2 commits March 26, 2019 00:42

check phpactor-find-executable before completion (#106)

548d302

also remove useless call to all-completions

Fix indentation

da9fd01

zonuexe requested a review from kermorgant March 25, 2019 16:02

kermorgant approved these changes Mar 28, 2019

View reviewed changes

zonuexe merged commit 5dc3316 into master Apr 3, 2019

zonuexe deleted the merge/develop branch April 3, 2019 02:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge develop branch #112

Merge develop branch #112

Uh oh!

zonuexe commented Mar 25, 2019

Uh oh!

kermorgant left a comment

Uh oh!

zonuexe commented Apr 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Merge develop branch #112

Merge develop branch #112

Uh oh!

Conversation

zonuexe commented Mar 25, 2019

Diff

Uh oh!

kermorgant left a comment

Choose a reason for hiding this comment

Uh oh!

zonuexe commented Apr 3, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants