Changes to cider-symbol-at-point

CHANGELOG.md

@@ -8,7 +8,9 @@
 
 ### Changes
 
-* [#2617](https://github.com/clojure-emacs/cider/pull/2617): Add menu bar entry for `Insert last sexp in REPL and eval` under `CIDER Eval`.
+* [#2826](https://github.com/clojure-emacs/cider/pull/2826): Add support for symbols with quotes and resolving of ns-aliased keywords in `cider-symbol-at-point`.
+
+* [#2617](https://github.com/clojure-emacs/cider/pull/2617): Add menu bar entry for `Insert last sexp in REPL 
 
 ### Bugs fixed
 

cider-util.el

@@ -42,6 +42,7 @@
 (require 'cider-compat)
 (require 'clojure-mode)
 (require 'nrepl-dict)
+(declare-function cider-sync-request:macroexpand "cider-macroexpansion")
 
 (defalias 'cider-pop-back 'pop-tag-mark)
 
@@ -128,9 +129,12 @@ instead."
 Ignores the REPL prompt.  If LOOK-BACK is non-nil, move backwards trying to
 find a symbol if there isn't one at point."
   (or (when-let* ((str (thing-at-point 'symbol)))
+        ;; resolve ns-aliased keywords
+        (when (string-match-p "^::.+" str)
+          (setq str (or (ignore-errors (cider-sync-request:macroexpand "macroexpand-1" str)) "")))
         (unless (text-property-any 0 (length str) 'field 'cider-repl-prompt str)
-          ;; Remove font-locking and trailing . from constructors like Record.
-          (string-remove-suffix "." (substring-no-properties str))))
+          ;; Remove font-locking, prefix quotes, and trailing . from constructors like Record.
+          (string-remove-prefix "'" (string-remove-suffix "." (substring-no-properties str)))))
       (when look-back
         (save-excursion
           (ignore-errors

test/cider-util-tests.el

@@ -102,6 +102,26 @@ buffer."
       (with-clojure-buffer "SomeRecord."
         (expect (cider-symbol-at-point) :to-equal "SomeRecord"))))
 
+  (describe "when the symbol at point is quoted"
+    (it "returns the symbol without the preceding '"
+      (with-clojure-buffer "'foo'bar"
+        (expect (cider-symbol-at-point) :to-equal "foo'bar"))))
+
+  (describe "when point is on a keyword"
+    (it "returns the keyword along with beginning : character"
+      (with-clojure-buffer ":abc"
+        (expect (cider-symbol-at-point) :to-equal ":abc"))
+      (with-clojure-buffer ":abc/foo"
+        (expect (cider-symbol-at-point) :to-equal ":abc/foo")))
+
+    (it "attempts to resolve namespaced keywords"
+      (spy-on 'cider-sync-request:macroexpand :and-return-value ":foo.bar/abc")
+      (with-clojure-buffer "(ns foo.bar) ::abc"
+        (expect (cider-symbol-at-point) :to-equal ":foo.bar/abc"))
+      (spy-on 'cider-sync-request:macroexpand :and-return-value ":clojure.string/abc")
+      (with-clojure-buffer "(ns foo.bar (:require [clojure.string :as str])) ::str/abc"
+        (expect (cider-symbol-at-point) :to-equal ":clojure.string/abc"))))
+
   (describe "when there's nothing at point"
     (it "returns nil"
       (spy-on 'thing-at-point :and-return-value nil)