branch: externals/phps-mode
commit e8a5dbe15301efb819cabf19d1abcb5963d7f195
Author: christian <christ...@cvj.se>
Commit: christian <christ...@cvj.se>

    Fix for trait and interface imenu
---
 phps-mode-parser-sdt.el | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/phps-mode-parser-sdt.el b/phps-mode-parser-sdt.el
index 89ab76a622..ff6135e7ed 100644
--- a/phps-mode-parser-sdt.el
+++ b/phps-mode-parser-sdt.el
@@ -1005,7 +1005,7 @@
                         imenu-nail
                         phps-mode-parser-sdt-symbol-imenu--table))
                     (let ((imenu-object (make-hash-table :test 'equal)))
-                      (puthash 'declaration (nth 1 imenu-class) imenu-object)
+                      (puthash 'declaration (nth 1 imenu-interface) 
imenu-object)
                       (puthash
                        imenu-nail2
                        imenu-object
@@ -1098,7 +1098,7 @@
                    imenu-nail
                    phps-mode-parser-sdt-symbol-imenu--table)
                 (let ((imenu-object (make-hash-table :test 'equal)))
-                  (puthash 'declaration (nth 1 imenu-class) imenu-object)
+                  (puthash 'declaration (nth 1 imenu-interface) imenu-object)
                   (puthash
                    imenu-nail
                    imenu-object
@@ -3288,11 +3288,11 @@
      ;; Add class to imenu stack
      (if phps-mode-parser-sdt-symbol-imenu--stack
          (push
-          (list (list 'class class-name class-start class-end))
+          (list (list 'trait class-name class-start class-end))
           phps-mode-parser-sdt-symbol-imenu--stack)
        (setq
         phps-mode-parser-sdt-symbol-imenu--stack
-        (list (list (list 'class class-name class-start class-end)))))
+        (list (list (list 'trait class-name class-start class-end)))))
 
      (when phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack
        (dolist (
@@ -3398,11 +3398,11 @@
      ;; Add class to imenu stack
      (if phps-mode-parser-sdt-symbol-imenu--stack
          (push
-          (list (list 'class class-name class-start class-end))
+          (list (list 'interface class-name class-start class-end))
           phps-mode-parser-sdt-symbol-imenu--stack)
        (setq
         phps-mode-parser-sdt-symbol-imenu--stack
-        (list (list (list 'class class-name class-start class-end)))))
+        (list (list (list 'interface class-name class-start class-end)))))
 
      (when phps-mode-parser-sdt--bookkeeping-symbol-assignment-stack
        (dolist (

Reply via email to