twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-05-19 03:20:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

X.Prompt: get rid of MultiWayIf

Browse Source 
Not needed anymore
This commit is contained in:
slotThe 2021-04-08 14:43:23 +02:00
parent 344ace492b
commit d7ad486a6e
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
XMonad/Prompt.hs
View File

@ -1,6 +1,5 @@
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# LANGUAGE CPP #-}
@ -763,26 +762,26 @@ handleCompletion cs = do
--
--TODO: Scroll or paginate results
hlComplete :: String -> [String] -> XPState -> XP ()
hlComplete prevCompl l st =
if | -- The current suggestion matches the command and is a
-- proper suffix of the last suggestion, so replace it.
isSuffixOfCmd && isProperSuffixOfLast -> replaceCompletion prevCompl
hlComplete prevCompl l st
| -- The current suggestion matches the command and is a
-- proper suffix of the last suggestion, so replace it.
isSuffixOfCmd && isProperSuffixOfLast = replaceCompletion prevCompl
| -- We only have one suggestion, so we need to be a little
-- bit smart in order to avoid a loop.
length cs == 1 ->
if command st == hlCompl then put st else replaceCompletion (head cs)
| -- We only have one suggestion, so we need to be a little
-- bit smart in order to avoid a loop.
length cs == 1 =
if command st == hlCompl then put st else replaceCompletion (head cs)
-- The current suggestion matches the command, so advance
-- to the next completion and try again.
| isSuffixOfCmd ->
hlComplete hlCompl l $ st{ complIndex = complIndex'
, highlightedCompl = nextHlCompl
}
-- The current suggestion matches the command, so advance
-- to the next completion and try again.
| isSuffixOfCmd =
hlComplete hlCompl l $ st{ complIndex = complIndex'
, highlightedCompl = nextHlCompl
}
-- If nothing matches at all, delete the suggestion and
-- highlight the next one.
| otherwise -> replaceCompletion prevCompl
-- If nothing matches at all, delete the suggestion and
-- highlight the next one.
| otherwise = replaceCompletion prevCompl
where
hlCompl :: String = fromMaybe (command st) $ highlightedItem st l
complIndex' :: (Int, Int) = nextComplIndex st (length l)