Line numbers are now correct on alternate arrow forms.

marick · Mar 24, 2011 · 103e7dd · 103e7dd
1 parent 1c1612a
commit 103e7dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/src/midje/midje_forms/translating.clj b/src/midje/midje_forms/translating.clj
@@ -4,6 +4,7 @@
   (:use clojure.contrib.def
         [clojure.contrib.seq :only [separate]]
         midje.metaconstants
+        [midje.semi-sweet :only [all-arrows]]
         [midje.util thread-safe-var-nesting wrapping form-utils laziness form-utils]
         [midje.util.file-position :only [arrow-line-number]]
         [midje.midje-forms building recognizing dissecting moving-around editing]
@@ -17,7 +18,7 @@
   (loop [loc (zip/seq-zip form)]
     (if (zip/end? loc)
       (zip/root loc)
-      (recur (zip/next (cond (namespacey-match '(=>) loc)
+      (recur (zip/next (cond (namespacey-match all-arrows loc)
                              (add-line-number-to-end-of-arrow-sequence__then__no-movement
                                (arrow-line-number loc) loc)
 

diff --git a/src/midje/semi_sweet.clj b/src/midje/semi_sweet.clj
@@ -22,6 +22,7 @@
 
 (def expect-arrows [=> =not=> =deny=> =future=>])
 (def fake-arrows [=> =streams=>])
+(def all-arrows (concat expect-arrows fake-arrows))
 
 (defn check-for-arrow [arrow]
   (get {=> :check-match

diff --git a/test/behaviors/t_line_number_reporting.clj b/test/behaviors/t_line_number_reporting.clj
@@ -227,14 +227,9 @@
    (+ 1 1) =deny=> 2
    (+ 1 1) =not=> 2
    (+ 1 "1") =future=> "2")
- (future-fact @reported => (just (contains {:position ["t_line_number_reporting.clj"
+ (fact @reported => (just (contains {:position ["t_line_number_reporting.clj"
                                                 (+ variant-position 3)]})
                           (contains {:position ["t_line_number_reporting.clj"
                                                 (+ variant-position 4)]})
                           (contains {:position ["t_line_number_reporting.clj"
                                                 (+ variant-position 5)]}))))
-
-(future-fact "line-number-handling for =streams=>")
-
-
-
diff --git a/test/midje/midje_forms/t_translating.clj b/test/midje/midje_forms/t_translating.clj
@@ -25,8 +25,16 @@
                                     (f 2) midje.sweet/=> midje.midje-forms.t-translating/a :position (midje.util.file-position/line-number-known 35))]
     actual => expected))
 
-
-
+(fact "various arrow forms have line numbers"
+  (let [original `(
+                    (~(with-meta '(f 1) {:line 33}) => 2)
+                    (~(with-meta '(f 1) {:line 33}) =not=> 2)
+                    (~(with-meta '(f 1) {:line 33}) =streams=> 2)
+                    (~(with-meta '(f 1) {:line 33}) =future=> 2))
+        actual (add-line-numbers original)]
+    (doseq [expansion actual]
+      (take-last 2 expansion)
+      => '(:position (midje.util.file-position/line-number-known 33)))))
 
 ;; Translating sweet forms into their semi-sweet equivalent