Use phpinspect--class-name, as index can be unset for live edited classes

phpinspect-class.el

@@ -218,9 +218,7 @@ Conditionally executes BODY depending on
     (let ((existing (gethash (phpinspect--function-name-symbol method)
                              (phpinspect--class-static-methods class))))
       (if existing
-          (phpinspect--merge-method
-           (alist-get 'class-name (phpinspect--class-index class))
-           existing method extended)
+          (phpinspect--merge-method (phpinspect--class-name class) existing method extended)
         (setf (phpinspect--function--inherited method) extended)
         (phpinspect--class-set-static-method class method)))))
 
@@ -232,9 +230,7 @@ Conditionally executes BODY depending on
                               (phpinspect--class-methods class))))
 
       (if existing
-          (phpinspect--merge-method
-           (alist-get 'class-name (phpinspect--class-index class))
-           existing method extended)
+          (phpinspect--merge-method (phpinspect--class-name class) existing method extended)
         (setf (phpinspect--function--inherited method) extended)
         (phpinspect--class-set-method class method)))))
 

phpinspect-completion.el

@@ -275,38 +275,38 @@ Returns list of `phpinspect--completion'."
 
 
 (defun phpinspect-complete-at-point ()
-  (let ((comp-list (phpinspect-completion-query-execute (phpinspect--get-completion-query)))
-        strings)
-    (obarray-map (lambda (sym) (push (symbol-name sym) strings)) (phpinspect--completion-list-completions comp-list))
-    (and (phpinspect--completion-list-has-candidates comp-list)
-         (list (phpinspect--completion-list-completion-start comp-list)
-               (phpinspect--completion-list-completion-end comp-list)
-               strings
-               :affixation-function
-               (lambda (completions)
-                 (let (affixated completion)
-                   (dolist (comp completions)
-                     (setq completion (phpinspect--completion-list-get-metadata comp-list comp))
-                     (push (list comp (phpinspect--prefix-for-completion completion)
-                                 (phpinspect--completion-meta completion))
-                           affixated))
-                   (nreverse affixated)))
-               :exit-function
-               (lambda (comp-name state)
-                 (let ((comp (phpinspect--completion-list-get-metadata
-                              phpinspect--last-completion-list
-                              comp-name)))
-                 (when (and (eq 'finished state)
-                            (eq 'function (phpinspect--completion-kind comp)))
-                   (insert "(")
-                   (when (= 0 (length (phpinspect--function-arguments
-                                       (phpinspect--completion-target comp))))
-                     (insert ")")))))
-               :company-kind (lambda (comp-name)
-                               (phpinspect--completion-kind
-                                (phpinspect--completion-list-get-metadata
-                                 phpinspect--last-completion-list
-                                 comp-name)))))))
-
+  (catch 'phpinspect-parse-interrupted
+    (let ((comp-list (phpinspect-completion-query-execute (phpinspect--get-completion-query)))
+          strings)
+      (obarray-map (lambda (sym) (push (symbol-name sym) strings)) (phpinspect--completion-list-completions comp-list))
+      (and (phpinspect--completion-list-has-candidates comp-list)
+           (list (phpinspect--completion-list-completion-start comp-list)
+                 (phpinspect--completion-list-completion-end comp-list)
+                 strings
+                 :affixation-function
+                 (lambda (completions)
+                   (let (affixated completion)
+                     (dolist (comp completions)
+                       (setq completion (phpinspect--completion-list-get-metadata comp-list comp))
+                       (push (list comp (phpinspect--prefix-for-completion completion)
+                                   (phpinspect--completion-meta completion))
+                             affixated))
+                     (nreverse affixated)))
+                 :exit-function
+                 (lambda (comp-name state)
+                   (let ((comp (phpinspect--completion-list-get-metadata
+                                phpinspect--last-completion-list
+                                comp-name)))
+                     (when (and (eq 'finished state)
+                                (eq 'function (phpinspect--completion-kind comp)))
+                       (insert "(")
+                       (when (= 0 (length (phpinspect--function-arguments
+                                           (phpinspect--completion-target comp))))
+                         (insert ")")))))
+                 :company-kind (lambda (comp-name)
+                                 (phpinspect--completion-kind
+                                  (phpinspect--completion-list-get-metadata
+                                   phpinspect--last-completion-list
+                                   comp-name))))))))
 
 (provide 'phpinspect-completion)

phpinspect-index.el

@@ -60,6 +60,27 @@ of TYPE, if available."
   (or (not type)
       (phpinspect--type= type phpinspect--object-type)))
 
+(defun phpinspect--index-function-declaration (declaration type-resolver add-used-types)
+  (let (current name function-args return-type)
+    (catch 'break
+      (while (setq current (pop declaration))
+        (cond ((and (phpinspect-word-p current)
+                    (phpinspect-word-p (car declaration))
+                    (string= "function" (cadr current)))
+               (setq name (cadr (pop declaration))))
+              ((phpinspect-list-p current)
+               (setq function-args
+                     (phpinspect--index-function-arg-list
+                      type-resolver current add-used-types))
+
+               (when (setq return-type (seq-find #'phpinspect-word-p declaration))
+                 (setq return-type (funcall type-resolver
+                                            (phpinspect--make-type :name (cadr return-type)))))
+
+               (throw 'break nil)))))
+
+    (list name function-args return-type)))
+
 (defun phpinspect--index-function-from-scope (type-resolver scope comment-before &optional add-used-types namespace)
   "Index a function inside SCOPE token using phpdoc metadata in COMMENT-BEFORE.
 
@@ -69,9 +90,16 @@ function (think \"new\" statements, return types etc.)."
   (phpinspect--log "Indexing function")
   (let* ((php-func (cadr scope))
          (declaration (cadr php-func))
-         (type (if (phpinspect-word-p (car (last declaration)))
-                   (funcall type-resolver
-                            (phpinspect--make-type :name (cadar (last declaration)))))))
+         name type arguments)
+
+    (pcase-setq `(,name ,arguments ,type)
+                (phpinspect--index-function-declaration
+                 declaration type-resolver add-used-types))
+
+    ;; FIXME: Anonymous functions should not be indexed! (or if they are, they
+    ;; should at least not be visible from various UIs unless assigned to a
+    ;; variable as a closure).
+    (unless name (setq name "anonymous"))
 
     (phpinspect--log "Checking function return annotations")
 
@@ -114,12 +142,9 @@ function (think \"new\" statements, return types etc.)."
     (phpinspect--make-function
      :scope `(,(car scope))
      :token php-func
-     :name (concat (if namespace (concat namespace "\\") "") (cadadr (cdr declaration)))
+     :name (concat (if namespace (concat namespace "\\") "") name)
      :return-type (or type phpinspect--null-type)
-     :arguments (phpinspect--index-function-arg-list
-                 type-resolver
-                 (phpinspect-function-argument-list php-func)
-                 add-used-types))))
+     :arguments arguments)))
 
 (define-inline phpinspect--safe-cadr (list)
   (inline-letevals (list)

phpinspect.el

@@ -224,7 +224,8 @@ Example configuration for `company-mode':
     (add-hook \\='php-mode-hook #\\='my-php-personal-hook)
 
     ;; End example configuration."
-  :after-hook (phpinspect--mode-function))
+  :after-hook (phpinspect--mode-function)
+  :keymap  (list (cons (kbd "C-c u") #'phpinspect-fix-imports)))
 
 (defun phpinspect--suggest-at-point ()
   (phpinspect--log "Entering suggest at point. Point: %d" (point))