Merge pull request #2090 from Urgau/support-concern-resolve

Also support `concern resolve` to resolve concerns

Author: Urgau

parser/src/command.rs

@@ -374,6 +374,18 @@ fn concern() {
     );
 }
 
+#[test]
+fn concern_resolve() {
+    let input = "@bot concern resolve this is my concern";
+    let mut input = Input::new(input, vec!["bot"]);
+    assert_eq!(
+        input.next(),
+        Some(Command::Concern(Ok(concern::ConcernCommand::Resolve {
+            title: "this is my concern".to_string()
+        })))
+    );
+}
+
 #[test]
 fn resolve() {
     let input = "@bot resolve this is my concern";

parser/src/command/concern.rs

@@ -25,9 +25,16 @@ impl fmt::Display for ParseError {
 impl ConcernCommand {
     pub fn parse<'a>(input: &mut Tokenizer<'a>) -> Result<Option<Self>, Error<'a>> {
         let mut toks = input.clone();
-        if let Some(Token::Word(action @ ("concern" | "resolve"))) = toks.peek_token()? {
+        if let Some(Token::Word(mut action @ ("concern" | "resolve"))) = toks.peek_token()? {
             toks.next_token()?;
 
+            if action == "concern" {
+                if let Some(Token::Word(sub_action @ "resolve")) = toks.peek_token()? {
+                    toks.next_token()?;
+                    action = sub_action;
+                }
+            }
+
             let title = toks.take_line()?.trim().to_string();
 
             if title.is_empty() {