Retrieve and wrap metadata using the correct overlay for region

10 months ago · ab6954faf5
parent 6c767fc877
commit ab6954faf5
1 changed files with 9 additions and 1 deletions
--- 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)