refactor(leap): extract conditional expressions

Author: ggandor

fnl/leap/main.fnl

@@ -529,22 +529,22 @@ is either labeled (C) or not (B).
     (let [pat1 (or (expand-to-equivalence-class in1)
                    ; Sole '\' needs to be escaped even for \V.
                    (in1:gsub "\\" "\\\\"))
-          pat2 (or (-?> ?in2 expand-to-equivalence-class)
+          pat2 (or (and ?in2 (expand-to-equivalence-class ?in2))
                    ?in2
                    "\\_.")  ; match anything, including EOL
-          pat (if (and (pat1:match "\\n") (or (not ?in2) (pat2:match "\\n")))
-                  ; If \n\n is a possible sequence to appear, add ^\n
-                  ; to the pattern, to make our convenience feature -
-                  ; targeting empty lines by typing the newline alias
-                  ; twice - work.
-                  ; This hack is always necessary for single-step
-                  ; processing, when we already have the full pattern
-                  ; (this includes repeating the previous search), but
-                  ; also for two-step processing, in the special case of
-                  ; targeting the very last line in the file (normally,
-                  ; `search.get-targets` takes care of this situation,
-                  ; but the pattern `\n\_.` does not match `\n$` if it's
-                  ; on the last line).
+          potential-\n\n? (and (pat1:match "\\n")
+                               (or (not ?in2) (pat2:match "\\n")))
+          ; If \n\n is a possible sequence to appear, add |^\n to the
+          ; pattern, to make our convenience feature - targeting empty
+          ; lines by typing the newline alias twice - work.
+          ; This hack is always necessary for single-step processing,
+          ; when we already have the full pattern (this includes
+          ; repeating the previous search), but also for two-step
+          ; processing, in the special case of targeting the very last
+          ; line in the file (normally, `search.get-targets` takes care
+          ; of this situation, but the pattern `\n\_.` does not match
+          ; `\n$` if it's on the last line).
+          pat (if potential-\n\n?
                   (.. pat1 pat2 "\\|\\^\\n")
                   (.. pat1 pat2))]
       (.. "\\V" (if opts.case_sensitive "\\C" "\\c") pat)))
@@ -687,16 +687,17 @@ is either labeled (C) or not (B).
       (display group-offset)
       (case (get-input)
         input
-        (if (and (< 1 |groups|)
-                 (or (= input spec-keys.next_group)
-                     (and (= input spec-keys.prev_group) (not first-invoc?))))
-            (let [inc/dec (if (= input spec-keys.next_group) inc dec)
-                  max-offset (dec |groups|)
-                  group-offset* (-> group-offset inc/dec (clamp 0 max-offset))]
-              ; Switch, and ask for input again.
-              (loop group-offset* false))
-            ; Otherwise return with input.
-            (values input group-offset))))
+        (let [switch-group? (and (> |groups| 1)
+                                 (or (= input spec-keys.next_group)
+                                     (and (= input spec-keys.prev_group)
+                                          (not first-invoc?))))]
+          (if switch-group?
+              (let [inc/dec (if (= input spec-keys.next_group) inc dec)
+                    max-offset (dec |groups|)
+                    group-offset* (-> group-offset inc/dec (clamp 0 max-offset))]
+                (loop group-offset* false))
+              ; Otherwise return with input.
+              (values input group-offset)))))
     ; ---
     (loop (or ?group-offset 0) (not= first-invoc? false)))