[elpa] externals/phps-mode 531c98cf2b 053/135: Improved bookkeeping of class properties

[Christian Johansson]

branch: externals/phps-mode
commit 531c98cf2bba922d380565f3d55bfdc148af53bf
Author: Christian Johansson <christian@cvj.se>
Commit: Christian Johansson <christian@cvj.se>

    Improved bookkeeping of class properties
---
 phps-mode-parser-sdt.el    | 157 ++++++++++++++++++++++++++++++---------------
 test/phps-mode-test-ast.el |   2 +-
 2 files changed, 108 insertions(+), 51 deletions(-)

diff --git a/phps-mode-parser-sdt.el b/phps-mode-parser-sdt.el
index 6416030b93..cdbed20839 100644
--- a/phps-mode-parser-sdt.el
+++ b/phps-mode-parser-sdt.el
@@ -3011,54 +3011,6 @@
 (puthash
  300
  (lambda(args terminals)
-   ;; Go through stacks and modify symbol namespaces
-   ;; - add function scope but only for non-super-global variables
-   (let ((function-name (nth 3 args))
-         (is-static-p))
-     (when-let (method-modifiers (nth 0 args))
-       (dolist (method-modifier method-modifiers)
-         (when (equal method-modifier 'static)
-           (setq is-static-p t))))
-     (unless is-static-p
-       (push
-        (list
-         "$this"
-         phps-mode-parser-sdt--bookkeeping-namespace
-         (car (cdr (car (nth 10 terminals))))
-         (cdr (cdr (car (cdr (cdr (nth 10 terminals)))))))
-        phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack))
-     (when phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack
-       (dolist (
-                symbol-list
-                phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack)
-         (let ((symbol-name (car symbol-list)))
-           (unless (gethash
-                    symbol-name
-                    phps-mode-parser-sdt--bookkeeping--superglobal-variable-p)
-             (let ((symbol-scope (car (cdr symbol-list))))
-               (push
-                (list 'function function-name)
-                symbol-scope)
-               (setcar
-                (cdr symbol-list)
-                symbol-scope))))))
-
-     (when phps-mode-parser-sdt--bookkeeping-symbol-stack
-       (dolist (
-                symbol-list
-                phps-mode-parser-sdt--bookkeeping-symbol-stack)
-         (let ((symbol-name (car symbol-list)))
-           (unless (gethash
-                    symbol-name
-                    phps-mode-parser-sdt--bookkeeping--superglobal-variable-p)
-             (let ((symbol-scope (car (cdr symbol-list))))
-               (push
-                (list 'function function-name)
-                symbol-scope)
-               (setcar
-                (cdr symbol-list)
-                symbol-scope)))))))
-
    `(
      ast-type
      method
@@ -3118,7 +3070,6 @@
                   (plist-get property 'ast-type)))
              (cond
               ((equal property-type 'property-variable)
-               ;; TODO Bookkeep proerty-variable here
                (let ((symbol-name
                       (plist-get property 'variable))
                      (symbol-start
@@ -3133,7 +3084,113 @@
                    symbol-scope
                    symbol-start
                    symbol-end)
-                  
phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack))))))))))
+                  
phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack))))))))
+
+      ((equal attributed-class-statement-type 'method)
+       ;; Go through stacks and modify symbol namespaces
+       ;; - add function scope but only for:
+       ;;     - non-super-global variables
+       ;;     - symbols defined inside function limits
+       (let ((function-name
+              (plist-get
+               attributed-class-statement
+               'ast-name))
+             (function-start
+              (plist-get
+               attributed-class-statement
+               'ast-start))
+             (function-end
+              (plist-get
+               attributed-class-statement
+               'ast-end))
+             (function-parameter-list
+              (plist-get
+               attributed-class-statement
+               'parameter-list))
+             (is-static-p))
+
+         (when-let (method-modifiers
+                    (plist-get
+                     attributed-class-statement
+                     'modifiers))
+           (dolist (method-modifier method-modifiers)
+             (when (equal method-modifier 'static)
+               (setq is-static-p t))))
+         (unless is-static-p
+           (push
+            (list
+             "$this"
+             phps-mode-parser-sdt--bookkeeping-namespace
+             (plist-get attributed-class-statement 'ast-start)
+             (plist-get attributed-class-statement 'ast-end))
+            phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack))
+         (when phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack
+           (dolist (
+                    symbol-list
+                    phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack)
+             (let ((symbol-name (car symbol-list))
+                   (symbol-start (nth 2 symbol-list)))
+               (unless (or
+                        (gethash
+                         symbol-name
+                         
phps-mode-parser-sdt--bookkeeping--superglobal-variable-p)
+                        (< symbol-start function-start)
+                        (> symbol-start function-end))
+                 (let ((symbol-scope (car (cdr symbol-list))))
+                   (push
+                    (list 'function function-name)
+                    symbol-scope)
+                   (setcar
+                    (cdr symbol-list)
+                    symbol-scope))))))
+         (when phps-mode-parser-sdt--bookkeeping-symbol-stack
+           (dolist (
+                    symbol-list
+                    phps-mode-parser-sdt--bookkeeping-symbol-stack)
+             (let ((symbol-name (car symbol-list))
+                   (symbol-start (nth 2 symbol-list)))
+               (unless (or
+                        (gethash
+                         symbol-name
+                         
phps-mode-parser-sdt--bookkeeping--superglobal-variable-p)
+                        (< symbol-start function-start)
+                        (> symbol-start function-end))
+                 (let ((symbol-scope (car (cdr symbol-list))))
+                   (push
+                    (list 'function function-name)
+                    symbol-scope)
+                   (setcar
+                    (cdr symbol-list)
+                    symbol-scope))))))
+
+         ;; Bookkeep method parameters
+         (let ((symbol-scope
+                phps-mode-parser-sdt--bookkeeping-namespace))
+           (push (list 'function function-name) symbol-scope)
+           (dolist (parameter function-parameter-list)
+             (let ((parameter-ast-type
+                    (plist-get parameter 'ast-type)))
+               (cond
+                ((equal parameter-ast-type 'attributed-parameter)
+                 (let* ((attributed-parameter
+                         (plist-get
+                          parameter
+                          'parameter))
+                        (attributed-parameter-name
+                         (plist-get attributed-parameter 'ast-name))
+                        (symbol-name
+                         attributed-parameter-name)
+                        (symbol-start
+                         (plist-get attributed-parameter 'ast-start))
+                        (symbol-end
+                         (plist-get attributed-parameter 'ast-end)))
+                   (push
+                    (list
+                     symbol-name
+                     symbol-scope
+                     symbol-start
+                     symbol-end)
+                    
phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack)))))))))))
 
    `(
      ast-type
diff --git a/test/phps-mode-test-ast.el b/test/phps-mode-test-ast.el
index 1569d34f48..43e9099371 100644
--- a/test/phps-mode-test-ast.el
+++ b/test/phps-mode-test-ast.el
@@ -236,7 +236,7 @@
   (phps-mode-test-ast--should-bookkeep
    "<?php\n\nnamespace myNamespaceA {\n    $var = 123;\n    class myClassA {\n 
       private $var2 = 123;\n        public static function myFunctionA($var3) 
{\n            $var4 = 123;\n            if ($var) {\n                echo 
'Miss';\n            }\n            if ($var2) {\n                echo 
'Miss';\n            }\n            if ($var3) {\n                echo 'Hit';\n 
           }\n            if ($var4) {\n                echo 'Hit';\n           
 }\n        }\n\n        fun [...]
    "Bookkeeping in maximum level with namespaces, classes and functions."
-   '((" namespace myNamespaceA id $var" ((37 41))) ((37 41) 1) (" namespace 
myNamespaceA class myClassA function myFunctionB id $this" ((500 941))) (" 
namespace myNamespaceA class myClassA function myFunctionB id $var6" ((514 
519))) (" namespace myNamespaceA class myClassA function myFunctionA id $var4" 
((163 168))) (" namespace myNamespaceA class myClassA function myFunctionA id 
$var2" ((86 91))) ((881 886) 1) ((814 819) 0) ((746 751) 0) ((678 683) 0) ((610 
615) 0) ((543 547) 0) ((514 5 [...]
+   '((" namespace myNamespaceA id $var" ((37 41))) ((37 41) 1) (" namespace 
myNamespaceA class myClassA function myFunctionB id $var5" ((485 490))) (" 
namespace myNamespaceA class myClassA function myFunctionB id $this" ((500 
941))) (" namespace myNamespaceA class myClassA function myFunctionB id $var6" 
((514 519))) (" namespace myNamespaceA class myClassA function myFunctionA id 
$var3" ((142 147))) (" namespace myNamespaceA class myClassA function 
myFunctionA id $var4" ((163 168))) (" n [...]
 
   (phps-mode-test-ast--should-bookkeep
    "<?php\n\n// Conditional assignments\n\n$items = array(1, 2, 3);\nforeach 
($items as $item) {\n    if ($item) {\n        echo 'Hit';\n    }\n}\nforeach 
($items as $key => $value) {\n    if ($key || $value) {\n        echo 'Hit';\n  
  }\n}\nfor ($i = 0; $i < count($items); $i++) {\n    if ($i) {\n        echo 
'Hit';\n    }\n}\nif ($a = 123) {\n    if ($a) {\n        echo 'Hit';\n    
}\n}\nwhile ($b = 123) {\n    if ($a) {\n        echo 'Hit';\n    }\n}\ndo {\n  
  echo 'Hit';\n} while ( [...]