Allow bang in command names

Maybe this should be stricter, only allowing it at the end.

diff --git a/lib/Text/Docvim/Parse.hs b/lib/Text/Docvim/Parse.hs
index 75514272764a65421c1b52c8adb06526d67ce509..6930e1abd42ba5eeac5744ad7ea8cba09c1d96be 100644 (file)
--- a/lib/Text/Docvim/Parse.hs
+++ b/lib/Text/Docvim/Parse.hs
@@ -450,7 +450,7 @@ annotation = char '@' *> annotationName
              ]
 
     command'          = string "command" >> ws >> CommandAnnotation <$> commandName <*> commandParameters
-    commandName       = char ':' *> many1 alphaNum <* optional ws
+    commandName       = char ':' *> many1 (alphaNum <|> char '!') <* optional ws
     commandParameters = optionMaybe $ many1 (noneOf "\n")
 
     function'         = string "function" >> ws >> FunctionAnnotation <$> word <* optional ws

diff --git a/tests/fixtures/parser/command.golden b/tests/fixtures/parser/command.golden
index b3b75e96666b5a69e9e738ae59784c210aacb103..2235d6c3a0fa9f21a8e8b4addbc7746798e0bd65 100644 (file)
--- a/tests/fixtures/parser/command.golden
+++ b/tests/fixtures/parser/command.golden
@@ -14,6 +14,18 @@ Project
       , Whitespace
       , Plaintext "one."
       ]
+  , CommandAnnotation "Ack!" (Just "{pattern} {options}")
+  , Paragraph
+      [ Plaintext "Going"
+      , Whitespace
+      , Plaintext "out"
+      , Whitespace
+      , Plaintext "with"
+      , Whitespace
+      , Plaintext "a"
+      , Whitespace
+      , Plaintext "bang."
+      ]
   , Paragraph
       [ Plaintext "TODO:"
       , Whitespace

diff --git a/tests/fixtures/parser/command.vim b/tests/fixtures/parser/command.vim
index ea2e5e7e144d7e2de4f2c1d4a345a828dca5de4a..9ecc42881aab0c70a9bd38ee5f3ae6d610aa6246 100644 (file)
--- a/tests/fixtures/parser/command.vim
+++ b/tests/fixtures/parser/command.vim
@@ -7,4 +7,8 @@
 "
 " No params on that one.
 "
+" @command :Ack! {pattern} {options}
+"
+" Going out with a bang.
+"
 " TODO: Infer info based on following VimL nodes.