Skip to content

The Unified and Autonomous Development Platform

Handle escape/unescape correctly in various queries

Robin Shencbed3801e344
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4
index a5946cfd47..cc08a59848 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4
@@ -113,11 +113,5 @@ WS
;
Value
- : '(' (ESCAPE|~[()\\])+? ')'
- ;
-
-fragment
-
-ESCAPE
- : '\\'[()\\]
+ : '(' ('\\'[()]|~[()])+? ')'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
index 7694eaec4d..f957b87938 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
@@ -14,6 +14,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.tree.TerminalNode;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
@@ -148,12 +149,8 @@ public class CommitQuery implements Serializable {
}
private static String getValue(TerminalNode terminalNode) {
- String value = terminalNode.getText();
- if (value.startsWith("("))
- value = value.substring(1);
- if (value.endsWith(")"))
- value = value.substring(0, value.length()-1);
- return value.replace("\\(", "(").replace("\\)", ")").replace("\\\\", "\\");
+ String value = terminalNode.getText().substring(1);
+ return unescapeBraces(value.substring(0, value.length()-1));
}
public boolean matches(RefUpdated event, User user) {
@@ -163,6 +160,16 @@ public class CommitQuery implements Serializable {
return false;
}
+ public static String escapeBraces(String value) {
+ value = StringUtils.replace(value, ")", "\\)");
+ return StringUtils.replace(value, "(", "\\(");
+ }
+
+ public static String unescapeBraces(String value) {
+ value = StringUtils.replace(value, "\\)", ")");
+ return StringUtils.replace(value, "\\(", "(");
+ }
+
public void fill(Project project, RevListCommand command) {
criterias.stream().forEach(it->it.fill(project, command));
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 7d3bf98e1a..03d8098c6d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -7,9 +7,9 @@ import java.util.List;
import javax.persistence.criteria.Path;
+import org.apache.commons.lang.StringUtils;
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.ObjectId;
-import org.unbescape.java.JavaEscape;
import com.google.common.base.Splitter;
@@ -38,7 +38,8 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
public static String getValue(String tokenText) {
String value = tokenText.substring(1);
- return JavaEscape.unescapeJava(value.substring(0, value.length()-1));
+ value = value.substring(0, value.length()-1);
+ return unescapeQuotes(value);
}
public static int getIntValue(String value) {
@@ -145,7 +146,15 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
}
public static String quote(String value) {
- return "\"" + JavaEscape.escapeJava(value) + "\"";
+ return "\"" + escapeQuotes(value) + "\"";
+ }
+
+ public static String escapeQuotes(String value) {
+ return StringUtils.replace(value, "\"", "\\\"");
+ }
+
+ public static String unescapeQuotes(String value) {
+ return StringUtils.replace(value, "\\\"", "\"");
}
public static <T> Path<T> getPath(Path<?> root, String pathName) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index 0a49956355..8ad7ecba1d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -141,7 +141,7 @@ RParens
;
Quoted
- : '"' (ESCAPE|~["\\])+? '"'
+ : '"' ('\\"'|~'"')+? '"'
;
WS
@@ -151,8 +151,3 @@ WS
Identifier
: [a-zA-Z0-9:_/\\+\-;]+
;
-
-fragment
-ESCAPE
- : '\\'["\\]
- ;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
index f24fcdbea6..455a16bd49 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
@@ -93,7 +93,7 @@ RParens
;
Quoted
- : '"' (ESCAPE|~["\\])+? '"'
+ : '"' ('\\"'|~'"')+? '"'
;
WS
@@ -103,8 +103,3 @@ WS
Identifier
: [a-zA-Z0-9:_/\\+\-;]+
;
-
-fragment
-ESCAPE
- : '\\'["\\]
- ;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
index 79d667e90f..097bbc0351 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
@@ -139,7 +139,7 @@ RParens
;
Quoted
- : '"' (ESCAPE|~["\\])+? '"'
+ : '"' ('\\"'|~'"')+? '"'
;
WS
@@ -149,8 +149,3 @@ WS
Identifier
: [a-zA-Z0-9:_/\\+\-;]+
;
-
-fragment
-ESCAPE
- : '\\'["\\]
- ;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
index c3a70a4fe6..8bf94185a8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
@@ -161,7 +161,7 @@ RParens
;
Quoted
- : '"' (ESCAPE|~["\\])+? '"'
+ : '"' ('\\"'|~'"')+? '"'
;
WS
@@ -171,8 +171,3 @@ WS
Identifier
: [a-zA-Z0-9:_/\\+\-;]+
;
-
-fragment
-ESCAPE
- : '\\'["\\]
- ;
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 d452dbffa1..4e2cd53cb1 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
@@ -14,7 +14,4 @@ DIGIT: [1-9][0-9]*;
USER: 'user';
GROUP: 'group';
-Value: '(' (ESCAPE|~[()\\])+? ')';
-
-fragment
-ESCAPE: '\\'[()\\];
+Value: '(' ('\\'[()]|~[()])+? ')';
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 ceaa0c1b6b..2830dd3c45 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
@@ -15,6 +15,7 @@ import org.antlr.v4.runtime.CommonTokenStream;
import org.antlr.v4.runtime.RecognitionException;
import org.antlr.v4.runtime.Recognizer;
import org.antlr.v4.runtime.tree.TerminalNode;
+import org.apache.commons.lang.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
@@ -46,7 +47,7 @@ public class ReviewRequirement {
for (CriteriaContext criteria: requirement.criteria()) {
if (criteria.userCriteria() != null) {
- String userName = getBracedValue(criteria.userCriteria().Value());
+ String userName = getValue(criteria.userCriteria().Value());
User user = OneDev.getInstance(UserManager.class).findByName(userName);
if (user != null) {
if (!users.contains(user)) {
@@ -58,7 +59,7 @@ public class ReviewRequirement {
throw new OneException("Unable to find user '" + userName + "'");
}
} else if (criteria.groupCriteria() != null) {
- String groupName = getBracedValue(criteria.groupCriteria().Value());
+ String groupName = getValue(criteria.groupCriteria().Value());
Group group = OneDev.getInstance(GroupManager.class).find(groupName);
if (group != null) {
if (!groups.containsKey(group)) {
@@ -104,9 +105,19 @@ public class ReviewRequirement {
return parser.requirement();
}
- private static String getBracedValue(TerminalNode terminal) {
+ private static String getValue(TerminalNode terminal) {
String value = terminal.getText().substring(1);
- return value.substring(0, value.length()-1).trim();
+ return unescapeBraces(value.substring(0, value.length()-1).trim());
+ }
+
+ public static String escapeBraces(String value) {
+ value = StringUtils.replace(value, ")", "\\)");
+ return StringUtils.replace(value, "(", "\\(");
+ }
+
+ public static String unescapeBraces(String value) {
+ value = StringUtils.replace(value, "\\)", ")");
+ return StringUtils.replace(value, "\\(", "(");
}
public List<User> getUsers() {
@@ -176,9 +187,9 @@ public class ReviewRequirement {
public String toString() {
StringBuilder builder = new StringBuilder();
for (User user: users)
- builder.append("user(").append(user.getName()).append(") ");
+ builder.append("user(").append(ReviewRequirement.escapeBraces(user.getName())).append(") ");
for (Map.Entry<Group, Integer> entry: groups.entrySet()) {
- builder.append("group(").append(entry.getKey().getName()).append(")");
+ builder.append("group(").append(ReviewRequirement.escapeBraces(entry.getKey().getName())).append(")");
if (entry.getValue() == 0)
builder.append(":all");
else if (entry.getValue() != 1)
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index c7921ab7a9..52f0477dad 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -34,12 +34,6 @@ import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
public class BuildQueryBehavior extends ANTLRAssistBehavior {
- private static final String VALUE_OPEN = "\"";
-
- private static final String VALUE_CLOSE = "\"";
-
- private static final String ESCAPE_CHARS = "\"\\";
-
private final IModel<Project> projectModel;
private final boolean noLoginSupport;
@@ -61,7 +55,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());
}
private CacheManager getCacheManager() {
@@ -73,11 +67,11 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
- String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = BuildQuery.unescapeQuotes(matchWith.toLowerCase());
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = getProject();
@@ -86,9 +80,9 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
List<String> paramNames = new ArrayList<>(getCacheManager().getBuildParamNames());
Collections.sort(paramNames);
fields.addAll(paramNames);
- suggestions.addAll(escape(SuggestionUtils.suggest(fields, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(fields, normalizedMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
- suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), normalizedMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -97,13 +91,13 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
int operator = BuildQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy)
- suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));
else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)
- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));
else if (operator == BuildQueryLexer.FixedIssue)
- suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, normalizedMatchWith)));
else
- suggestions.addAll(escape(SuggestionUtils.suggestPullRequests(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestPullRequests(project, normalizedMatchWith)));
} else {
String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());
try {
@@ -113,17 +107,17 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
|| fieldName.equals(BuildConstants.FIELD_RUNNING_DATE)
|| fieldName.equals(BuildConstants.FIELD_FINISH_DATE)) {
suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES,
- unfencedLowerCaseMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ normalizedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
} else if (fieldName.equals(BuildConstants.FIELD_JOB)) {
- suggestions.addAll(escape(SuggestionUtils.suggestJobs(projectModel.getObject(), unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestJobs(projectModel.getObject(), normalizedMatchWith)));
} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {
- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));
} else {
List<String> paramValues = new ArrayList<>(getCacheManager().getBuildParamValues(fieldName));
Collections.sort(paramValues);
- suggestions.addAll(SuggestionUtils.suggest(paramValues, unfencedMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ suggestions.addAll(escape(SuggestionUtils.suggest(paramValues, normalizedMatchWith)));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
}
} catch (OneException ex) {
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index d490421363..64ce902135 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -23,6 +23,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;
import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;
+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.util.CodeCommentConstants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
@@ -33,12 +34,6 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
private final IModel<Project> projectModel;
- private static final String VALUE_OPEN = "\"";
-
- private static final String VALUE_CLOSE = "\"";
-
- private static final String ESCAPE_CHARS = "\"\\";
-
public CodeCommentQueryBehavior(IModel<Project> projectModel) {
super(CodeCommentQueryParser.class, "query", false);
this.projectModel = projectModel;
@@ -55,7 +50,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());
}
@Override
@@ -63,18 +58,18 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
- String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = PullRequestQuery.unescapeQuotes(matchWith.toLowerCase());
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
- suggestions.addAll(escape(SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, normalizedMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
- suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), normalizedMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -83,7 +78,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
int operator = CodeCommentQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == CodeCommentQueryLexer.CreatedBy) {
- suggestions.addAll(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith));
+ suggestions.addAll(SuggestionUtils.suggestUsers(normalizedMatchWith));
} else {
return null;
}
@@ -92,10 +87,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
try {
CodeCommentQuery.checkField(project, fieldName, operator);
if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE) || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
} else if (fieldName.equals(CodeCommentConstants.FIELD_PATH)) {
- suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), normalizedMatchWith)));
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index 55a5168bd3..c45425ee46 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -28,6 +28,7 @@ import io.onedev.server.git.NameAndEmail;
import io.onedev.server.model.Project;
import io.onedev.server.search.commit.CommitQueryParser;
import io.onedev.server.util.Constants;
+import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -36,12 +37,6 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
private final IModel<Project> projectModel;
- private static final String VALUE_OPEN = "(";
-
- private static final String VALUE_CLOSE = ")";
-
- private static final String ESCAPE_CHARS = "\\()";
-
private static final List<String> DATE_EXAMPLES = Lists.newArrayList(
"one hour ago", "2 hours ago", "3PM", "noon", "today", "yesterday",
"yesterday midnight", "3 days ago", "last week", "last Monday",
@@ -59,7 +54,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("()")).collect(Collectors.toList());
}
@Override
@@ -67,23 +62,23 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "(", ")") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = ReviewRequirement.unescapeBraces(matchWith.toLowerCase());
int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
- String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = projectModel.getObject();
switch (tokenType) {
case CommitQueryParser.BRANCH:
- suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, unfencedMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, normalizedMatchWith)));
break;
case CommitQueryParser.TAG:
- suggestions.addAll(escape(SuggestionUtils.suggestTags(project, unfencedMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestTags(project, normalizedMatchWith)));
break;
case CommitQueryParser.BUILD:
- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));
break;
case CommitQueryParser.AUTHOR:
case CommitQueryParser.COMMITTER:
@@ -97,25 +92,24 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
else
content = user.getName();
content = content.trim();
- PatternApplied applied = WildcardUtils.applyPattern(unfencedLowerCaseMatchWith, content,
- false);
+ PatternApplied applied = WildcardUtils.applyPattern(normalizedMatchWith, content, false);
if (applied != null)
suggestedInputs.put(applied.getText(), applied.getMatch());
}
for (Map.Entry<String, LinearRange> entry: suggestedInputs.entrySet())
- suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()).escape(ESCAPE_CHARS));
+ suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()).escape("()"));
break;
case CommitQueryParser.BEFORE:
case CommitQueryParser.AFTER:
List<String> candidates = new ArrayList<>(DATE_EXAMPLES);
candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
- suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ suggestions.addAll(SuggestionUtils.suggest(candidates, normalizedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
break;
case CommitQueryParser.PATH:
- suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), unfencedMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), normalizedMatchWith)));
break;
default:
return null;
@@ -139,7 +133,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
List<String> hints = new ArrayList<>();
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
- if (spec.getRuleName().equals("Value") && !terminalExpect.getUnmatchedText().contains(VALUE_CLOSE)) {
+ if (spec.getRuleName().equals("Value") && !terminalExpect.getUnmatchedText().contains(")")) {
int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
if (tokenType == CommitQueryParser.COMMITTER) {
hints.add("Use * to match any part of committer");
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index a1e4dd41f5..d16d8551f6 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -69,12 +69,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
private final IModel<Project> projectModel;
- private static final String VALUE_OPEN = "\"";
-
- private static final String VALUE_CLOSE = "\"";
-
- private static final String ESCAPE_CHARS = "\"\\";
-
private static final int MAX_ISSUE_TITLE_LEN = 75;
public IssueQueryBehavior(IModel<Project> projectModel) {
@@ -93,7 +87,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());
}
@Override
@@ -103,11 +97,11 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
- String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = IssueQuery.unescapeQuotes(matchWith.toLowerCase());
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = getProject();
@@ -115,29 +109,29 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);
for (FieldSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());
for (FieldSpec field: issueSetting.getFieldSpecs()) {
if (field instanceof NumberField || field instanceof ChoiceField || field instanceof DateField)
candidates.add(field.getName());
}
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if ("revisionValue".equals(spec.getLabel())) {
String revisionType = terminalExpect.getState()
.findMatchedElementsByLabel("revisionType", true).iterator().next().getMatchedText();
switch (revisionType) {
case "branch":
if (getProject() != null)
- suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, normalizedMatchWith)));
break;
case "tag":
if (getProject() != null)
- suggestions.addAll(escape(SuggestionUtils.suggestTags(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestTags(project, normalizedMatchWith)));
break;
case "build":
if (getProject() != null)
- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));
break;
}
} else if ("criteriaValue".equals(spec.getLabel())) {
@@ -148,9 +142,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
int operator = IssueQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == IssueQueryLexer.SubmittedBy)
- suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));
else
- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));
} else {
String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());
@@ -159,47 +153,47 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)
|| fieldName.equals(FIELD_UPDATE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
} else if (fieldSpec instanceof UserChoiceField) {
- suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));
} else if (fieldSpec instanceof IssueChoiceField) {
- List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
for (Issue issue: issues) {
InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);
suggestions.add(suggestion);
}
} else if (fieldSpec instanceof BuildChoiceField) {
- List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
for (Build build: builds) {
InputSuggestion suggestion = new InputSuggestion("#" + build.getNumber(), null, null);
suggestions.add(suggestion);
}
} else if (fieldSpec instanceof PullRequestChoiceField) {
- List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
for (PullRequest request: requests) {
InputSuggestion suggestion = new InputSuggestion("#" + request.getNumber(), StringUtils.abbreviate(request.getTitle(), MAX_ISSUE_TITLE_LEN), null);
suggestions.add(suggestion);
}
} else if (fieldSpec instanceof BooleanField) {
- suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith));
+ suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), normalizedMatchWith));
} else if (fieldSpec instanceof GroupChoiceField) {
List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldName.equals(FIELD_STATE)) {
List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldSpec instanceof ChoiceField) {
ComponentContext.push(new ComponentContext(getComponent()));
try {
List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} finally {
ComponentContext.pop();
}
} else if (fieldName.equals(FIELD_MILESTONE)) {
List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)
|| fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)
|| fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index b70e03fe95..4cc87744de 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -38,12 +38,6 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
private final IModel<Project> projectModel;
- private static final String VALUE_OPEN = "\"";
-
- private static final String VALUE_CLOSE = "\"";
-
- private static final String ESCAPE_CHARS = "\"\\";
-
public PullRequestQueryBehavior(IModel<Project> projectModel) {
super(PullRequestQueryParser.class, "query", false);
this.projectModel = projectModel;
@@ -60,7 +54,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());
}
@Override
@@ -68,19 +62,19 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
- String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = PullRequestQuery.unescapeQuotes(matchWith.toLowerCase());
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = getProject();
if ("criteriaField".equals(spec.getLabel())) {
- suggestions.addAll(escape(SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, normalizedMatchWith)));
} else if ("orderField".equals(spec.getLabel())) {
suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()),
- unfencedLowerCaseMatchWith)));
+ normalizedMatchWith)));
} else if ("criteriaValue".equals(spec.getLabel())) {
List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
@@ -89,9 +83,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
int operator = PullRequestQuery.getOperator(operatorName);
if (fieldElements.isEmpty()) {
if (operator == PullRequestQueryLexer.IncludesIssue)
- suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, normalizedMatchWith)));
else if (operator != PullRequestQueryLexer.IncludesCommit)
- suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));
else
return null;
} else {
@@ -101,24 +95,24 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)
|| fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)
|| fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {
- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));
} else if (fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)) {
List<String> candidates = new ArrayList<>();
for (Project each: OneDev.getInstance(ProjectManager.class).query())
candidates.add(each.getName());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)
|| fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {
List<String> candidates = new ArrayList<>();
for (RefInfo refInfo: project.getBranches())
candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)) {
List<String> candidates = new ArrayList<>();
for (MergeStrategy strategy: MergeStrategy.values())
candidates.add(strategy.toString());
- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith)));
+ suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));
} else if (fieldName.equals(PullRequestConstants.FIELD_TITLE)
|| fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)
|| fieldName.equals(PullRequestConstants.FIELD_NUMBER)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java
index d17aafffa1..2d69af514e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java
@@ -18,6 +18,7 @@ import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.server.model.Project;
import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.reviewrequirement.ReviewRequirementParser;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -27,12 +28,6 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {
private final IModel<Project> projectModel;
- private static final String VALUE_OPEN = "(";
-
- private static final String VALUE_CLOSE = ")";
-
- private static final String ESCAPE_CHARS = "\\()";
-
public ReviewRequirementBehavior(IModel<Project> projectModel) {
super(ReviewRequirementParser.class, "requirement", false);
this.projectModel = projectModel;
@@ -45,7 +40,7 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {
}
private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {
- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());
+ return suggestions.stream().map(it->it.escape("()")).collect(Collectors.toList());
}
@Override
@@ -53,16 +48,17 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+ return new FenceAware(codeAssist.getGrammar(), "(", ")") {
@Override
- protected List<InputSuggestion> match(String unfencedMatchWith) {
+ protected List<InputSuggestion> match(String matchWith) {
+ String normalizedMatchWith = ReviewRequirement.unescapeBraces(matchWith.toLowerCase());
Project project = projectModel.getObject();
if (terminalExpect.findExpectByRule("userCriteria") != null) {
return escape(SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ,
- unfencedMatchWith));
+ normalizedMatchWith));
} else {
- return escape(SuggestionUtils.suggestGroups(unfencedMatchWith));
+ return escape(SuggestionUtils.suggestGroups(normalizedMatchWith));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index c89d7afd7d..114641092a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -10,6 +10,7 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nullable;
@@ -43,6 +44,8 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTree;
import org.eclipse.jgit.revwalk.RevWalk;
import org.eclipse.jgit.treewalk.TreeWalk;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -134,6 +137,8 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
private static final String BLOB_CONTENT_ID = "blobContent";
+ private static final Logger logger = LoggerFactory.getLogger(ProjectBlobPage.class);
+
private State state = new State();
private ObjectId resolvedRevision;
@@ -336,8 +341,20 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
blobOperations.setOutputMarkupId(true);
String revision = state.blobIdent.revision;
- boolean reviewRequired = getProject().isReviewRequiredForModification(getLoginUser(), revision, null);
- boolean buildRequired = getProject().isBuildRequiredForModification(revision, null);
+
+ AtomicBoolean reviewRequired = new AtomicBoolean(true);
+ try {
+ reviewRequired.set(getProject().isReviewRequiredForModification(getLoginUser(), revision, null));
+ } catch (Exception e) {
+ logger.error("Error checking review requirement", e);
+ }
+
+ AtomicBoolean buildRequired = new AtomicBoolean(true);
+ try {
+ buildRequired.set(getProject().isBuildRequiredForModification(revision, null));
+ } catch (Exception e) {
+ logger.error("Error checking build requirement", e);
+ }
blobOperations.add(new MenuLink("add") {
@@ -412,10 +429,10 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- if (reviewRequired) {
+ if (reviewRequired.get()) {
tag.append("class", "disabled", " ");
tag.put("title", "Review required for this change. Submit pull request instead");
- } else if (buildRequired) {
+ } else if (buildRequired.get()) {
tag.append("class", "disabled", " ");
tag.put("title", "Build required for this change. Submit pull request instead");
} else {
@@ -432,7 +449,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S
&& isOnBranch() && state.blobIdent.isTree()
&& SecurityUtils.canWriteCode(project.getFacade())) {
setVisible(true);
- setEnabled(!reviewRequired && !buildRequired);
+ setEnabled(!reviewRequired.get() && !buildRequired.get());
} else {
setVisible(false);
}