cleanup

gerdreiss · Apr 30, 2021 · 27550a4 · 27550a4
1 parent 2833220
commit 27550a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/src/Control/Brew/Maintenance.hs b/src/Control/Brew/Maintenance.hs
@@ -1,8 +1,6 @@
 module Control.Brew.Maintenance
   ( procFormulas
-  , procFormula
-  )
-where
+  ) where
 
 import           Control.Brew.Commands          ( uninstallFormula )
 import           Data.Brew                      ( Answer(..)

diff --git a/src/Data/Brew.hs b/src/Data/Brew.hs
@@ -77,7 +77,7 @@ type ErrorOrFormulas = Either BrewError [BrewFormula]
 type ErrorOrFormula = Either BrewError BrewFormula
 
 --
--- | answes
+-- | answers
 --
 
 data Answer

diff --git a/src/Tui/Widgets.hs b/src/Tui/Widgets.hs
@@ -59,7 +59,7 @@ formulas s = do
   let
     fs =
       formulaNames (s ^. stateFormulas) (s ^. stateFormulaNameOp) (getEditedFormulaName s)
-  withBorderStyle unicodeBold
+   in withBorderStyle unicodeBold
     . border
     . hLimit leftWidth
     . vBox
@@ -80,9 +80,7 @@ formulas s = do
 
 formulaNames
   :: NonEmptyCursor BrewFormula -> FormulaOp -> String -> NonEmptyCursor BrewFormula
-formulaNames fs FormulaJumpTo []   = fs
-formulaNames fs FormulaJumpTo name = selectFormula fs name
-formulaNames fs _             _    = fs
+formulaNames fs op name = if op /= FormulaJumpTo || null name then fs else selectFormula fs name
 
 selectFormula :: NonEmptyCursor BrewFormula -> String -> NonEmptyCursor BrewFormula
 selectFormula fs name = fromMaybe fs (nonEmptyCursorSearch prefix fs)