Two small robustness tweaks

Truncate huge eval results before the overlay face bookkeeping walks
them (they get cut to the display threshold anyway), and give the
reload-clear sync request a 60s timeout - the op is fast by itself but
serializes behind any refresh already in flight (#3652).

Author: bbatsov

lisp/cider-ns.el

@@ -383,7 +383,11 @@ inhibit-fns)), which is how `cider-ns-menu' passes its arguments."
                                           nil
                                           t))
           (when clear?
-            (cider-nrepl-sync-request `("op" ,(cider-ns--reload-op "reload-clear")) :connection conn))
+            ;; The clear op is fast by itself, but it serializes behind any
+            ;; refresh already in flight, which on large projects can hold
+            ;; the lock well past the default timeout (#3652).
+            (let ((nrepl-sync-request-timeout 60))
+              (cider-nrepl-sync-request `("op" ,(cider-ns--reload-op "reload-clear")) :connection conn)))
           (let ((reloading (list nil)))
             (cider-nrepl-send-request
              `("op" ,(cider-ns--reload-op (if all? "reload-all" "reload"))

lisp/cider-overlays.el

@@ -328,6 +328,12 @@ overlay."
                ;; Maximum value width at which we truncate it.
                (truncation-threshold (* 3 (window-width)))
                (o nil))
+          ;; Huge results get truncated to the threshold below anyway; cut
+          ;; them down early so the face and width bookkeeping doesn't have
+          ;; to walk the full text.
+          (when (> (length display-string) (* 2 truncation-threshold))
+            (setq display-string
+                  (substring display-string 0 (* 2 truncation-threshold))))
           ;; Remove any overlay at the position we're creating a new one, if it
           ;; exists.
           (remove-overlays beg end 'category type)