More tests and fixes

Author: chrisrink10

src/basilisp/pprint.lpy

@@ -206,15 +206,9 @@
   [buffer]
   (let [nl    (first buffer)
         block (.-block nl)
-        ;;_ (pdebug "nl-block=" (python/id (.-block nl)) " " (.-block nl))
         comparator (fn [token]
-                     (if (instance? Newline token)
-                       (let [is-ancestor? (ancestor? (.-block token) block)]
-                         #_(pdebug "token=" [(.-kind token) (.-block token)]
-                                 " block=" block
-                                 " is-ancestor?=" is-ancestor?)
-                         is-ancestor?)
-                       false))]
+                     (and (instance? Newline token)
+                          (ancestor? (.-block token) block)))]
     (split-queue-with comparator (pop buffer))))
 
 (defprotocol PrettyWriter
@@ -300,19 +294,16 @@
                                 EndBlock   (.-suffix (.-block token)))]
                    (.write writer s))))
 
-             ;; Write a single line and possibly emit a trailing conditional newline.
+             ;; Write a single line and possibly emit a conditional newline.
              (write-line []
                (let [{:keys [buffer]} @state
                      [s buf]          (split-at-newline buffer)]
-                 #_(pdebug {:buffer (map repr buf) :s (map repr s)})
                  (when (seq s)
                    (write-tokens s))
                  (vswap! state #(assoc % :buffer buf))
                  ;; check if buffer still exceeds length; if so, we'll need to emit newlines
                  (when (seq buf)
                    (let [[section remainder] (get-section buf)
-                         ;;_                   (pdebug {:section   (map repr section)
-                         ;;                             :remainder (map repr remainder)})
                          maybe-nl            (first buf)
                          buf                 (if (emit-nl? maybe-nl section)
                                                (do
@@ -321,7 +312,6 @@
                                                buf)]
                      (if-not (tokens-fit? buf)
                        (do
-                         #_(pdebug "writing section " (map repr section))
                          (write-tokens section)
                          (vswap! state #(assoc % :buffer remainder)))
                        (vswap! state #(assoc % :buffer buf)))))))
@@ -654,6 +644,11 @@
   [obj]
   (print-map "#py {" "}" (.items obj)))
 
+;; Disambiguate `Var` from `IDeref`
+(defmethod simple-dispatch basilisp.lang.runtime/Var
+  [obj]
+  (pr obj))
+
 (defmethod simple-dispatch basilisp.lang.interfaces/IDeref
   [obj]
   (let [classname (.-__name__ (.-__class__ obj))

tests/basilisp/test_pprint.lpy

@@ -128,6 +128,12 @@
  (81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99)]"
       (vector (range 20) (range 21 40) :a :b :c (range 41 80) (range 81 100))))
 
+  (testing "printing collections with long elements"
+    (is (= "[\"abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc\"]\n"
+           (with-out-str
+             (pprint/pprint
+              ["abcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabc"])))))
+
   (testing "printing meta"
     (are [res expr] (= res (str/rtrim
                             (binding [*print-meta* true]
@@ -179,7 +185,8 @@
   (let [s (with-out-str (pprint/pprint v))]
     (drop 1 (re-matches #"#<(\w+)@0x[0-9a-f]+: ([^>]+)>\r?\n" s))))
 
-(def ^:private ideref-value :var)
+(deftest pprint-var-test
+  (is (= "#'basilisp.core/map\n" (with-out-str (pprint/pprint #'map)))))
 
 (deftest pprint-ideref-test
   (testing "delay"
@@ -204,9 +211,6 @@
       (deliver p :delivered)
       (is (= ["Promise" ":delivered"] (match-ideref p)))))
 
-  (testing "var"
-    (is (= ["Var" ":var"] (match-ideref #'ideref-value))))
-
   (testing "volatile"
     (let [v (volatile! nil)]
       (is (= ["Volatile" "nil"] (match-ideref v)))