[Fix clojure-emacs/clj-refactor.el#332] Fix regression

Fix regression handling one level deep nested inner classes.

Author: benedekfazekas

CHANGELOG.md

@@ -13,6 +13,7 @@
 * [#160](https://github.com/clojure-emacs/refactor-nrepl/issues/160) Make `resolve-missing` find newly defined vars and types (clj). Because of a stale cache, newly added vars or types would not be found. This fix takes into account vars/types added by eval-ing code (rescan affected namespace), and by hotloading dependencies (reset the cache).
 * [clojure-emacs/clj-refactor.el#362](https://github.com/clojure-emacs/clj-refactor.el/issues/362) Preserve all shorthand style metadata when `clean-ns` is used.
 * [#192](https://github.com/clojure-emacs/refactor-nrepl/issues/192) Clean ns understands `$` as a symbol. Specially this enables clean ns to work with incanter that does have function named `$`.
+* [clojure-emacs/clj-refactor.el#332](https://github.com/clojure-emacs/clj-refactor.el/issues/332) Fix regression when inner class needs to be imported, strangely implementation of multiple levels of nested inner classes broke the simpler case.
 
 ### Changes
 

src/refactor_nrepl/core.clj

@@ -227,7 +227,8 @@
 (defn suffix
   "java.util.Date -> Date
   java.text.Normalizer$Form/NFD => Normalizer
-  SomeClass$InnerClass$InnerInnerClass => SomeClass$InnerClass
+  SomeClass$InnerClass$InnerInnerClass => SomeClass$InnerClass$InnerInnerClass
+  SomeClass$InnerClass => SomeClass$InnerClass
 
   clojure.core/str -> str"
   [fully-qualified-name]
@@ -239,8 +240,9 @@
       (re-find #"\w\$\w" fully-qualified-name)
       (let [[outer & classes] (-> fully-qualified-name (.split "\\$"))
             outer (suffix outer)]
-        (if (> (count classes) 1)
-          (str/join "$" (apply vector outer classes ))
+        (if (or (> (count classes) 1)
+                (->> classes first (re-find #"/") not))
+          (str/join "$" (apply vector outer classes))
           outer))
 
       (re-find #"/" (str fully-qualified-name))

test/refactor_nrepl/ns/clean_ns_test.clj

@@ -41,6 +41,8 @@
 
 (def ns-with-multiple-shorthand-meta (clean-msg "test/resources/ns_with_multiple_shorthand_meta.clj"))
 
+(def ns-with-inner-classes (clean-msg "test/resources/ns_with_inner_classes.clj"))
+
 (def ns-with-incanter (clean-msg "test/resources/ns_with_incanter.clj"))
 
 (deftest combines-requires
@@ -205,3 +207,7 @@
 (deftest does-not-remove-dollar-sign-if-valid-symbol
   (let [cleaned (pprint-ns (clean-ns ns-with-incanter))]
     (is (re-find #"\[\$\]" cleaned))))
+
+(deftest does-not-break-import-for-inner-class
+  (let [cleaned (pprint-ns (clean-ns ns-with-inner-classes))]
+    (is (re-find #":import.*Line2D\$Double" cleaned))))

test/resources/ns_with_incanter.clj

@@ -0,0 +1,8 @@
+(ns resources.ns-with-incanter
+  (:require [clojure.string :as string]
+            [clojure.set :as set]
+            [incanter.core :refer [$]]))
+
+$
+
+(string/replace "foobar" "ob" "AZ")

test/resources/ns_with_inner_classes.clj

@@ -0,0 +1,5 @@
+(ns ns-with-inner-classes
+  (:import [java.awt.geom Line2D$Double]))
+
+(defn foo []
+  (Line2D$Double. 0 0 5 5))