X.P.OrgMode: Require whitespace before priority

By being a bit less greedy with consuming whitespace in the date/time
parsers, we can make the `prop_{encode,decode}Preservation` properties
well-defined again.

XMonad/Prompt/OrgMode.hs

@@ -141,7 +141,9 @@ There is basic support for alphabetic org-mode
 <https:\/\/orgmode.org\/manual\/Priorities.html priorities>.
 Simply append either @#A@, @#B@, or @#C@ (capitalisation is optional) to
 the end of the note.  For example, one could write @"hello +s 11 jan
-2013 #A"@ or @"hello #C"@.
+2013 #A"@ or @"hello #C"@.  Note that there has to be at least one
+whitespace character between the end of the note and the chosen
+priority.
 
 There's also the possibility to take what's currently in the primary
 selection and paste that as the content of the created note.  This is
@@ -381,14 +383,14 @@ pInput inp = (`runParser` inp) . choice $
   [ Scheduled <$> getLast "+s" <*> (Time <$> pDate <*> pTimeOfDay) <*> pPriority
   , Deadline  <$> getLast "+d" <*> (Time <$> pDate <*> pTimeOfDay) <*> pPriority
   , do s <- munch1 (pure True)
-       let (s', p) = splitAt (length s - 2) s
+       let (s', p) = splitAt (length s - 3) s
        pure $ case tryPrio p of
          Just prio -> NormalMsg (dropStripEnd 0 s') prio
          Nothing   -> NormalMsg s                   NoPriority
   ]
  where
   tryPrio :: String -> Maybe Priority
-  tryPrio ['#', x]
+  tryPrio [' ', '#', x]
     | x `elem` ("Aa" :: String) = Just A
     | x `elem` ("Bb" :: String) = Just B
     | x `elem` ("Cc" :: String) = Just C
@@ -412,19 +414,19 @@ pInput inp = (`runParser` inp) . choice $
 
 -- | Parse a 'Priority'.
 pPriority :: Parser Priority
-pPriority = skipSpaces *> choice
+pPriority = pLast (pure NoPriority) $
+  " " *> skipSpaces *> choice
     [ "#" *> ("A" <|> "a") $> A
     , "#" *> ("B" <|> "b") $> B
     , "#" *> ("C" <|> "c") $> C
-  , pure NoPriority
     ]
 
 -- | Try to parse a 'Time'.
 pTimeOfDay :: Parser (Maybe TimeOfDay)
-pTimeOfDay = choice
+pTimeOfDay = pLast (pure Nothing) $
+  skipSpaces *> choice
     [ Just <$> (TimeOfDay <$> pHour <* string ":" <*> pMinute) -- HH:MM
     , Just <$> (TimeOfDay <$> pHour               <*> pure 0 ) -- HH
-  , pure Nothing
     ]
  where
   pMinute :: Parser Int = pNumBetween 1 60
@@ -437,7 +439,7 @@ pDate = skipSpaces *> choice
   , pPrefix "tom" "orrow" Tomorrow
   , Next <$> pNext
   , Date <$> pDate'
-  ] <* skipSpaces  -- cleanup
+  ]
  where
   pNext :: Parser DayOfWeek = choice
     [ pPrefix "m"  "onday"    Monday   , pPrefix "tu" "esday"  Tuesday
@@ -482,3 +484,9 @@ pNumBetween :: Int -> Int -> Parser Int
 pNumBetween lo hi = do
   n <- num
   n <$ guard (n >= lo && n <= hi)
+
+-- | A flipped version of '(<|>)'.  Useful when @p'@ is some complicated
+-- expression that, for example, consumes spaces and @p@ does not want
+-- to do that.
+pLast :: Parser a -> Parser a -> Parser a
+pLast p p' = p' <|> p

tests/OrgMode.hs

@@ -57,6 +57,13 @@ spec = do
                 B
           )
 
+  context "no priority#b" $ do
+    it "parses to the correct thing" $
+      pInput "no priority#b"
+        `shouldBe` Just (NormalMsg "no priority#b" NoPriority)
+    it "encode" $ prop_encodePreservation (OrgMsg "no priority#b")
+    it "decode" $ prop_decodePreservation (NormalMsg "no priority#b" NoPriority)
+
   context "+d +d f" $ do
     it "encode" $ prop_encodePreservation (OrgMsg "+d +d f")
     it "decode" $ prop_decodePreservation (Deadline "+d" (Time {date = Next Friday, tod = Nothing}) NoPriority)