branch: externals/phpinspect
commit ab6954faf55b834e8e23801d2831fd6270892afb
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>
Retrieve and wrap metadata using the correct overlay for region
---
phpinspect-bmap.el | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/phpinspect-bmap.el b/phpinspect-bmap.el
index 1170def7be..3519ac66a7 100644
--- a/phpinspect-bmap.el
+++ b/phpinspect-bmap.el
@@ -302,8 +302,16 @@
(sort tokens #'phpinspect-meta-sort-width)))
+(defsubst phpinspect-overlay-encloses-meta (overlay meta)
+ (and (>= (phpinspect-meta-start meta) (phpinspect-overlay-start overlay))
+ (<= (phpinspect-meta-end meta) (phpinspect-overlay-end overlay))))
+
(cl-defmethod phpinspect-bmap-token-meta ((overlay (head overlay)) token)
- (phpinspect-bmap-token-meta (phpinspect-overlay-bmap overlay) token))
+ (let ((meta
+ (phpinspect-overlay-wrap-meta
+ overlay (phpinspect-bmap-token-meta (phpinspect-overlay-bmap
overlay) token))))
+ (when (and meta (phpinspect-overlay-encloses-meta overlay meta))
+ meta)))
(cl-defmethod phpinspect-bmap-token-meta ((bmap phpinspect-bmap) token)
(unless (phpinspect-probably-token-p token)
