Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions parser/src/command.rs
Original file line number Diff line number Diff line change
Expand Up @@ -519,3 +519,22 @@ fn delegate_with_at() {
})))
);
}

#[test]
fn test_follow_commands() {
let input = "@bot claim @bot label +bug";
let mut input = Input::new(input, vec!["bot"]);
assert_eq!(
input.next(),
Some(Command::Assign(Ok(assign::AssignCommand::AssignUser {
username: "bot".to_string()
})))
);
assert_eq!(
input.next(),
Some(Command::Relabel(Ok(relabel::RelabelCommand(vec![
relabel::LabelDelta::Add(relabel::Label("bug".into()))
]))))
);
assert_eq!(input.next(), None);
}
41 changes: 39 additions & 2 deletions parser/src/command/assign.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
//! The grammar is as follows:
//!
//! ```text
//! Command: `@bot claim`, `@bot release-assignment`, or `@bot assign @user`.
//! Command: `@bot claim`, `@bot release-assignment`, `@bot assign @user`, or
//! `@bot claim @user`
//! ```

use crate::error::Error;
Expand All @@ -18,7 +19,7 @@ pub enum AssignCommand {
Claim,
/// Corresponds to `@bot release-assignment` or `@bot unclaim`.
ReleaseAssignment,
/// Corresponds to `@bot assign @user`.
/// Corresponds to `@bot assign @user` or `@bot claim @user`.
AssignUser { username: String },
/// Corresponds to `r? [@]user`.
RequestReview { name: String },
Expand Down Expand Up @@ -55,6 +56,14 @@ impl AssignCommand {
let mut toks = input.clone();
if let Some(Token::Word("claim")) = toks.peek_token()? {
toks.next_token()?;
if let Some(Token::Word(user)) = toks.peek_token()?
&& user.starts_with('@')
&& user.len() != 1
{
return Ok(Some(AssignCommand::AssignUser {
username: user[1..].to_owned(),
}));
}
if let Some(Token::Dot | Token::EndOfLine) = toks.peek_token()? {
toks.next_token()?;
}
Expand Down Expand Up @@ -154,6 +163,34 @@ mod tests {
);
}

#[test]
fn test_5() {
assert_eq!(
parse("claim @user"),
Ok(Some(AssignCommand::AssignUser {
username: "user".to_string()
})),
);
}

#[test]
fn test_6() {
assert_eq!(
parse("claim does not start with @"),
Ok(Some(AssignCommand::Claim)),
);
}

#[test]
fn test_7() {
assert_eq!(
parse("claim @triagebot"),
Ok(Some(AssignCommand::AssignUser {
username: "triagebot".to_string()
})),
);
}

fn parse_review<'a>(input: &'a str) -> Result<Option<AssignCommand>, Error<'a>> {
let mut toks = Tokenizer::new(input);
Ok(AssignCommand::parse_review(&mut toks)?)
Expand Down