Merge pull request #323 from clojure-emacs/fix-am-vs-alias

[Fix #309] `am` uses alias for fully qualified ns

Author: expez

CHANGELOG.md

@@ -14,7 +14,8 @@
 
 ### Bugs fixed
 
--[#299](https://github.com/clojure-emacs/clj-refactor.el/issues/299) `ml` moves cursor
+- [#299](https://github.com/clojure-emacs/clj-refactor.el/issues/299) `ml` moves cursor
+- [#309](https://github.com/clojure-emacs/clj-refactor.el/issues/309)  `am` creates alias for fully-qualified symbols.
 - [#320](https://github.com/clojure-emacs/clj-refactor.el/issues/320) `*data-readers*` ignored when searching for macros.
 
 ## 2.2.0

clj-refactor.el

@@ -2977,14 +2977,20 @@ to create an alias or refer."
   (save-excursion
     (cljr--insert-in-ns ":require")
     (let ((missing (format "%s" missing-symbol))
-          (alias? (cljr--qualified-symbol-p symbol)))
-      (if alias?
-          (cljr--insert-libspec-verbosely (format "[%s :as %s]" missing
-                                                  (cljr--symbol-prefix symbol)))
-        (if (and (s-contains-p "." missing)
-                 (s-uppercase? (s-left 1 (cljr--symbol-suffix missing))))
-            (cljr--insert-libspec-verbosely  (cljr--symbol-prefix symbol))
-          (cljr--insert-libspec-verbosely (format "[%s :refer [%s]]"
+           (alias? (cljr--qualified-symbol-p symbol)))
+      (cond
+       ;;  defrecord / deftype where the package must be required
+       ((and (s-contains-p "." missing)
+             (s-uppercase? (s-left 1 (cljr--symbol-suffix symbol))))
+        (cljr--insert-libspec-verbosely (cljr--symbol-prefix missing)))
+       ;; Fully qualified symbol
+       ((and (cljr--qualified-symbol-p symbol)
+             (string= (cljr--symbol-prefix symbol) missing))
+        (cljr--insert-libspec-verbosely missing))
+       (alias?
+        (cljr--insert-libspec-verbosely (format "[%s :as %s]" missing
+                                                (cljr--symbol-prefix symbol))))
+       (t (cljr--insert-libspec-verbosely (format "[%s :refer [%s]]"
                                                   missing symbol)))))))
 
 (defun cljr--add-missing-libspec (symbol candidates)
@@ -2999,11 +3005,11 @@ to create an alias or refer."
            ;; In the line below we're assuming that all clojure code
            ;; will prefer - over _ when naming namespaces :(
            (progn (cljr--insert-missing-require
-                   (s-replace "_" "-" (format "%s" missing-symbol))
-                   missing-symbol)
+                   symbol
+                   (s-replace "_" "-" (format "%s" missing-symbol)))
                   (cljr--insert-missing-import missing-symbol)))
           ((eq type :class) (cljr--insert-missing-import missing-symbol))
-          (t (error (format "Uknown type %s" type))))))
+          (t (error (format "Unknown type %s" type))))))
 
 (defun cljr--symbol-suffix (symbol)
   "java.util.Date => Date

features/add-missing-libspec.feature

@@ -43,3 +43,11 @@ Feature: resolve-missing; nrepl middleware response mocked
       (:require modular.ring)
       (:import modular.ring.WebrequestHandler)
     """
+
+  Scenario: Require fully qualified without aliasing #309
+    Given I call the add-missing-libspec callback directly with mock data to require schema.test
+    Then I should see:
+    """
+    (ns example.core
+      (:require schema.test))
+    """

features/step-definitions/clj-refactor-steps.el

@@ -112,6 +112,12 @@
           (list (cljr--make-seeded-hash-table
                  :name 'modular.ring.WebrequestHandler :type :type)))))
 
+(Given "^I call the add-missing-libspec callback directly with mock data to require schema.test"
+       (lambda ()
+         (cljr--add-missing-libspec "schema.test/validate-schemas"
+                                    (list (cljr--make-seeded-hash-table
+                                           :name 'schema.test :type :ns)))))
+
 (Then "^the file should be named \"\\([^\"]+\\)\"$"
       (lambda (file-name-postfix)
         (assert (s-ends-with? file-name-postfix (buffer-file-name)) nil "Expected %S to end with %S" (buffer-file-name) file-name-postfix)))