[Fix #1088] Kill source-tracking evalution

This hack was a bad idea to begin with (and more importantly - it's no longer
compatible with ClojureScript). This has to be fixed with either
a custom nREPL middleware or in the built-in `eval` op.

More details are available in the linked ticket.

Author: bbatsov

CHANGELOG.md

@@ -70,7 +70,9 @@
 * [#1031](https://github.com/clojure-emacs/cider/pull/1031): Interactive functions prompt with
   symbol at point as a default value.
 * Remapped `cider-grimoire` to <kbd>C-c C-d r</kbd> & <kbd>C-c C-d C-r</kbd>
-  to avoid conflicts with <kbd>C-g</kbd>.
+to avoid conflicts with <kbd>C-g</kbd>.
+* [#1088](https://github.com/clojure-emacs/cider/issues/1088): Kill the
+source-tracking evaluation hack as it wasn't compatible with ClojureScript.
 
 ### Bugs fixed
 

cider-debug.el

@@ -144,13 +144,13 @@ a number of keys will be prompted to the user."
     ;; Once the code has been instrumented, it can be sent as a
     ;; regular evaluation. Any debug messages will be received by the
     ;; callback specified in `cider--debug-init-connection'.
-    (cider-interactive-source-tracking-eval
-     instrumented position
+    (cider-interactive-eval
+     instrumented
      (nrepl-make-response-handler (current-buffer)
                                   (lambda (_buffer value)
                                     (let ((cider-interactive-eval-result-prefix prefix))
                                       (cider--display-interactive-eval-result value)))
-                                  ;; Below is the default for `cider-interactive-source-tracking-eval'.
+                                  ;; Below is the default for `cider-interactive-eval'.
                                   (lambda (_buffer out)
                                     (cider-emit-interactive-eval-output out))
                                   (lambda (_buffer err)

cider-interaction.el

@@ -1567,57 +1567,6 @@ otherwise fall back to \"user\"."
 (defvar-local cider--cached-ns-form nil
   "Cached ns form in the current buffer.")
 
-(defun cider--ns-form-for-dummy-file (form)
-  "Construct a `(ns ...)` form for `cider--dummy-file-contents'.
-
-If FORM is a ns form itself, or there is no current ns form, returns an
-empty string. If the current ns form has not yet been evaluated, returns
-the current ns form. Otherwise, returns the current ns form with
-all :reload and :reload-all directives removed."
-  (let ((current-ns-form (cider-ns-form)))
-    (cond
-     ((cider-ns-form-p form) "")
-     ((null current-ns-form) "")
-     ((null cider--cached-ns-form) current-ns-form)
-     ;; previously, we were sending a truncated version of
-     ;; the current ns form if it was equal to the cached ns
-     ;; form, but this causes problems with ClojureScript,
-     ;; where evaluating ns forms is not additive - see #1026
-     (:default (replace-regexp-in-string ":reload\\(-all\\)?\\>"
-                                         ""
-                                         current-ns-form)))))
-
-(defun cider--dummy-file-contents (form start-pos)
-  "Wrap FORM to make it suitable for `cider-request:load-file'.
-START-POS is a starting position of the form in the original context."
-  (let* ((ns-form (cider--ns-form-for-dummy-file form))
-         (ns-form-lines (length (split-string ns-form "\n")))
-         (start-pos (or start-pos 1))
-         (start-line (line-number-at-pos start-pos))
-         (start-column (save-excursion (goto-char start-pos) (current-column))))
-    (concat
-     ns-form
-     (make-string (max 0 (- start-line ns-form-lines)) ?\n)
-     (make-string start-column ? )
-     form)))
-
-(defun cider-interactive-source-tracking-eval (form &optional start-pos callback)
-  "Evaluate FORM and dispatch the response to CALLBACK.
-START-POS is a starting position of the form in the original context.
-Unlike `cider-interactive-eval' this command will set proper metadata for var
-definitions.  If CALLBACK
-is nil use `cider-interactive-eval-handler'."
-  (cider--clear-compilation-highlights)
-  (cider--quit-error-window)
-  (setq cider--cached-ns-form (cider-ns-form))
-  (let ((filename (or (buffer-file-name)
-                      (buffer-name))))
-    (cider-request:load-file
-     (cider--dummy-file-contents form start-pos)
-     (funcall cider-to-nrepl-filename-function (cider--server-filename filename))
-     (file-name-nondirectory filename)
-     (or callback (cider-interactive-eval-handler)))))
-
 (defun cider--prep-interactive-eval (form)
   "Prepares the environment for an interactive eval of FORM.
 
@@ -1668,7 +1617,7 @@ the printed result, and defaults to `fill-column'."
   "Evaluate the region between START and END."
   (interactive "r")
   (let ((code (buffer-substring-no-properties start end)))
-    (cider-interactive-source-tracking-eval code start)))
+    (cider-interactive-eval code)))
 
 (defun cider-eval-last-sexp (&optional prefix)
   "Evaluate the expression preceding point.
@@ -1724,9 +1673,8 @@ the command `cider-debug-defun-at-point'."
   (if debug-it
       (progn (require 'cider-debug)
              (cider-debug-defun-at-point))
-    (cider-interactive-source-tracking-eval
-     (cider-defun-at-point)
-     (cider-defun-at-point-start-pos))))
+    (cider-interactive-eval
+     (cider-defun-at-point))))
 
 (defun cider-pprint-eval-defun-at-point ()
   "Evaluate the top-level form at point and pprint its value in a popup buffer."