Merge pull request #439 from anthonygalea/master

[Fix #402] Do not alter strings when using `cljr-stop-referring`.

Author: magnars

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- [#402](https://github.com/clojure-emacs/clj-refactor.el/issues/402) cljr-stop-referring: do not alter strings.
 - [#380](https://github.com/clojure-emacs/clj-refactor.el/issues/380) clean-ns: fix FileNotFoundException, by trying both the absolute path and the path relative to the project root. This requires a new refactor-nrepl, old versions will only check the absolute path.
 
 ## 2.4.0 (2018-08-26)

clj-refactor.el

@@ -1328,9 +1328,12 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-stop-referring"
     (paredit-forward)
     (let ((case-fold-search nil))
       (while (re-search-forward (regexp-opt symbols 'symbols) nil t)
-        (paredit-backward)
-        (insert ns "/")
-        (paredit-forward)))))
+        (when (save-excursion
+                (paredit-backward-up)
+                (not (looking-at "\"")))
+          (paredit-backward)
+          (insert ns "/")
+          (paredit-forward))))))
 
 (defun cljr--insert-with-proper-whitespace (forms)
   (open-line 2)

features/stop-refering.feature

@@ -109,3 +109,25 @@ Feature: Stop referring
     (+ (lib/a 1) (lib/b 2))
     (+ (A 1) (B 2))
     """
+
+  Scenario: With string literals, #402
+    When I insert:
+    """
+    (ns cljr.core
+      (:require [my.lib :refer [a foo]]))
+
+    (def x "Hello foo")
+
+    (+ (a 1) (foo 2))
+    """
+    And I place the cursor before "my.lib"
+    And I press "C-! sr"
+    Then I should see:
+    """
+    (ns cljr.core
+      (:require [my.lib]))
+
+    (def x "Hello foo")
+
+    (+ (my.lib/a 1) (my.lib/foo 2))
+    """