branch: externals/phps-mode
commit 6d3cadbdf0c3dc02c0030a8a812cc33d2679c57c
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
More integration of new imenu and bookkeeping via SDT
---
phps-mode-ast.el | 1 +
phps-mode-lex-analyzer.el | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/phps-mode-ast.el b/phps-mode-ast.el
index f73cd46f4d..7c39a818c1 100644
--- a/phps-mode-ast.el
+++ b/phps-mode-ast.el
@@ -15,6 +15,7 @@
;;; Variables:
+
(defvar-local
phps-mode-ast--parse-trail
nil
diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 320e3c12d3..dc1ec31bee 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -1147,7 +1147,9 @@
(generate-new-buffer "*PHPs Lexer*"))
(parse-error)
(parse-trail)
- (ast-tree))
+ (ast-tree)
+ (bookkeeping)
+ (imenu))
;; Create temporary buffer and run lexer in it
(when (get-buffer buffer)
@@ -1231,6 +1233,8 @@
;; Need to copy buffer-local values before killing buffer
(setq parse-trail phps-mode-ast--parse-trail)
(setq ast-tree phps-mode-ast--tree)
+ (setq bookkeeping phps-mode-parser-sdt-bookkeeping)
+ (setq imenu phps-mode-parser-sdt-symbol-imenu)
(kill-buffer)))
@@ -1245,7 +1249,9 @@
nest-location-stack
parse-trail
parse-error
- ast-tree)))
+ ast-tree
+ bookkeeping
+ imenu)))
;; Save cache if possible and permitted
(when (and
