[Fix #368] Fix inline symbol fails on inlining fn in def

It is not enough to check if occurrence looks like a call site the
fact that the definition is some kind of fn needs to be checked too.

Some minor refactorings:
- add higher level `let` to extract def from defintion
- rename some internal preds to comform with lispy naming conventions

Author: benedekfazekas

CHANGELOG.md

@@ -22,6 +22,7 @@
 
 ### Bugs fixed
 
+- [#368](https://github.com/clojure-emacs/clj-refactor.el/issues/368) Fix inline symbol fails on inlining composed function in a `def`
 - [#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.
 - [#313](https://github.com/clojure-emacs/clj-refactor.el/issues/313)  teach `pf` about function literals using `%&`.

clj-refactor.el

@@ -2989,24 +2989,26 @@ See: https://github.com/clojure-emacs/clj-refactor.el/wiki/cljr-add-stubs"
     (insert def)))
 
 (defun cljr--inline-symbol (definition occurrences)
-  (dolist (symbol-meta (cljr--sort-occurrences occurrences))
-    (let* ((file (cljr--get-valid-filename symbol-meta))
-           (line-beg (gethash :line-beg symbol-meta))
-           (col-beg (gethash :col-beg symbol-meta))
-           (def (gethash :definition definition)))
-      (with-current-buffer (find-file-noselect file)
-        (goto-char (point-min))
-        (forward-line (1- line-beg))
-        (forward-char (1- col-beg))
-        (let* ((call-site? (looking-back "(\s*" (point-at-bol)))
-               (sexp (if call-site?
-                         (prog1 (cljr--extract-sexp-as-list)
-                           (paredit-backward-up)
-                           (clojure-delete-and-extract-sexp))
-                       (clojure-delete-and-extract-sexp))))
-          (if call-site?
-              (cljr--inline-fn-at-call-site def sexp)
-            (insert def))))))
+  (let* ((def (gethash :definition definition))
+         (inline-fn-p (s-starts-with-p "(fn" def)))
+    (dolist (symbol-meta (cljr--sort-occurrences occurrences))
+      (let* ((file (cljr--get-valid-filename symbol-meta))
+             (line-beg (gethash :line-beg symbol-meta))
+             (col-beg (gethash :col-beg symbol-meta)))
+        (with-current-buffer (find-file-noselect file)
+          (goto-char (point-min))
+          (forward-line (1- line-beg))
+          (forward-char (1- col-beg))
+          (let* ((call-site-p (and inline-fn-p
+                                   (looking-back "(\s*" (point-at-bol))))
+                 (sexp (if call-site-p
+                           (prog1 (cljr--extract-sexp-as-list)
+                             (paredit-backward-up)
+                             (clojure-delete-and-extract-sexp))
+                         (clojure-delete-and-extract-sexp))))
+            (if call-site-p
+                (cljr--inline-fn-at-call-site def sexp)
+              (insert def)))))))
   (save-buffer)
   (cljr--delete-definition definition))
 

features/cljr-inline-symbol.feature

@@ -80,4 +80,17 @@ Feature: Inlining of symbols
 
     (map (fn [n]
       (+ 1 n)) (range 10))
-  """
+    """
+
+  Scenario: Inline composed functions as first level def
+    When I insert:
+    """
+    (def trim-lower (comp str/lower-case str/trim))
+
+    (trim-lower a-string)
+    """
+    And I call the cljr--inline-symbol function directly with mockdata to inline trim-lower
+    Then I should see:
+    """
+    ((comp str/lower-case str/trim) a-string)
+    """

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

@@ -248,6 +248,27 @@
 :name \"refactor-nrepl.foo/my-inc\"
 :file \"core.clj\"
 :match \"(map my-inc (range 10))\"})}")))
+           (cljr--inline-symbol (gethash :definition response)
+                            (gethash :occurrences response)))))
+
+(Given "I call the cljr--inline-symbol function directly with mockdata to inline trim-lower"
+       (lambda ()
+         (let ((response (edn-read "{:definition {:definition \"(comp str/lower-case str/trim)\"
+:line-beg 1
+:line-end 1
+:col-beg 2
+:col-end 52
+:name \"refactor-nrepl.foo/trim-lower\"
+:file \"core.clj\"
+:match \"(def trim-lower (comp str/lower-case str/trim))\"}
+:occurrences ({:line-beg 3
+:line-end 3
+:col-beg 2
+:col-end 26
+:name \"refactor-nrepl.foo/trim-lower\"
+:file \"core.clj\"
+:match \"(trim-lower a-string)\"})}")))
+
            (cljr--inline-symbol (gethash :definition response)
                                 (gethash :occurrences response)))))