branch: externals/phpinspect
commit 475c26a5dce83066b3b841d923cdb37b96e0428a
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>

    Fix bug in indexation of use statements (check if property type is nil)
---
 phpinspect-buffer.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/phpinspect-buffer.el b/phpinspect-buffer.el
index c6053686dd..3f1338a84d 100644
--- a/phpinspect-buffer.el
+++ b/phpinspect-buffer.el
@@ -911,10 +911,11 @@ If provided, PROJECT must be an instance of 
`phpinspect-project'."
 
 (defun phpinspect-buffer--update-class-variable-fqn-type (buffer variable-meta 
type)
   (when-let ((prop (cdr (phpinspect-buffer-get-index-for-token
-                          buffer (phpinspect-meta-token variable-meta))))
-             (base-name (phpinspect--type-base-name-sym type)))
-    (when (eq base-name (phpinspect--type-base-name-sym (phpi-prop-type prop)))
-      (setf (phpi-prop-type prop) type))))
+                         buffer (phpinspect-meta-token variable-meta)))))
+    (let ((base-name (phpinspect--type-base-name-sym type)))
+      (when (and (phpi-prop-type prop)
+                 (eq base-name (phpinspect--type-base-name-sym (phpi-prop-type 
prop))))
+        (setf (phpi-prop-type prop) type)))))
 
 (defun phpinspect-buffer--index-use (buffer token-meta)
   (let ((tokens

Reply via email to