Merge pull request #221 from mattpolzin/bugfix/220/less-stack-explosion

Fix stack explosion by doing less work on strings to the same effect

Author: mattpolzin

default.nix

@@ -34,7 +34,7 @@ let
         ./man/harmony.1
       ];
     };
-    npmDepsHash = "sha256-4rWL3VrB/FgyUb/4WMhEwuqWUjn8m1Rs8jc+zyjcZAs=";
+    npmDepsHash = "sha256-cyMbLrODGGDn5YVYiiCoou1yYqebIm1hZMAYujUmwI8=";
     dontNpmBuild = true;
     dontBuild = true;
 

docs/_0_0_MANPAGE_HEADER.md

@@ -1,2 +1,2 @@
-% harmony(1) Version 6.1.0 | Harmony User's Guide
+% harmony(1) Version 6.1.1 | Harmony User's Guide
 

flake.lock

@@ -1,5 +1,5 @@
 package harmony
-version = 6.1.0
+version = 6.1.1
 authors = "Mathew Polzin"
 license = "MIT"
 brief = "Harmony GitHub collaboration tool"
@@ -8,7 +8,7 @@ homepage = "https://github.com/mattpolzin/harmony"
 sourceloc = "https://github.com/mattpolzin/harmony"
 bugtracker = "https://github.com/mattpolzin/harmony/issues"
 
-langversion >= 0.7.0
+langversion >= 0.8.0
 
 depends = contrib
         , idris-adds >= 0.4.0

harmony.ipkg

@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 3.7.0.2
 .\"
-.TH "harmony" "1" "" "Version 6.1.0" "Harmony User\(cqs Guide"
+.TH "harmony" "1" "" "Version 6.1.1" "Harmony User\(cqs Guide"
 .SH NAME
 Harmony \- Harmonize with coworkers around GitHub reviewing
 .SH SYNOPSIS

man/harmony.1

@@ -1,6 +1,6 @@
 {
   "name": "@mattpolzin/harmony",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "engines": {
     "node": ">=18.0.0"
   },

package-lock.json

@@ -4,7 +4,7 @@ module AppVersion
 
 export
 appVersion : String
-appVersion = "6.1.0"
+appVersion = "6.1.1"
 
 export
 printVersion : HasIO io => io ()

package.json

@@ -26,16 +26,12 @@ stdout = fst
 mapStdout : (String -> a) -> (String, String, Int) -> (a, String, Int)
 mapStdout = mapFst
 
-||| Drop the given char from the String throughout and for any number of
-||| occurrences.
-dropChar : Char -> String -> String
-dropChar c = pack . go . unpack
-  where
-    go : List Char -> List Char
-    go [] = []
-    go (x :: xs) =
-      let rest = go xs
-      in if c == x then rest else (x :: rest)
+||| Drop the first char if it fits the predicate.
+dropFirstIf : (Char -> Bool) -> String -> String
+dropFirstIf pred str with (asList str)
+  dropFirstIf pred "" | [] = ""
+  dropFirstIf pred str@(strCons c str') | (c :: _) =
+    if pred c then str' else str
 
 promise : IO (a, String, Int) -> Promise' a
 promise gitOp = liftIO res >>= either
@@ -52,7 +48,12 @@ currentBranch : Promise' String
 currentBranch = map trim . promise $ git ["branch", "--show-current"]
 
 parseBranchList : String -> List String
-parseBranchList = map trim . lines . dropChar '*'
+parseBranchList = map (trim . dropFirstIf specialPrefix) . lines
+  where
+    specialPrefix : Char -> Bool
+    specialPrefix '*' = True
+    specialPrefix '+' = True
+    specialPrefix _   = False
 
 export
 listBranches : Promise' (List String)