mirror of
https://github.com/xmonad/xmonad-contrib.git
synced 2025-07-31 20:21:51 -07:00
0a6048c66d
When users specify non-existent keys, it seems most intuitive to just
abort the parse and not try to take the "longest" input that still
works. For example, given the "key" `M-10` we should signal a parse
error (by returning `Nothing`) instead of parsing `M-1` and ignoring
the rest of the input. The old EZConfig parser accounted for this but
when the module was rewritten to use X.U.Parser in [1], this was
forgotten about.
Fixes: https://github.com/xmonad/xmonad/issues/361
[1]: 8abeb81fd0
45 lines
1.6 KiB
Haskell
45 lines
1.6 KiB
Haskell
module EZConfig (spec) where
|
|
|
|
import Control.Arrow (first)
|
|
import Test.Hspec
|
|
import XMonad
|
|
import XMonad.Prelude
|
|
import XMonad.Util.EZConfig
|
|
import XMonad.Util.Parser
|
|
|
|
spec :: Spec
|
|
spec = do
|
|
context "parseKey" $ do
|
|
let prepare = unzip . map (first surround)
|
|
testParseKey (ns, ks) = traverse (runParser parseKey) ns `shouldBe` Just ks
|
|
it "parses all regular keys" $ testParseKey regularKeys
|
|
it "parses all function keys" $ testParseKey (prepare functionKeys )
|
|
it "parses all special keys" $ testParseKey (prepare specialKeys )
|
|
it "parses all multimedia keys" $ testParseKey (prepare multimediaKeys)
|
|
context "parseModifier" $ do
|
|
it "parses all combinations of modifiers" $
|
|
nub . map sort <$> traverse (runParser (many $ parseModifier def))
|
|
modifiers
|
|
`shouldBe` Just [[ shiftMask, controlMask
|
|
, mod1Mask, mod1Mask -- def M and M1
|
|
, mod2Mask, mod3Mask, mod4Mask, mod5Mask
|
|
]]
|
|
|
|
-- Checking for regressions
|
|
describe "readKeySequence" $
|
|
it "Fails on the non-existent key M-10" $
|
|
readKeySequence def "M-10" `shouldBe` Nothing
|
|
|
|
regularKeys :: ([String], [KeySym])
|
|
regularKeys = unzip . map (first (: ""))
|
|
$ zip ['!' .. '~' ] [xK_exclam .. xK_asciitilde]
|
|
++ zip ['\xa0' .. '\xff'] [xK_nobreakspace .. xK_ydiaeresis]
|
|
|
|
-- | QuickCheck can handle the 8! combinations just fine.
|
|
modifiers :: [String]
|
|
modifiers = map concat $
|
|
permutations ["M-", "C-", "S-", "M1-", "M2-", "M3-", "M4-", "M5-"]
|
|
|
|
surround :: String -> String
|
|
surround s = "<" <> s <> ">"
|