Skip to content

Commit

Permalink
Merge pull request #167 from emacs-php/update/phpactor-master
Browse files Browse the repository at this point in the history
Update Phpactor 2024.03.09.0+
  • Loading branch information
zonuexe authored Apr 7, 2024
2 parents 08ece33 + d6dac8f commit e488ed4
Show file tree
Hide file tree
Showing 8 changed files with 8,580 additions and 638 deletions.
6 changes: 3 additions & 3 deletions company-phpactor.el
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ Here we create a temporary syntax table in order to add $ to symbols."
(modify-syntax-entry ?\$ "_" $temp-syn-table)

(with-syntax-table $temp-syn-table
(if (looking-at "\\_>")
(buffer-substring (point) (save-excursion (skip-syntax-backward "w_")
(point)))
(if (looking-at-p "\\_>")
(buffer-substring-no-properties (point) (save-excursion (skip-syntax-backward "w_.")
(point)))
(unless (and (char-after) (memq (char-syntax (char-after)) '(?w ?_)))
"")))))

Expand Down
5 changes: 2 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
"psr-4": {"EmacsPHP\\Phpactor\\Sample\\": "tests/src/"}
},
"require": {
"composer/package-versions-deprecated": "1.x-dev",
"phpactor/phpactor": "dev-master#8cd4fe14bc3b2bf0401c56708ce2b6e3bcbd7754"
"phpactor/phpactor": "dev-master"
},
"config": {
"classmap-authoritative": true,
Expand All @@ -31,7 +30,7 @@
},
"sort-packages": true,
"platform": {
"php": "7.4.28"
"php": "8.1.0"
},
"allow-plugins": {
"composer/package-versions-deprecated": true
Expand Down
Loading

0 comments on commit e488ed4

Please sign in to comment.