branch: externals/javaimp
commit 1c5c4c9c7a84979d974a72e5a9e36578de0d4d58
Author: Filipp Gunbin <fgun...@fastmail.fm>
Commit: Filipp Gunbin <fgun...@fastmail.fm>
Remove optimization in javaimp--collect-idents to include methods in xref
---
javaimp-parse.el | 3 ++-
javaimp.el | 6 +-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/javaimp-parse.el b/javaimp-parse.el
index fc221fb379..5433bebe6a 100644
--- a/javaimp-parse.el
+++ b/javaimp-parse.el
@@ -356,7 +356,8 @@ brace.")
:start keyword-start)))))
(defun javaimp-parse--scope-simple-stmt (_brace-pos)
- "Attempts to parse 'simple-statement' scope."
+ "Attempts to parse 'simple-statement' scope. Currently block
+lambdas are also recognized as such."
(and (javaimp-parse--skip-back-until)
(or (and (= (char-before (1- (point))) ?-) ; ->
(= (char-before) ?>))
diff --git a/javaimp.el b/javaimp.el
index 7bcc1c5347..46ab4228f8 100644
--- a/javaimp.el
+++ b/javaimp.el
@@ -412,11 +412,7 @@ is non-nil. Suitable for use as argument to
(save-excursion
(save-restriction
(widen)
- (let* ((javaimp-parse--scope-hook
- (if file
- #'javaimp-parse--scope-class
- javaimp-parse--scope-hook))
- (package (javaimp-parse-get-package))
+ (let* ((package (javaimp-parse-get-package))
(scopes (javaimp-parse-get-all-scopes
nil nil (javaimp-scope-defun-p '(method)))))
(mapcar (lambda (s)
