[elpa] externals/phps-mode ff474c9 392/405: Work on invalid imenu

[Stefan Monnier]

branch: externals/phps-mode
commit ff474c93e09f04eb1560f1bf5f46c7efa5422b63
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Work on invalid imenu
---
 phps-mode-functions.el      | 2 +-
 phps-mode-test-functions.el | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 6c55ec4..92f9dd0 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -290,7 +290,7 @@
                     (setq imenu-class-index '())
                     (let ((imenu-label (format "class %s" 
imenu-in-class-name)))
                       (if imenu-in-namespace-name
-                          (push `(,imenu-label . ,imenu-in-class-index) 
imenu-namespace-index)
+                          (push `(,imenu-label . ,imenu-in-class-index) 
imenu-class-index)
                         (push `(,imenu-label . ,imenu-in-class-index) 
imenu-index))))
 
                    ((and (equal token 'T_STRING)
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index 725b8ae..9beb0ec 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -840,7 +840,7 @@
   (phps-mode-test-with-buffer
    "<?php\nnamespace myNamespace;\nclass myClass {\n    public function 
myFunctionA() {}\n    protected function myFunctionB() {}\n}\n"
    "Imenu object-oriented file with bracket-less namespace, class and function"
-   (should (equal (phps-mode-functions-get-imenu) '(("namespace myNamespace" . 
17) ("myNamespace" . (("class myClass" . 36) ("myClass" . (("myFunctionA" . 66) 
("myFunctionB" . 106)))))))))
+   (should (equal (phps-mode-functions-get-imenu) '(("namespace myNamespace" . 
17) ("myNamespace" ("myClass" . (("class myClass" . 41) ("myFunctionA" . 75) 
("myFunctionB" . 119))))))))
 
   (phps-mode-test-with-buffer
    "<?php\nnamespace myNamespace {\n    class myClass extends myAbstract {\n   
     public function myFunctionA() {}\n        protected function myFunctionB() 
{}\n    }\n}\n"