Merge pull request #10 from cichli/fix-eastwood

Make library lintable using eastwood

Author: razum2um

src/debugger/commands.clj

@@ -1,5 +1,4 @@
 (ns debugger.commands
-  (:use debugger.config)
   (:require [debugger.config :refer :all]
             [debugger.formatter :refer [safe-find-var
                                         no-sources-found

src/debugger/core.clj

@@ -6,7 +6,14 @@
                                         safe-find-var
                                         no-sources-found]]
             [debugger.commands :refer [print-short-source print-trace]]
-            [debugger.repl :refer [prompt-fn read-fn eval-fn caught-fn]]))
+            [debugger.repl :refer [prompt-fn read-fn eval-fn caught-fn]])
+  (:import [clojure.lang Compiler$LocalBinding]))
+
+(defn- sanitize-env
+  [env]
+  (into {} (for [[sym bind] env
+                 :when (instance? Compiler$LocalBinding bind)]
+             [`(quote ~sym) (.sym bind)])))
 
 (defmacro dbg
   [x]
@@ -16,7 +23,7 @@
        x#)))
 
 (defmacro break [& body]
-  (let [env (into {} (map (fn [[sym bind]] [`(quote ~sym) (.sym bind)]) &env))
+  (let [env (sanitize-env &env)
         break-line (:line (meta &form))]
     `(let [trace# (-> (Throwable.) .getStackTrace seq)
            outer-fn-symbol# (-> trace# first .getClassName demunge deanonimize-name symbol)
@@ -65,7 +72,7 @@
 
 
 (defmacro break-catch [& body]
-  (let [env (into {} (map (fn [[sym bind]] [`(quote ~sym) (.sym bind)]) &env))
+  (let [env (sanitize-env &env)
         break-line (:line (meta &form))]
   `(try
     (do ~@body)

src/debugger/formatter.clj

@@ -54,13 +54,15 @@
     (and short? (>= line-number (+ break-line *code-context-lines*))) nil
     :else (str "   " line-number ": " line)))
 
-(defn deanonimize-name [^String s]
+(defn deanonimize-name
   "Inner qualified names `debugger.core-test/err/fn--4248` -> no source found"
+  [^String s]
   (clojure.string/join "/" (take 2 (clojure.string/split s #"/"))))
 
 
-(defn safe-find-var [sym]
+(defn safe-find-var
   "No raise of not found ns of symbol"
+  [sym]
   (and (-> sym namespace symbol find-ns)
        (-> sym find-var)))
 

src/debugger/main.clj

@@ -1,5 +1,5 @@
 (ns debugger.main
-  (:use [debugger core])
+  (:require [debugger.core :refer :all])
   (:gen-class))
 
 ;; `lein run -m debugger.main 1 2` shouldn't stop in debugger

test/debugger/core_test.clj

@@ -3,10 +3,6 @@
             [clojure.walk :refer [postwalk-demo]]
             [debugger.core :refer :all]))
 
-(deftest a-test
-  (testing "FIXME, I fail."
-    (is (= 1 1))))
-
 (def wow 1)
 
 (defn foo [& args]

test/debugger/time_test.clj

@@ -3,21 +3,21 @@
   (:require [debugger.time :refer :all]
             [clojure.test :refer :all]))
 
-(deftest now-test []
+(deftest now-test
   (is (= (.getTime (Date.)) (.getTime (now)))))
 
 
-(deftest minus-test []
+(deftest minus-test
   (is (= (-> (Date.).getTime (- 2000) (Date.) .getTime)
          (-> (now) (minus (seconds 2)) .getTime))))
 
-(deftest interval-test []
+(deftest interval-test
   (is (= 4 (-> (now)
                (minus (seconds 4))
                (interval (now))
                (in-seconds)))))
 
-(deftest compatibility-test []
+(deftest compatibility-test
   (are [last-quit-seconds-ago skip-repl-if-last-quit-ago check]
     (is (= check (->> (now) (interval (minus (now) (seconds last-quit-seconds-ago))) in-seconds (< skip-repl-if-last-quit-ago))))
     4 2 true