X.A.WorkspaceNames: convert tabs to spaces, cleanup

This commit is contained in:
Brent Yorgey
2015-06-03 14:20:27 +00:00
parent bbf36809e9
commit c1db249147

View File

@@ -158,14 +158,14 @@ swapNames w1 w2 = do
-- | Same behavior than 'XMonad.Prompt.Workspace.workspacePrompt' excepted it acts on the workspace name provided by this module. -- | Same behavior than 'XMonad.Prompt.Workspace.workspacePrompt' excepted it acts on the workspace name provided by this module.
workspaceNamePrompt :: XPConfig -> (String -> X ()) -> X () workspaceNamePrompt :: XPConfig -> (String -> X ()) -> X ()
workspaceNamePrompt conf job = do workspaceNamePrompt conf job = do
myWorkspaces <- gets $ map W.tag . W.workspaces . windowset myWorkspaces <- gets $ map W.tag . W.workspaces . windowset
myWorkspacesName <- getWorkspaceNames >>= \f -> return $ map f myWorkspaces myWorkspacesName <- getWorkspaceNames >>= \f -> return $ map f myWorkspaces
let pairs = zip myWorkspacesName myWorkspaces let pairs = zip myWorkspacesName myWorkspaces
mkXPrompt (Wor "Select workspace: ") conf mkXPrompt (Wor "Select workspace: ") conf
(contains myWorkspacesName) (contains myWorkspacesName)
(job . toWsId pairs) (job . toWsId pairs)
where toWsId pairs name = case lookup name pairs of where toWsId pairs name = case lookup name pairs of
Nothing -> "" Nothing -> ""
Just i -> i Just i -> i
contains completions input = contains completions input =
return $ filter (Data.List.isInfixOf input) completions return $ filter (Data.List.isInfixOf input) completions