From 27550a437d53c84d55d33a45d15f64600356e4b4 Mon Sep 17 00:00:00 2001 From: Gerd Reiss Date: Fri, 30 Apr 2021 12:40:39 +0200 Subject: [PATCH] cleanup --- src/Control/Brew/Maintenance.hs | 4 +--- src/Data/Brew.hs | 2 +- src/Tui/Widgets.hs | 6 ++---- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/Control/Brew/Maintenance.hs b/src/Control/Brew/Maintenance.hs index 9e1a7f8..0044c29 100644 --- 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 index 93c5949..1969571 100644 --- 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 index b699869..7e692f7 100644 --- 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)