summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBozhidar Batsov <bozhidar@batsov.com>2018-06-25 09:44:51 +0300
committerBozhidar Batsov <bozhidar@batsov.com>2018-06-25 09:44:51 +0300
commitac9cb611f422f1133a9520efa469687c0cd3af18 (patch)
tree51d759d27ba77d8b51067322316819b58dc04e0e
parent02dc9dba9f58927b97a4367f0068934ea1b5dcfd (diff)
[Fix #2203] Rename cider-interaction.el to cider-eval.el
All of the non-eval functionality was removed, which marks the end of the process of breaking up the old file. Down the road we may opt to break down cider-eval into some core functionality and extra functionality, as many of the eval commands there are kind of "exotic", but that's not that important at this point.
-rw-r--r--cider-client.el2
-rw-r--r--cider-connection.el4
-rw-r--r--cider-debug.el2
-rw-r--r--cider-eval.el (renamed from cider-interaction.el)19
-rw-r--r--cider-inspector.el2
-rw-r--r--cider-mode.el4
-rw-r--r--cider-profile.el2
-rw-r--r--cider-repl.el2
-rw-r--r--cider-scratch.el2
-rw-r--r--cider-selector.el2
-rw-r--r--cider-test.el4
-rw-r--r--nrepl-client.el2
-rw-r--r--test/cider-interaction-tests.el4
13 files changed, 30 insertions, 21 deletions
diff --git a/cider-client.el b/cider-client.el
index 0375aaf0..02e4587f 100644
--- a/cider-client.el
+++ b/cider-client.el
@@ -384,7 +384,7 @@ thing at point."
;;; Requests
-(declare-function cider-load-file-handler "cider-interaction")
+(declare-function cider-load-file-handler "cider-eval")
(defun cider-request:load-file (file-contents file-path file-name &optional connection callback)
"Perform the nREPL \"load-file\" op.
FILE-CONTENTS, FILE-PATH and FILE-NAME are details of the file to be
diff --git a/cider-connection.el b/cider-connection.el
index dabd86c0..7cd884a2 100644
--- a/cider-connection.el
+++ b/cider-connection.el
@@ -192,7 +192,7 @@ message in the REPL area."
"CIDER's version (%s) does not match cider-nrepl's version (%s). Things will break!"
cider-version middleware-version))))
-(declare-function cider-interactive-eval-handler "cider-interaction")
+(declare-function cider-interactive-eval-handler "cider-eval")
;; TODO: Use some null handler here
(defun cider--subscribe-repl-to-server-out ()
"Subscribe to the nREPL server's *out*."
@@ -479,7 +479,7 @@ Assume that the current buffer is a REPL."
(with-current-buffer nrepl-messages-buffer
(rename-buffer mbuf-name)))))))
-(declare-function cider-default-err-handler "cider-interaction")
+(declare-function cider-default-err-handler "cider-eval")
(declare-function cider-repl-mode "cider-repl")
(declare-function cider-repl--state-handler "cider-repl")
(declare-function cider-repl-reset-markers "cider-repl")
diff --git a/cider-debug.el b/cider-debug.el
index d04db695..9d17e7d7 100644
--- a/cider-debug.el
+++ b/cider-debug.el
@@ -27,7 +27,7 @@
(require 'nrepl-dict)
(require 'nrepl-client) ; `nrepl--mark-id-completed'
-(require 'cider-interaction)
+(require 'cider-eval)
(require 'cider-client)
(require 'cider-util)
(require 'cider-inspector)
diff --git a/cider-interaction.el b/cider-eval.el
index a45a1495..11223cd9 100644
--- a/cider-interaction.el
+++ b/cider-eval.el
@@ -1,4 +1,4 @@
-;;; cider-interaction.el --- IDE for Clojure -*- lexical-binding: t -*-
+;;; cider-eval.el --- Interactive evaluation (compilation) functionality -*- lexical-binding: t -*-
;; Copyright © 2012-2013 Tim King, Phil Hagelberg, Bozhidar Batsov
;; Copyright © 2013-2018 Bozhidar Batsov, Artur Malabarba and CIDER contributors
@@ -27,7 +27,16 @@
;;; Commentary:
-;; Provides an Emacs Lisp client to connect to Clojure nREPL servers.
+;; This file contains CIDER's interactive evaluation (compilation) functionality.
+;; Although Clojure doesn't really have the concept of evaluation (only
+;; compilation), we're using everywhere in the code the term evaluation for
+;; brevity (and to be in line with the naming employed by other similar modes).
+;;
+;; This files also contains all the logic related to displaying errors and
+;; evaluation warnings.
+;;
+;; Pretty much all of the commands here are meant to be used mostly from
+;; `cider-mode', but some of them might make sense in other contexts as well.
;;; Code:
@@ -162,7 +171,7 @@ When invoked with a prefix ARG the command doesn't prompt for confirmation."
(quit-window nil error-win)))
-;;; Dealing with complilation (evaluation) errors and warnings
+;;; Dealing with compilation (evaluation) errors and warnings
(defun cider-visit-error-buffer ()
"Visit the `cider-error-buffer' (usually *cider-error*) if it exists."
(interactive)
@@ -1090,6 +1099,6 @@ Useful when the running nREPL on remote host."
(let ((loaded-ns-count (length (cider-sync-request:ns-load-all))))
(message "Loaded %d namespaces" loaded-ns-count))))
-(provide 'cider-interaction)
+(provide 'cider-eval)
-;;; cider-interaction.el ends here
+;;; cider-eval.el ends here
diff --git a/cider-inspector.el b/cider-inspector.el
index 1d7317e8..e7702771 100644
--- a/cider-inspector.el
+++ b/cider-inspector.el
@@ -29,7 +29,7 @@
(require 'cl-lib)
(require 'seq)
-(require 'cider-interaction)
+(require 'cider-eval)
;; ===================================
;; Inspector Key Map and Derived Mode
diff --git a/cider-mode.el b/cider-mode.el
index 2b62a644..85095f3a 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -32,7 +32,7 @@
;;; Code:
(require 'clojure-mode)
-(require 'cider-interaction)
+(require 'cider-eval)
(require 'cider-test) ; required only for the menu
(require 'cider-eldoc)
(require 'cider-resolve)
@@ -122,7 +122,7 @@ the buffer should appear."
(cider--switch-to-repl-buffer repl set-namespace)))
(user-error "No linked REPL")))
-(declare-function cider-load-buffer "cider-interaction")
+(declare-function cider-load-buffer "cider-eval")
(defun cider-load-buffer-and-switch-to-repl-buffer (&optional set-namespace)
"Load the current buffer into the matching REPL buffer and switch to it.
diff --git a/cider-profile.el b/cider-profile.el
index 5cf0e9d7..79577910 100644
--- a/cider-profile.el
+++ b/cider-profile.el
@@ -27,7 +27,7 @@
(require 'cider-client)
(require 'cider-popup)
-(require 'cider-interaction)
+(require 'cider-eval)
(defconst cider-profile-buffer "*cider-profile*")
diff --git a/cider-repl.el b/cider-repl.el
index 48865b6e..52ef83b0 100644
--- a/cider-repl.el
+++ b/cider-repl.el
@@ -1561,7 +1561,7 @@ constructs."
(defvar cider-repl-mode-syntax-table
(copy-syntax-table clojure-mode-syntax-table))
-(declare-function cider-eval-last-sexp "cider-interaction")
+(declare-function cider-eval-last-sexp "cider-eval")
(declare-function cider-toggle-trace-ns "cider-tracing")
(declare-function cider-toggle-trace-var "cider-tracing")
(declare-function cider-find-resource "cider-find")
diff --git a/cider-scratch.el b/cider-scratch.el
index 5838a6ef..3d277ad1 100644
--- a/cider-scratch.el
+++ b/cider-scratch.el
@@ -30,7 +30,7 @@
;;; Code:
-(require 'cider-interaction)
+(require 'cider-eval)
(require 'clojure-mode)
(require 'easymenu)
diff --git a/cider-selector.el b/cider-selector.el
index cd09cc93..92c90965 100644
--- a/cider-selector.el
+++ b/cider-selector.el
@@ -32,7 +32,7 @@
;;; Code:
(require 'cider-client)
-(require 'cider-interaction)
+(require 'cider-eval)
(require 'cider-scratch)
(defconst cider-selector-help-buffer "*CIDER Selector Help*"
diff --git a/cider-test.el b/cider-test.el
index 74b64427..06a6061a 100644
--- a/cider-test.el
+++ b/cider-test.el
@@ -616,8 +616,8 @@ This uses the Leiningen convention of appending '-test' to the namespace name."
;;; Test execution
-(declare-function cider-emit-interactive-eval-output "cider-interaction")
-(declare-function cider-emit-interactive-eval-err-output "cider-interaction")
+(declare-function cider-emit-interactive-eval-output "cider-eval")
+(declare-function cider-emit-interactive-eval-err-output "cider-eval")
(defun cider-test-execute (ns &optional tests silent prompt-for-filters)
"Run tests for NS, which may be a keyword, optionally specifying TESTS.
diff --git a/nrepl-client.el b/nrepl-client.el
index e0ac9bee..5fa572e2 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -864,7 +864,7 @@ Optional argument TOOLING Set to t if desiring the tooling session rather than t
"Dynamically bound to t while a sync request is ongoing.")
(declare-function cider-repl-emit-interactive-stderr "cider-repl")
-(declare-function cider--render-stacktrace-causes "cider-interaction")
+(declare-function cider--render-stacktrace-causes "cider-eval")
(defun nrepl-send-sync-request (request connection &optional abort-on-input tooling)
"Send REQUEST to the nREPL server synchronously using CONNECTION.
diff --git a/test/cider-interaction-tests.el b/test/cider-interaction-tests.el
index c884ac3d..6dc8e379 100644
--- a/test/cider-interaction-tests.el
+++ b/test/cider-interaction-tests.el
@@ -1,4 +1,4 @@
-;;; cider-interaction-tests.el
+;;; cider-eval-tests.el
;; Copyright © 2012-2018 Tim King, Bozhidar Batsov
@@ -28,7 +28,7 @@
;;; Code:
(require 'buttercup)
-(require 'cider-interaction)
+(require 'cider-eval)
(require 'cider-connection-test-utils)
(describe "cider--var-namespace"