branch: externals/phpinspect
commit f6cc199886de44c71bda3b1fb5c7f18ebc4150ba
Author: Hugo Thunnissen <de...@hugot.nl>
Commit: Hugo Thunnissen <de...@hugot.nl>
When debugging, forward worker errors to main thread
---
phpinspect-resolvecontext.el | 3 ++-
phpinspect-worker.el | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/phpinspect-resolvecontext.el b/phpinspect-resolvecontext.el
index 9128132d35..2a95575d99 100644
--- a/phpinspect-resolvecontext.el
+++ b/phpinspect-resolvecontext.el
@@ -79,7 +79,8 @@
(throw 'return (phpinspect-find-statement-before-point bmap
child point)))
(when (phpinspect-statement-introduction-p token)
(throw 'return previous-siblings))
- (push child previous-siblings)))))
+ (unless (phpinspect-comment-p token)
+ (push child previous-siblings))))))
previous-siblings))
(defun phpinspect--get-last-statement-in-token (token)
diff --git a/phpinspect-worker.el b/phpinspect-worker.el
index 0a3e112efa..60977c0e48 100644
--- a/phpinspect-worker.el
+++ b/phpinspect-worker.el
@@ -152,6 +152,7 @@ already present in the queue."
(phpinspect-worker-skip-next-pause worker))
(phpinspect-thread-pause phpinspect-worker-pause-time mx
continue))
(setf (phpinspect-worker-skip-next-pause worker) nil)))
+ ((debug error) (thread-signal main-thread 'phpinspect-worker-error
err))
(t (phpinspect--log "Phpinspect worker thread errored :%s" err))))
(phpinspect--log "Worker thread exiting")
(message "phpinspect worker thread exited")))
