Don't attempt to recover srcloc under point on long lines

Author: vspinu

CHANGELOG.md

@@ -21,9 +21,11 @@
 * [#2430](https://github.com/clojure-emacs/cider/issues/2375): `cider-find-var` opens archive files inside [AVFS](http://avf.sourceforge.net) folders if AVFS is detected.
 * [#2446](https://github.com/clojure-emacs/cider/issues/2446): Implement Sesman friendly sessions to allow for on-the-fly association with sessions from dependency projects and jars.
 * [#2253](https://github.com/clojure-emacs/cider/issues/2253): Split `continue` debug command into "continue till next breakpoint" (`c`) and "continue non stop" (`C`) commands.
+* Add support for CompilationException dynamic source location discovery.
 
 ### Bug fixes
 
+* Fix re-display hangs while dynamically recovering source locations under mouse pointer.
 * [#2474](https://github.com/clojure-emacs/cider/issues/2474): Fix incorrect detection of output and out-of-order printing.
 * [#2514](https://github.com/clojure-emacs/cider/issues/2514): Don't auto-jump to warnings when `cider-auto-jump-to-error` is set to 'errors-only.
 * [#2453](https://github.com/clojure-emacs/cider/issues/2453): Make it possible to debug deftype methods by direct insertion of #dbg and #break readers into the deftype methods.

cider-repl.el

@@ -1177,27 +1177,24 @@ case."
   :group 'cider-repl
   :package-version '(cider. "0.16.0"))
 
-(defun cider--locref-at-point-1 (reg-list &optional pos)
-  "Workhorse for getting locref at POS.
+(defun cider--locref-at-point-1 (reg-list)
+  "Workhorse for getting locref at point.
 REG-LIST is an entry in `cider-locref-regexp-alist'."
-  (save-excursion
-    (let ((pos (or pos (point))))
-      (goto-char pos)
-      (beginning-of-line)
-      (when (re-search-forward (nth 1 reg-list) (point-at-eol) t)
-        (let ((ix-highlight (or (nth 2 reg-list) 0))
-              (ix-var (nth 3 reg-list))
-              (ix-file (nth 4 reg-list))
-              (ix-line (nth 5 reg-list)))
-          (list
-           :type (car reg-list)
-           :highlight (cons (match-beginning ix-highlight) (match-end ix-highlight))
-           :var  (and ix-var
-                      (replace-regexp-in-string "_" "-"
-                                                (match-string-no-properties ix-var)
-                                                nil t))
-           :file (and ix-file (match-string-no-properties ix-file))
-           :line (and ix-line (string-to-number (match-string-no-properties ix-line)))))))))
+  (beginning-of-line)
+  (when (re-search-forward (nth 1 reg-list) (point-at-eol) t)
+    (let ((ix-highlight (or (nth 2 reg-list) 0))
+          (ix-var (nth 3 reg-list))
+          (ix-file (nth 4 reg-list))
+          (ix-line (nth 5 reg-list)))
+      (list
+       :type (car reg-list)
+       :highlight (cons (match-beginning ix-highlight) (match-end ix-highlight))
+       :var  (and ix-var
+                  (replace-regexp-in-string "_" "-"
+                                            (match-string-no-properties ix-var)
+                                            nil t))
+       :file (and ix-file (match-string-no-properties ix-file))
+       :line (and ix-line (string-to-number (match-string-no-properties ix-line)))))))
 
 (defun cider-locref-at-point (&optional pos)
   "Return a plist of components of the location reference at POS.
@@ -1206,8 +1203,13 @@ found.  Returned keys are :type, :highlight, :var, :file, :line, where
 :highlight is a cons of positions, :var and :file are strings or nil, :line
 is a number.  See `cider-locref-regexp-alist' for how to specify regexes
 for locref look up."
-  (seq-some (lambda (rl) (cider--locref-at-point-1 rl pos))
-            cider-locref-regexp-alist))
+  (save-excursion
+    (goto-char (or pos (point)))
+    ;; Regexp lookup on long lines can result in significant hangs #2532. We
+    ;; assume that lines longer than 300 don't contain source references.
+    (when (< (- (point-at-eol) (point-at-bol)) 300)
+      (seq-some (lambda (rl) (cider--locref-at-point-1 rl))
+                cider-locref-regexp-alist))))
 
 (defun cider-jump-to-locref-at-point (&optional pos)
   "Identify location reference at POS and navigate to it.

test/cider-repl-tests.el

@@ -204,13 +204,6 @@ PROPERTY shoudl be a symbol of either 'text, 'ansi-context or
       (expect (cider-locref-at-point)
               :to-equal
               '(:type cljs-message :highlight (54 . 86) :var nil :file "/path/to/aaa/bbb.cljc" :line 42))))
-  (it "works with warnings"
-    (with-temp-buffer
-      (insert "\nReflection warning, cider/nrepl/middleware/slurp.clj:103:16 - reference to field getInputStream can't be resolved.")
-      (move-to-column 20)
-      (expect (cider-locref-at-point)
-              :to-equal
-              '(:type warning :highlight (22 . 61) :var nil :file "cider/nrepl/middleware/slurp.clj" :line 103))))
   (it "works with warnings"
     (with-temp-buffer
       (insert "\nReflection warning, cider/nrepl/middleware/slurp.clj:103:16 - reference to field getInputStream can't be resolved.")