[Fix #305] Handle keywords in cljr-slash

Don't call lookup-alias for non namespaced keywords at all when slash is
typed. However trigger lookup alias with the leading :: stripped off the
prefix if the keyword is namespaced.

- fix bug in `cljr--keyword?` so it recognises aliased, `::` keywords

Author: benedekfazekas

clj-refactor.el

@@ -2183,9 +2183,10 @@ FEATURE is either :clj or :cljs."
 (defun cljr--magic-requires-lookup-alias ()
   "Return (alias (ns.candidate1 ns.candidate1)) if we recognize
 the alias in the project."
-  (let ((short (buffer-substring-no-properties
-                (cljr--point-after 'paredit-backward)
-                (1- (point)))))
+  (let ((short (->> (buffer-substring-no-properties
+                     (cljr--point-after 'paredit-backward)
+                     (1- (point)))
+                    (s-chop-prefix "::"))))
     (unless (or (cljr--resolve-alias short)
                 (cljr--is-global-alias short))
       (-if-let* ((aliases (ignore-errors (cljr--get-aliases-from-middleware)))
@@ -2198,6 +2199,12 @@ the alias in the project."
           (-when-let (long (cljr--aget cljr-magic-require-namespaces short))
             (list short (list long))))))))
 
+(defun cljr--in-keyword-sans-alias-p ()
+  "Checks if thing at point is keyword without an alias."
+  (let ((sym (cider-symbol-at-point)))
+    (and (cljr--keyword? sym)
+         (not (s-matches-p "::.+" (cljr--symbol-prefix sym))))))
+
 ;;;###autoload
 (defun cljr-slash ()
   "Inserts / as normal, but also checks for common namespace shorthands to require.
@@ -2210,6 +2217,7 @@ form."
   (-when-let (aliases (and cljr-magic-requires
                            (not (cider-in-comment-p))
                            (not (cider-in-string-p))
+                           (not (cljr--in-keyword-sans-alias-p))
                            (clojure-find-ns)
                            (cljr--magic-requires-lookup-alias)))
     (let ((short (first aliases)))
@@ -3491,7 +3499,7 @@ argument of a `reduce', the defn will take two arguments.
 
 See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-example"
   (interactive)
-  (while (cljr--is-keyword? (car (cljr--extract-sexp-as-list)))
+  (while (cljr--keyword? (car (cljr--extract-sexp-as-list)))
     (paredit-backward-up))
   (let* ((sexp-forms* (cljr--extract-sexp-as-list))
          (fn-name (car sexp-forms*))
@@ -3572,7 +3580,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
 (defun cljr--create-fn-from-update (args path)
   (let ((keyfn (cadr args)))
     (cljr--insert-example-fn (cider-symbol-at-point)
-                             (if (cljr--is-keyword? keyfn)
+                             (if (cljr--keyword? keyfn)
                                  (list (s-chop-prefix ":" keyfn))
                                (list 0))
                              path)))
@@ -3582,7 +3590,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                            (paredit-backward-down)
                            (cider-symbol-at-point))))
     (cljr--insert-example-fn (cider-symbol-at-point)
-                             (if (cljr--is-keyword? last-path-entry)
+                             (if (cljr--keyword? last-path-entry)
                                  (list (s-chop-prefix ":" last-path-entry))
                                (list 0))
                              path)))
@@ -3603,7 +3611,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
          (making-comparator? (and (string= fn-name (cadr args))
                                   (= 3 (length args))))
          (param-name (if making-comparator?
-                         (when (cljr--is-keyword? (car args))
+                         (when (cljr--keyword? (car args))
                            (s-chop-prefix ":" (car args)))
                        (-when-let (coll-name (cljr--guess-param-name (-last-item args)))
                          (singularize-string coll-name)))))
@@ -3642,8 +3650,8 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
         (buffer-substring (point-min) (point-max)))
     s))
 
-(defun cljr--is-keyword? (s)
-  (s-matches? "^:[^0-9:[{(\"][^[{(\"]*$"
+(defun cljr--keyword? (s)
+  (s-matches? "^::?[^0-9:[{(\"][^[{(\"]*$"
               (s-replace "\n" " " s)))
 
 (defun cljr--symbol? (s)
@@ -3745,7 +3753,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                            (paredit-forward 3)
                            (paredit-backward-down)
                            (cider-symbol-at-point))))
-    (when (cljr--is-keyword? last-path-entry)
+    (when (cljr--keyword? last-path-entry)
       (s-chop-prefix ":" last-path-entry))))
 
 (defun cljr--find-param-name-from-get (form)
@@ -3754,7 +3762,7 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-create-fn-from-e
                (paredit-forward 2)
                (cljr--skip-past-whitespace-and-comments)
                (cljr--extract-sexp))))
-    (when (cljr--is-keyword? key)
+    (when (cljr--keyword? key)
       (s-chop-prefix ":" key))))
 
 (defun cljr--insert-example-fn (name args path)

features/magic-requires.feature

@@ -46,6 +46,29 @@ Feature: Magic requires
     (util/get-last-sexp)
     """
 
+  Scenario: Require is inserted automagically for namespaced keyword
+    When I insert:
+    """
+    (ns cljr.core)
+
+    (::util)
+    """
+    And the cache of namespace aliases is populated
+    And I place the cursor after "util"
+    And I start an action chain
+    And I type "/"
+    And I type "refactor-nrepl.util"
+    And I press "RET"
+    And I type "some-keyword"
+    And I execute the action chain
+    Then I should see:
+    """
+    (ns cljr.core
+      (:require [refactor-nrepl.util :as util]))
+
+    (::util/some-keyword)
+    """
+
 
   Scenario: If alias exists nothing happens
     When I insert: