From 5f5c114cdd91b323053a7da3fcaf7c1b9914ccdb Mon Sep 17 00:00:00 2001 From: Robin Shen Date: Thu, 30 Oct 2025 11:29:05 +0800 Subject: [PATCH] chore: Allow spaces in review requirement criterias --- .../onedev/server/util/reviewrequirement/ReviewRequirement.g4 | 4 ++-- .../server/util/reviewrequirement/ReviewRequirement.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 index 18b044cc52..817ad8532e 100644 --- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 +++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 @@ -4,8 +4,8 @@ requirement: WS* criteria (WS+ criteria)* WS* EOF; criteria: userCriteria | groupCriteria; -userCriteria: USER Value; -groupCriteria: GROUP Value (':' DIGIT)?; +userCriteria: USER WS* Value; +groupCriteria: GROUP WS* Value (WS*':' WS* DIGIT)?; DIGIT: [1-9][0-9]*; diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java index 98b827725c..73ce4eaa2a 100644 --- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java +++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java @@ -87,7 +87,7 @@ public class ReviewRequirement { } private static String getValue(TerminalNode terminal) { - return StringUtils.unescape(FenceAware.unfence(terminal.getText())); + return StringUtils.unescape(FenceAware.unfence(terminal.getText())).trim(); } public List getUsers() {