branch: externals/phpinspect
commit 2b85271b2b57e784721c8b8f5e39c2f58bf7376b
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>
Test + fix get-last-statement-in-token for static attribute references
---
phpinspect.el | 26 +++++++++++++++-----------
test/phpinspect-test.el | 36 ++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/phpinspect.el b/phpinspect.el
index 6184206fc8..589c79dd96 100644
--- a/phpinspect.el
+++ b/phpinspect.el
@@ -136,11 +136,18 @@ Type can be any of the token types returned by
(defun phpinspect-comma-p (token)
(phpinspect-type-p token :comma))
-(defun phpinspect-end-of-statement-p (token)
+(defsubst phpinspect-terminator-p (token)
+ (phpinspect-type-p token :terminator))
+
+(defsubst phpinspect-end-of-token-p (token)
(or (phpinspect-terminator-p token)
(phpinspect-comma-p token)
(phpinspect-html-p token)))
+(defsubst phpinspect-end-of-statement-p (token)
+ (or (phpinspect-end-of-token-p token)
+ (phpinspect-block-p token)))
+
(defsubst phpinspect-incomplete-block-p (token)
(phpinspect-type-p token :incomplete-block))
@@ -150,7 +157,7 @@ Type can be any of the token types returned by
(defun phpinspect-end-of-use-p (token)
(or (phpinspect-block-p token)
- (phpinspect-end-of-statement-p token)))
+ (phpinspect-end-of-token-p token)))
(defun phpinspect-static-p (token)
(phpinspect-type-p token :static))
@@ -242,20 +249,17 @@ Type can be any of the token types returned by
(defun phpinspect--static-terminator-p (token)
(or (phpinspect-function-p token)
- (phpinspect-end-of-statement-p token)))
+ (phpinspect-end-of-token-p token)))
(defun phpinspect--scope-terminator-p (token)
(or (phpinspect-function-p token)
- (phpinspect-end-of-statement-p token)
+ (phpinspect-end-of-token-p token)
(phpinspect-const-p token)
(phpinspect-static-p token)))
(defun phpinspect-namespace-keyword-p (token)
(and (phpinspect-word-p token) (string= (car (last token)) "namespace")))
-(defun phpinspect-terminator-p (token)
- (phpinspect-type-p token :terminator))
-
(defun phpinspect-use-keyword-p (token)
(and (phpinspect-word-p token) (string= (car (last token)) "use")))
@@ -607,7 +611,7 @@ token is \";\", which marks the end of a statement in PHP."
:const
'(word comment assignment-operator string array
terminator)
- #'phpinspect-end-of-statement-p))
+ #'phpinspect-end-of-token-p))
(token (funcall parser (current-buffer) max-point)))
(when (phpinspect-incomplete-token-p (car (last token)))
(setcar token :incomplete-const))
@@ -744,7 +748,7 @@ nature like argument lists"
(defsubst phpinspect-get-or-create-declaration-parser ()
(phpinspect-get-parser-create :declaration
'(comment word list terminator tag)
- #'phpinspect-end-of-statement-p))
+ #'phpinspect-end-of-token-p))
(phpinspect-defhandler function-keyword (start-token max-point)
@@ -754,7 +758,7 @@ nature like argument lists"
(let* ((parser (phpinspect-get-or-create-declaration-parser))
(continue-condition (lambda () (not (char-equal (char-after) ?{))))
(declaration (funcall parser (current-buffer) max-point
continue-condition)))
- (if (phpinspect-end-of-statement-p (car (last declaration)))
+ (if (phpinspect-end-of-token-p (car (last declaration)))
(list :function declaration)
(list :function
declaration
@@ -2155,7 +2159,7 @@ static variables and static methods."
(setq keep-taking nil))
(setq last-test (phpinspect-variable-p elt))
(and keep-taking
- (not (phpinspect-terminator-p elt))
+ (not (phpinspect-end-of-statement-p elt))
(listp elt))))
(reverse token))))
diff --git a/test/phpinspect-test.el b/test/phpinspect-test.el
index 2e43bd0d85..3ae2e8ccf3 100644
--- a/test/phpinspect-test.el
+++ b/test/phpinspect-test.el
@@ -423,5 +423,41 @@ class Thing
(phpinspect--make-type-resolver-for-resolvecontext
context))))))
+(ert-deftest
phpinspect-get-last-statement-in-token-with-static-attribute-context ()
+ (let* ((php-code-function "
+ function doStuff()
+ {
+ return self::doThing()")
+ (php-code-block "
+ {
+ return self::doThing()")
+ (php-code-preceding-block "
+ function doStuff()
+ {
+ if (true === true) {
+ forach ($things as $k => $v) {
+ }
+ }
+ self::doThing()")
+ (php-code-bare "Thing::something(); Something::other()")
+ (get-last-statement
+ (lambda (php-code)
+ (phpinspect--get-last-statement-in-token
+ (car (cdr (phpinspect-parse-string php-code)))))))
+
+ (should (equal `((:word "return") (:word "self") (:static-attrib (:word
"doThing"))
+ (:list))
+ (funcall get-last-statement php-code-function)))
+ (should (equal `((:word "return") (:word "self") (:static-attrib (:word
"doThing"))
+ (:list))
+ (funcall get-last-statement php-code-block)))
+ (should (equal `((:word "self") (:static-attrib (:word "doThing"))
+ (:list))
+ (funcall get-last-statement php-code-preceding-block)))
+ (should (equal `((:word "Something") (:static-attrib (:word "other"))
+ (:list))
+ (phpinspect--get-last-statement-in-token
+ (phpinspect-parse-string php-code-bare))))))
+
(provide 'phpinspect-test)
;;; phpinspect-test.el ends here
