Skip to content

The Unified and Autonomous Development Platform

Adapt to newly designed api of code assist

Robin Shen17db9baf6c6b
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4
new file mode 100644
index 0000000000..50419a73c0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.g4
@@ -0,0 +1,98 @@
+grammar CodeCommentQuery;
+
+query
+ : WS* (criteria|All) WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ | WS* EOF
+ ;
+
+criteria
+ : CreatedByMe #OperatorCriteria
+ | CreatedBy WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteria WS+ And WS+ criteria #AndCriteria
+ | criteria WS+ Or WS+ criteria #OrCriteria
+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | LParens WS* criteria WS* RParens #ParensCriteria
+ ;
+
+order
+ : orderField=Quoted WS* (WS+ direction=(Asc|Desc))?
+ ;
+
+All
+ : 'all'
+ ;
+
+CreatedByMe
+ : 'created by me'
+ ;
+
+CreatedBy
+ : 'created by'
+ ;
+
+OrderBy
+ : 'order by'
+ ;
+
+Is
+ : 'is'
+ ;
+
+Contains
+ : 'contains'
+ ;
+
+IsAfter
+ : 'is after'
+ ;
+
+IsBefore
+ : 'is before'
+ ;
+
+And
+ : 'and'
+ ;
+
+Or
+ : 'or'
+ ;
+
+Not
+ : 'not'
+ ;
+
+Asc
+ : 'asc'
+ ;
+
+Desc
+ : 'desc'
+ ;
+
+LParens
+ : '('
+ ;
+
+RParens
+ : ')'
+ ;
+
+Quoted
+ : '"' (ESCAPE|~["\\])+? '"'
+ ;
+
+WS
+ : ' '
+ ;
+
+Identifier
+ : [a-zA-Z0-9:_/\\+-;]+
+ ;
+
+fragment
+ESCAPE
+ : '\\'["\\]
+ ;
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java
new file mode 100644
index 0000000000..b7a1d275aa
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQuery.java
@@ -0,0 +1,262 @@
+package io.onedev.server.entityquery.codecomment;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+import org.eclipse.jgit.errors.RevisionSyntaxException;
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entityquery.AndCriteriaHelper;
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.EntityQuery;
+import io.onedev.server.entityquery.EntitySort;
+import io.onedev.server.entityquery.EntitySort.Direction;
+import io.onedev.server.entityquery.NotCriteriaHelper;
+import io.onedev.server.entityquery.OrCriteriaHelper;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.AndCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.CriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.NotCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OperatorCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OrCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.OrderContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.ParensCriteriaContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser.QueryContext;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.util.DateUtils;
+
+public class CodeCommentQuery extends EntityQuery<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final EntityCriteria<CodeComment> criteria;
+
+ private final List<EntitySort> sorts;
+
+ public CodeCommentQuery(@Nullable EntityCriteria<CodeComment> criteria, List<EntitySort> sorts) {
+ this.criteria = criteria;
+ this.sorts = sorts;
+ }
+
+ public CodeCommentQuery() {
+ this(null, new ArrayList<>());
+ }
+
+ public static CodeCommentQuery parse(Project project, @Nullable String queryString, boolean validate) {
+ if (queryString != null) {
+ ANTLRInputStream is = new ANTLRInputStream(queryString);
+ CodeCommentQueryLexer lexer = new CodeCommentQueryLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new OneException("Malformed query syntax", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ CodeCommentQueryParser parser = new CodeCommentQueryParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ QueryContext queryContext;
+ try {
+ queryContext = parser.query();
+ } catch (Exception e) {
+ if (e instanceof OneException)
+ throw e;
+ else
+ throw new OneException("Malformed query syntax", e);
+ }
+ CriteriaContext criteriaContext = queryContext.criteria();
+ EntityCriteria<CodeComment> commentCriteria;
+ if (criteriaContext != null) {
+ commentCriteria = new CodeCommentQueryBaseVisitor<EntityCriteria<CodeComment>>() {
+
+ @Override
+ public EntityCriteria<CodeComment> visitOperatorCriteria(OperatorCriteriaContext ctx) {
+ return new CreatedByMeCriteria();
+ }
+
+ private User getUser(String value) {
+ User user = OneDev.getInstance(UserManager.class).findByName(value);
+ if (user == null)
+ throw new OneException("Unable to find user with login: " + value);
+ return user;
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
+ String value = getValue(ctx.Quoted().getText());
+ return new CreatedByCriteria(getUser(value));
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitParensCriteria(ParensCriteriaContext ctx) {
+ return visit(ctx.criteria());
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = getValue(ctx.Quoted(0).getText());
+ String value = getValue(ctx.Quoted(1).getText());
+ int operator = ctx.operator.getType();
+ if (validate)
+ checkField(project, fieldName, operator);
+
+ switch (operator) {
+ case CodeCommentQueryLexer.IsBefore:
+ case CodeCommentQueryLexer.IsAfter:
+ Date dateValue = DateUtils.parseRelaxed(value);
+ if (dateValue == null)
+ throw new OneException("Unrecognized date: " + value);
+ switch (fieldName) {
+ case CodeComment.FIELD_CREATE_DATE:
+ return new CreateDateCriteria(dateValue, value, operator);
+ case CodeComment.FIELD_UPDATE_DATE:
+ return new UpdateDateCriteria(dateValue, value, operator);
+ default:
+ throw new IllegalStateException();
+ }
+ case CodeCommentQueryLexer.Contains:
+ switch (fieldName) {
+ case CodeComment.FIELD_CONTENT:
+ return new ContentCriteria(value);
+ default:
+ throw new IllegalStateException();
+ }
+ case CodeCommentQueryLexer.Is:
+ switch (fieldName) {
+ case CodeComment.FIELD_COMMIT:
+ try {
+ ObjectId commitId = project.getRepository().resolve(value);
+ if (commitId == null)
+ throw new RevisionSyntaxException("");
+ return new CommitCriteria(commitId.name());
+ } catch (RevisionSyntaxException | IOException e) {
+ throw new OneException("Invalid revision string: " + value);
+ }
+ case CodeComment.FIELD_PATH:
+ return new PathCriteria(value);
+ default:
+ throw new IllegalStateException();
+ }
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitOrCriteria(OrCriteriaContext ctx) {
+ List<EntityCriteria<CodeComment>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrCriteriaHelper<CodeComment>(childCriterias);
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitAndCriteria(AndCriteriaContext ctx) {
+ List<EntityCriteria<CodeComment>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndCriteriaHelper<CodeComment>(childCriterias);
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> visitNotCriteria(NotCriteriaContext ctx) {
+ return new NotCriteriaHelper<CodeComment>(visit(ctx.criteria()));
+ }
+
+ }.visit(criteriaContext);
+ } else {
+ commentCriteria = null;
+ }
+
+ List<EntitySort> requestSorts = new ArrayList<>();
+ for (OrderContext order: queryContext.order()) {
+ String fieldName = getValue(order.Quoted().getText());
+ if (validate
+ && !fieldName.equals(CodeComment.FIELD_CREATE_DATE)
+ && !fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {
+ throw new OneException("Can not order by field: " + fieldName);
+ }
+
+ EntitySort commentSort = new EntitySort();
+ commentSort.setField(fieldName);
+ if (order.direction != null && order.direction.getText().equals("asc"))
+ commentSort.setDirection(Direction.ASCENDING);
+ else
+ commentSort.setDirection(Direction.DESCENDING);
+ requestSorts.add(commentSort);
+ }
+
+ return new CodeCommentQuery(commentCriteria, requestSorts);
+ } else {
+ return new CodeCommentQuery();
+ }
+ }
+
+ public static void checkField(Project project, String fieldName, int operator) {
+ if (!CodeComment.FIELD_PATHS.containsKey(fieldName))
+ throw new OneException("Field not found: " + fieldName);
+ switch (operator) {
+ case CodeCommentQueryLexer.IsBefore:
+ case CodeCommentQueryLexer.IsAfter:
+ if (!fieldName.equals(CodeComment.FIELD_CREATE_DATE)
+ && !fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {
+ throw newOperatorException(fieldName, operator);
+ }
+ break;
+ case CodeCommentQueryLexer.Contains:
+ if (!fieldName.equals(CodeComment.FIELD_CONTENT))
+ throw newOperatorException(fieldName, operator);
+ break;
+ case CodeCommentQueryLexer.Is:
+ if (!fieldName.equals(CodeComment.FIELD_COMMIT)
+ && !fieldName.equals(CodeComment.FIELD_PATH)) {
+ throw newOperatorException(fieldName, operator);
+ }
+ break;
+ }
+ }
+
+ private static OneException newOperatorException(String fieldName, int operator) {
+ return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");
+ }
+
+ public static String getRuleName(int rule) {
+ return getRuleName(CodeCommentQueryLexer.ruleNames, rule);
+ }
+
+ public static int getOperator(String operatorName) {
+ return getOperator(CodeCommentQueryLexer.ruleNames, operatorName);
+ }
+
+ @Override
+ public EntityCriteria<CodeComment> getCriteria() {
+ return criteria;
+ }
+
+ @Override
+ public List<EntitySort> getSorts() {
+ return sorts;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java
new file mode 100644
index 0000000000..dc195dc0a6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryBuildContext.java
@@ -0,0 +1,22 @@
+package io.onedev.server.entityquery.codecomment;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+
+public class CodeCommentQueryBuildContext extends QueryBuildContext<CodeComment> {
+
+ public CodeCommentQueryBuildContext(Root<CodeComment> root, CriteriaBuilder builder) {
+ super(root, builder);
+ }
+
+ @Override
+ public Join<?, ?> newJoin(String joinPath) {
+ return getRoot().join(joinPath, JoinType.LEFT);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java
new file mode 100644
index 0000000000..c3cea06db4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CommitCriteria.java
@@ -0,0 +1,42 @@
+package io.onedev.server.entityquery.codecomment;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+
+public class CommitCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public CommitCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<?> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_COMMIT));
+ return context.getBuilder().equal(attribute, value);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ return comment.getMarkPos().getCommit().equals(value);
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.quote(CodeComment.FIELD_COMMIT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java
new file mode 100644
index 0000000000..0f918c1562
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/ContentCriteria.java
@@ -0,0 +1,43 @@
+package io.onedev.server.entityquery.codecomment;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryLexer;
+
+public class ContentCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public ContentCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<String> attribute = context.getRoot().get(CodeComment.FIELD_PATHS.get(CodeComment.FIELD_CONTENT));
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ return comment.getContent().toLowerCase().contains(value.toLowerCase());
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.quote(CodeComment.FIELD_CONTENT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Contains) + " " + CodeCommentQuery.quote(value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java
new file mode 100644
index 0000000000..314f968fc0
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreateDateCriteria.java
@@ -0,0 +1,56 @@
+package io.onedev.server.entityquery.codecomment;
+
+import java.util.Date;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+
+public class CreateDateCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final Date value;
+
+ private final String rawValue;
+
+ public CreateDateCriteria(Date value, String rawValue, int operator) {
+ this.operator = operator;
+ this.value = value;
+ this.rawValue = rawValue;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<Date> attribute = context.getRoot().get(CodeComment.FIELD_PATHS.get(CodeComment.FIELD_CREATE_DATE));
+ if (operator == CodeCommentQueryLexer.IsBefore)
+ return context.getBuilder().lessThan(attribute, value);
+ else
+ return context.getBuilder().greaterThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ if (operator == CodeCommentQueryLexer.IsBefore)
+ return comment.getDate().before(value);
+ else
+ return comment.getDate().after(value);
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.quote(CodeComment.FIELD_CREATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java
new file mode 100644
index 0000000000..e78b1657b2
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByCriteria.java
@@ -0,0 +1,45 @@
+package io.onedev.server.entityquery.codecomment;
+
+import java.util.Objects;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+
+public class CreatedByCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User value;
+
+ public CreatedByCriteria(User value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<User> attribute = context.getRoot().get(CodeComment.PATH_CREATOR);
+ return context.getBuilder().equal(attribute, value);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ return Objects.equals(comment.getUser(), value);
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + CodeCommentQuery.quote(value.getName());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java
new file mode 100644
index 0000000000..b75b3e1b0a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/CreatedByMeCriteria.java
@@ -0,0 +1,39 @@
+package io.onedev.server.entityquery.codecomment;
+
+import java.util.Objects;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+
+public class CreatedByMeCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<?> attribute = context.getRoot().get(CodeComment.PATH_CREATOR);
+ return context.getBuilder().equal(attribute, SecurityUtils.getUser());
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ return Objects.equals(comment.getUser(), SecurityUtils.getUser());
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return true;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedByMe);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java
new file mode 100644
index 0000000000..3b47b97b3e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/PathCriteria.java
@@ -0,0 +1,49 @@
+package io.onedev.server.entityquery.codecomment;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.utils.stringmatch.WildcardUtils;
+
+public class PathCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public PathCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<String> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_PATH));
+ String normalized = value.toLowerCase().replace('*', '%');
+ if (normalized.endsWith("/"))
+ normalized += "%";
+ return context.getBuilder().like(context.getBuilder().lower(attribute), normalized);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ String normalized = value.toLowerCase();
+ if (normalized.endsWith("/"))
+ normalized += "*";
+ return WildcardUtils.matchString(normalized, comment.getMarkPos().getPath().toLowerCase());
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.quote(CodeComment.FIELD_COMMIT) + " " + CodeCommentQuery.getRuleName(CodeCommentQueryLexer.Is) + " " + CodeCommentQuery.quote(value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java
new file mode 100644
index 0000000000..ac8cfef152
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/entityquery/codecomment/UpdateDateCriteria.java
@@ -0,0 +1,57 @@
+package io.onedev.server.entityquery.codecomment;
+
+import java.util.Date;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+
+public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int operator;
+
+ private final Date value;
+
+ private final String rawValue;
+
+ public UpdateDateCriteria(Date value, String rawValue, int operator) {
+ this.operator = operator;
+ this.value = value;
+ this.rawValue = rawValue;
+ }
+
+ @Override
+ public Predicate getPredicate(Project project, QueryBuildContext<CodeComment> context) {
+ Path<Date> attribute = CodeCommentQuery.getPath(context.getRoot(), CodeComment.FIELD_PATHS.get(CodeComment.FIELD_UPDATE_DATE));
+ if (operator == CodeCommentQueryLexer.IsBefore)
+ return context.getBuilder().lessThan(attribute, value);
+ else
+ return context.getBuilder().greaterThan(attribute, value);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ if (operator == CodeCommentQueryLexer.IsBefore)
+ return comment.getLastActivity().getDate().before(value);
+ else
+ return comment.getLastActivity().getDate().after(value);
+ }
+
+ @Override
+ public boolean needsLogin() {
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return CodeCommentQuery.quote(Issue.FIELD_UPDATE_DATE) + " " + CodeCommentQuery.getRuleName(operator) + " " + CodeCommentQuery.quote(rawValue);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java
index a1cc809e88..a3a178900c 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/DescriptionCriteria.java
@@ -23,7 +23,7 @@ public class DescriptionCriteria extends IssueCriteria {
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
Expression<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_DESCRIPTION));
if (value != null)
- return context.getBuilder().like(attribute, "%" + value + "%");
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
else
return context.getBuilder().isNull(attribute);
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4
index 85c1aa7e3c..f4552e8c6b 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/IssueQuery.g4
@@ -1,8 +1,7 @@
grammar IssueQuery;
query
- : WS* (criteria|All) WS+ OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
- | WS* (criteria|All) WS* EOF
+ : WS* (criteria|All) WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
| WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
| WS* EOF
;
@@ -113,19 +112,15 @@ RParens
Quoted
: '"' (ESCAPE|~["\\])+? '"'
;
-
-/*
- * Use identifier to make the input "isnot" a whole token so that it becomes a "matchWith"
- * to provide suggestion for "is not"
- */
-Identifier
- : [a-zA-Z]+
- ;
WS
: ' '
;
+Identifier
+ : [a-zA-Z0-9:_/\\+-;]+
+ ;
+
fragment
ESCAPE
: '\\'["\\]
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java
index f5ab23c5b0..d90b44d399 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/StringFieldCriteria.java
@@ -1,6 +1,5 @@
package io.onedev.server.entityquery.issue;
-import java.util.Objects;
import java.util.Set;
import javax.persistence.criteria.Path;
@@ -10,7 +9,6 @@ import io.onedev.server.entityquery.QueryBuildContext;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
-import io.onedev.server.entityquery.issue.IssueQueryLexer;
public class StringFieldCriteria extends FieldCriteria {
@@ -34,16 +32,16 @@ public class StringFieldCriteria extends FieldCriteria {
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);
if (operator == IssueQueryLexer.Is)
- return context.getBuilder().equal(attribute, value);
+ return context.getBuilder().equal(context.getBuilder().lower(attribute), value.toLowerCase());
else
- return context.getBuilder().like(attribute, "%" + value + "%");
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
public boolean matches(Issue issue) {
String fieldValue = (String) issue.getFieldValue(getFieldName());
if (operator == IssueQueryLexer.Is)
- return Objects.equals(fieldValue, value);
+ return value.equalsIgnoreCase(fieldValue);
else
return fieldValue != null && fieldValue.toLowerCase().contains(value.toLowerCase());
}
@@ -60,7 +58,8 @@ public class StringFieldCriteria extends FieldCriteria {
@Override
public void fill(Issue issue, Set<String> initedLists) {
- issue.setFieldValue(getFieldName(), value);
+ if (operator == IssueQueryLexer.Is)
+ issue.setFieldValue(getFieldName(), value);
}
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java
index e632c3137b..72dc899495 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/SubmitDateCriteria.java
@@ -28,11 +28,11 @@ public class SubmitDateCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- Path<Long> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMIT_DATE));
+ Path<Date> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMIT_DATE));
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value.getTime());
+ return context.getBuilder().lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value.getTime());
+ return context.getBuilder().greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java
index 8d9f0c0dfc..8e440a9c14 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/TitleCriteria.java
@@ -21,12 +21,12 @@ public class TitleCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
Path<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_TITLE));
- return context.getBuilder().like(attribute, "%" + value + "%");
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
public boolean matches(Issue issue) {
- return issue.getTitle().toLowerCase().contains(value);
+ return issue.getTitle().toLowerCase().contains(value.toLowerCase());
}
@Override
@@ -36,7 +36,7 @@ public class TitleCriteria extends IssueCriteria {
@Override
public String toString() {
- return IssueQuery.quote(Issue.FIELD_TITLE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);
+ return IssueQuery.quote(Issue.FIELD_TITLE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);
}
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java
index 1d3cf9708f..0bc1609d2f 100644
--- a/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/issue/UpdateDateCriteria.java
@@ -28,11 +28,11 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {
- Path<Long> attribute = IssueQuery.getPath(context.getRoot(), Issue.FIELD_PATHS.get(Issue.FIELD_UPDATE_DATE));
+ Path<Date> attribute = IssueQuery.getPath(context.getRoot(), Issue.FIELD_PATHS.get(Issue.FIELD_UPDATE_DATE));
if (operator == IssueQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value.getTime());
+ return context.getBuilder().lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value.getTime());
+ return context.getBuilder().greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java
index 97472490a7..078df1ff20 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/CloseDateCriteria.java
@@ -28,11 +28,11 @@ public class CloseDateCriteria extends PullRequestCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- Path<Long> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_CLOSE_DATE));
+ Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_CLOSE_DATE));
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value.getTime());
+ return context.getBuilder().lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value.getTime());
+ return context.getBuilder().greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java
index 61fe01c44e..921e5c64dc 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/DescriptionCriteria.java
@@ -21,12 +21,12 @@ public class DescriptionCriteria extends PullRequestCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_DESCRIPTION));
- return context.getBuilder().like(attribute, "%" + value + "%");
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
public boolean matches(PullRequest request) {
- return request.getDescription().toLowerCase().contains(value);
+ return request.getDescription()!=null && request.getDescription().toLowerCase().contains(value.toLowerCase());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java
index 28b967e7a6..a035fdda5d 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestCriteria.java
@@ -1,9 +1,5 @@
package io.onedev.server.entityquery.pullrequest;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
import io.onedev.server.entityquery.EntityCriteria;
import io.onedev.server.model.PullRequest;
@@ -11,14 +7,4 @@ public abstract class PullRequestCriteria extends EntityCriteria<PullRequest> {
private static final long serialVersionUID = 1L;
- @Nullable
- public static PullRequestCriteria of(List<PullRequestCriteria> criterias) {
- if (criterias.size() > 1)
- return new AndCriteria(criterias);
- else if (criterias.size() == 1)
- return criterias.iterator().next();
- else
- return null;
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4 b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4
index 5e4fbadca8..b55d21adad 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.g4
@@ -1,8 +1,7 @@
grammar PullRequestQuery;
query
- : WS* (criteria|All) WS+ OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
- | WS* (criteria|All) WS* EOF
+ : WS* (criteria|All) WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
| WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
| WS* EOF
;
@@ -161,17 +160,13 @@ Quoted
: '"' (ESCAPE|~["\\])+? '"'
;
-/*
- * Use identifier to make the input "isnot" a whole token so that it becomes a "matchWith"
- * to provide suggestion for "is not"
- */
-Identifier
- : [a-zA-Z]+
- ;
-
WS
: ' '
;
+
+Identifier
+ : [a-zA-Z0-9:_/\\+-;]+
+ ;
fragment
ESCAPE
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java
index 4ec5b328a6..8f0a4b6801 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/PullRequestQuery.java
@@ -20,16 +20,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.entityquery.EntityQuery;
import io.onedev.server.entityquery.EntitySort;
import io.onedev.server.entityquery.EntitySort.Direction;
-import io.onedev.server.exception.OneException;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.manager.UserManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryBaseVisitor;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.AndCriteriaContext;
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.CriteriaContext;
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;
@@ -40,6 +30,13 @@ import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrCriteri
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.OrderContext;
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.ParensCriteriaContext;
import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser.QueryContext;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.util.DateUtils;
public class PullRequestQuery extends EntityQuery<PullRequest> {
@@ -268,13 +265,13 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
throw new OneException("Can not order by field: " + fieldName);
}
- EntitySort pullRequestSort = new EntitySort();
- pullRequestSort.setField(fieldName);
+ EntitySort requestSort = new EntitySort();
+ requestSort.setField(fieldName);
if (order.direction != null && order.direction.getText().equals("asc"))
- pullRequestSort.setDirection(Direction.ASCENDING);
+ requestSort.setDirection(Direction.ASCENDING);
else
- pullRequestSort.setDirection(Direction.DESCENDING);
- requestSorts.add(pullRequestSort);
+ requestSort.setDirection(Direction.DESCENDING);
+ requestSorts.add(requestSort);
}
return new PullRequestQuery(requestCriteria, requestSorts);
@@ -328,18 +325,6 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
return getOperator(PullRequestQueryLexer.ruleNames, operatorName);
}
- public static PullRequestQuery merge(PullRequestQuery query1, PullRequestQuery query2) {
- List<PullRequestCriteria> criterias = new ArrayList<>();
- if (query1.getCriteria() != null)
- criterias.add(query1.getCriteria());
- if (query2.getCriteria() != null)
- criterias.add(query2.getCriteria());
- List<EntitySort> sorts = new ArrayList<>();
- sorts.addAll(query1.getSorts());
- sorts.addAll(query2.getSorts());
- return new PullRequestQuery(PullRequestCriteria.of(criterias), sorts);
- }
-
@Override
public PullRequestCriteria getCriteria() {
return criteria;
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java
index 29369dfe98..b7dcb861cf 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/SubmitDateCriteria.java
@@ -28,11 +28,11 @@ public class SubmitDateCriteria extends PullRequestCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- Path<Long> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMIT_DATE));
+ Path<Date> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMIT_DATE));
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value.getTime());
+ return context.getBuilder().lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value.getTime());
+ return context.getBuilder().greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java
index e1e35c906a..0e41a99da5 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/TitleCriteria.java
@@ -21,12 +21,12 @@ public class TitleCriteria extends PullRequestCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_TITLE));
- return context.getBuilder().like(attribute, "%" + value + "%");
+ return context.getBuilder().like(context.getBuilder().lower(attribute), "%" + value.toLowerCase() + "%");
}
@Override
public boolean matches(PullRequest request) {
- return request.getTitle().toLowerCase().contains(value);
+ return request.getTitle().toLowerCase().contains(value.toLowerCase());
}
@Override
diff --git a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java
index 9f6d2ae3fd..df6e9dfbbc 100644
--- a/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java
+++ b/core/src/main/java/io/onedev/server/entityquery/pullrequest/UpdateDateCriteria.java
@@ -28,11 +28,11 @@ public class UpdateDateCriteria extends PullRequestCriteria {
@Override
public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {
- Path<Long> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_UPDATE_DATE));
+ Path<Date> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_UPDATE_DATE));
if (operator == PullRequestQueryLexer.IsBefore)
- return context.getBuilder().lessThan(attribute, value.getTime());
+ return context.getBuilder().lessThan(attribute, value);
else
- return context.getBuilder().greaterThan(attribute, value.getTime());
+ return context.getBuilder().greaterThan(attribute, value);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
index bf19cd9e1a..c6b5f1b5a2 100644
--- a/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java
@@ -8,6 +8,8 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.server.entityquery.EntityCriteria;
+import io.onedev.server.entityquery.EntityQuery;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -28,5 +30,10 @@ public interface CodeCommentManager extends EntityManager<CodeComment> {
List<CodeComment> findAllAfter(Project project, @Nullable String commentUUID, int count);
void save(CodeComment comment, @Nullable PullRequest request);
+
+ List<CodeComment> query(Project project, @Nullable PullRequest request,
+ EntityQuery<CodeComment> commentQuery, int firstResult, int maxResults);
+
+ int count(Project project, @Nullable PullRequest request, EntityCriteria<CodeComment> commentCriteria);
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
index c35e87b037..0f644449c5 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java
@@ -14,6 +14,13 @@ import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
import org.apache.commons.lang3.time.DateUtils;
import org.eclipse.jgit.errors.MissingObjectException;
@@ -21,20 +28,31 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
+import org.hibernate.Session;
import org.hibernate.criterion.Criterion;
import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+import io.onedev.launcher.loader.Listen;
import io.onedev.launcher.loader.ListenerRegistry;
+import io.onedev.server.entityquery.EntityQuery;
+import io.onedev.server.entityquery.EntitySort;
+import io.onedev.server.entityquery.EntitySort.Direction;
+import io.onedev.server.entityquery.QueryBuildContext;
+import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryBuildContext;
import io.onedev.server.event.codecomment.CodeCommentAdded;
+import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.command.RevListCommand;
import io.onedev.server.manager.CodeCommentManager;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.TextRange;
@@ -84,6 +102,12 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
return find(criteria);
}
+ @Transactional
+ @Listen
+ public void on(CodeCommentEvent event) {
+ event.getComment().setLastActivity(event);
+ }
+
@Sessional
@Override
public List<CodeComment> findAllAfter(Project project, String commentUUID, int count) {
@@ -217,4 +241,70 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
}
+ private Predicate[] getPredicates(io.onedev.server.entityquery.EntityCriteria<CodeComment> criteria, Project project,
+ PullRequest request, QueryBuildContext<CodeComment> context) {
+ List<Predicate> predicates = new ArrayList<>();
+ if (request != null) {
+ Join<?, ?> relations = context.getRoot().join(CodeComment.PATH_RELATIONS, JoinType.INNER);
+ relations.on(context.getBuilder().equal(relations.get(CodeCommentRelation.PATH_REQUEST), request));
+ } else {
+ predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));
+ }
+ if (criteria != null)
+ predicates.add(criteria.getPredicate(project, context));
+ return predicates.toArray(new Predicate[0]);
+ }
+
+ private CriteriaQuery<CodeComment> buildCriteriaQuery(Session session, Project project, PullRequest request,
+ EntityQuery<CodeComment> requestQuery) {
+ CriteriaBuilder builder = session.getCriteriaBuilder();
+ CriteriaQuery<CodeComment> query = builder.createQuery(CodeComment.class);
+ Root<CodeComment> root = query.from(CodeComment.class);
+ query.select(root).distinct(true);
+
+ QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
+ query.where(getPredicates(requestQuery.getCriteria(), project, request, context));
+
+ List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ for (EntitySort sort: requestQuery.getSorts()) {
+ if (sort.getDirection() == Direction.ASCENDING)
+ orders.add(builder.asc(CodeCommentQuery.getPath(root, CodeComment.FIELD_PATHS.get(sort.getField()))));
+ else
+ orders.add(builder.desc(CodeCommentQuery.getPath(root, CodeComment.FIELD_PATHS.get(sort.getField()))));
+ }
+
+ Path<String> idPath = root.get("id");
+ if (orders.isEmpty())
+ orders.add(builder.desc(idPath));
+ query.orderBy(orders);
+
+ return query;
+ }
+
+ @Sessional
+ @Override
+ public List<CodeComment> query(Project project, PullRequest request, EntityQuery<CodeComment> commentQuery,
+ int firstResult, int maxResults) {
+ CriteriaQuery<CodeComment> criteriaQuery = buildCriteriaQuery(getSession(), project, request, commentQuery);
+ Query<CodeComment> query = getSession().createQuery(criteriaQuery);
+ query.setFirstResult(firstResult);
+ query.setMaxResults(maxResults);
+ return query.getResultList();
+ }
+
+ @Sessional
+ @Override
+ public int count(Project project, PullRequest request,
+ io.onedev.server.entityquery.EntityCriteria<CodeComment> commentCriteria) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
+ Root<CodeComment> root = criteriaQuery.from(CodeComment.class);
+
+ QueryBuildContext<CodeComment> context = new CodeCommentQueryBuildContext(root, builder);
+ criteriaQuery.where(getPredicates(commentCriteria, project, request, context));
+
+ criteriaQuery.select(builder.countDistinct(root));
+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
index cd1587c7c5..ab21ddff73 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java
@@ -38,7 +38,6 @@ public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCo
if (isNew) {
CodeCommentReplied event = new CodeCommentReplied(reply, request);
reply.getComment().setCompareContext(compareContext);
- reply.getComment().setLastActivity(event);
listenerRegistry.post(event);
codeCommentManager.save(reply.getComment());
}
diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.java
index 9155a0c953..bab4f39693 100644
--- a/core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@@ -60,6 +61,30 @@ public class CodeComment extends AbstractEntity {
private static final long serialVersionUID = 1L;
+ public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();
+
+ public static final String FIELD_CONTENT = "Content";
+
+ public static final String FIELD_PATH = "Path";
+
+ public static final String FIELD_COMMIT = "Commit";
+
+ public static final String FIELD_CREATE_DATE = "Create Date";
+
+ public static final String FIELD_UPDATE_DATE = "Update Date";
+
+ public static final String PATH_CREATOR = "user";
+
+ public static final String PATH_RELATIONS = "relations";
+
+ static {
+ FIELD_PATHS.put(FIELD_CONTENT, "content");
+ FIELD_PATHS.put(FIELD_PATH, "markPos.path");
+ FIELD_PATHS.put(FIELD_COMMIT, "markPos.commit");
+ FIELD_PATHS.put(FIELD_CREATE_DATE, "date");
+ FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");
+ }
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private Project project;
diff --git a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
index 4b65e6a5a3..7f0247e108 100644
--- a/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
+++ b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java
@@ -17,6 +17,8 @@ public class CodeCommentRelation extends AbstractEntity {
private static final long serialVersionUID = 1L;
+ public static final String PATH_REQUEST = "request";
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private PullRequest request;
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 44c0a76fd9..20609f842a 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -127,7 +127,7 @@ public class Issue extends AbstractEntity implements Referenceable {
private String submitterName;
@Column(nullable=false)
- private long submitDate;
+ private Date submitDate;
private int voteCount;
@@ -241,11 +241,11 @@ public class Issue extends AbstractEntity implements Referenceable {
}
public Date getSubmitDate() {
- return new Date(submitDate);
+ return submitDate;
}
public void setSubmitDate(Date submitDate) {
- this.submitDate = submitDate.getTime();
+ this.submitDate = submitDate;
}
public Milestone getMilestone() {
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index 0f06d10295..0eb1e488ec 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -230,7 +230,6 @@ public class Project extends AbstractEntity {
issueListFields.add("Priority");
issueListFields.add(Issue.FIELD_SUBMITTER);
issueListFields.add("Assignee");
- issueListFields.add(Issue.FIELD_VOTE_COUNT);
savedIssueQueries.add(new NamedIssueQuery("Open", "open"));
savedIssueQueries.add(new NamedIssueQuery("My open", "open and mine"));
@@ -243,8 +242,8 @@ public class Project extends AbstractEntity {
savedIssueQueries.add(new NamedIssueQuery("All", "all"));
savedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));
- savedPullRequestQueries.add(new NamedPullRequestQuery("Need to be reviewed by me", "to be reviewed by me"));
- savedPullRequestQueries.add(new NamedPullRequestQuery("Need to be changed by me", "submitted by me and someone requested for changes"));
+ savedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));
+ savedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));
savedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));
savedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));
savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));
diff --git a/core/src/main/java/io/onedev/server/model/support/LastActivity.java b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
index 28618c3fbe..74b8a5c2cf 100644
--- a/core/src/main/java/io/onedev/server/model/support/LastActivity.java
+++ b/core/src/main/java/io/onedev/server/model/support/LastActivity.java
@@ -21,7 +21,7 @@ public class LastActivity implements Serializable {
private String description;
@Column(name="LAST_ACT_DATE")
- private long date;
+ private Date date;
public String getDescription() {
return description;
@@ -32,11 +32,11 @@ public class LastActivity implements Serializable {
}
public Date getDate() {
- return new Date(date);
+ return date;
}
public void setDate(Date date) {
- this.date = date.getTime();
+ this.date = date;
}
@Nullable
diff --git a/core/src/main/java/io/onedev/server/util/DateUtils.java b/core/src/main/java/io/onedev/server/util/DateUtils.java
index f0c17776c3..6c8f132059 100644
--- a/core/src/main/java/io/onedev/server/util/DateUtils.java
+++ b/core/src/main/java/io/onedev/server/util/DateUtils.java
@@ -17,8 +17,8 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
private static final PrettyTime PRETTY_TIME = new PrettyTime();
public static final List<String> RELAX_DATE_EXAMPLES = Lists.newArrayList(
- "one hour ago", "2 hours ago", "3PM", "noon", "today", "yesterday",
- "yesterday midnight", "3 days ago", "last week", "last Monday",
+ "2:30pm", "4-23", "2018-2-3", "one hour ago", "2 hours ago", "3PM", "noon", "today",
+ "yesterday", "yesterday midnight", "3 days ago", "last week", "last Monday",
"4 weeks ago", "1 month 2 days ago", "1 year ago");
public static String formatAge(Date date) {
diff --git a/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java
index 1bf530ac2b..11077f4320 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java
@@ -6,17 +6,16 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import com.google.common.collect.Lists;
+
import io.onedev.codeassist.InputCompletion;
import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.Substitution;
import io.onedev.server.model.Project;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.utils.Range;
-import com.google.common.collect.Lists;
-
@SuppressWarnings("serial")
public class BranchPatternAssistBehavior extends InputAssistBehavior {
@@ -40,8 +39,7 @@ public class BranchPatternAssistBehavior extends InputAssistBehavior {
int caret = suggestion.getCaret();
if (caret == -1)
caret = suggestion.getContent().length();
- Substitution substitution = new Substitution(0, inputStatus.getContent().length(), suggestion.getContent());
- completions.add(new InputCompletion(substitution, caret, null, suggestion.getMatch()));
+ completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
}
return completions;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
new file mode 100644
index 0000000000..dea9a989b3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -0,0 +1,151 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
+import io.onedev.codeassist.FenceAware;
+import io.onedev.codeassist.InputSuggestion;
+import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.codeassist.parser.Element;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
+import io.onedev.server.OneDev;
+import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
+import io.onedev.server.entityquery.codecomment.CodeCommentQueryParser;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+import io.onedev.utils.Range;
+
+@SuppressWarnings("serial")
+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;
+ }
+
+ @Override
+ public void detach(Component component) {
+ super.detach(component);
+ projectModel.detach();
+ }
+
+ private Project getProject() {
+ return projectModel.getObject();
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+
+ private List<InputSuggestion> getUserSuggestions(String matchWith) {
+ List<InputSuggestion> suggestions = new ArrayList<>();
+ for (User user: OneDev.getInstance(UserManager.class).findAll()) {
+ Range match = Range.match(user.getName(), matchWith, true, false, true);
+ if (match != null) {
+ String description;
+ if (!user.getDisplayName().equals(user.getName()))
+ description = user.getDisplayName();
+ else
+ description = null;
+ suggestions.add(new InputSuggestion(user.getName(), description, match).escape(ESCAPE_CHARS));
+ }
+ }
+ return suggestions;
+ }
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith) {
+ String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ List<InputSuggestion> suggestions = new ArrayList<>();
+ Project project = getProject();
+
+ if ("criteriaField".equals(spec.getLabel())) {
+ List<String> candidates = new ArrayList<>(CodeComment.FIELD_PATHS.keySet());
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ } else if ("orderField".equals(spec.getLabel())) {
+ List<String> candidates = Lists.newArrayList(CodeComment.FIELD_CREATE_DATE,
+ CodeComment.FIELD_UPDATE_DATE);
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ } else if ("criteriaValue".equals(spec.getLabel())) {
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ if (fieldElements.isEmpty()) {
+ suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));
+ } else {
+ String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
+ Preconditions.checkState(operatorElements.size() == 1);
+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
+ int operator = CodeCommentQuery.getOperator(operatorName);
+ try {
+ CodeCommentQuery.checkField(project, fieldName, operator);
+ if (fieldName.equals(CodeComment.FIELD_CREATE_DATE) || fieldName.equals(CodeComment.FIELD_UPDATE_DATE)) {
+ suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
+ } else if (fieldName.equals(CodeComment.FIELD_PATH)) {
+ suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ } else {
+ return null;
+ }
+ } catch (OneException ex) {
+ }
+ }
+ }
+ return suggestions;
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "quote as literal value";
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ parseExpect = parseExpect.findExpectByLabel("operator");
+ if (parseExpect != null) {
+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = CodeCommentQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ try {
+ CodeCommentQuery.checkField(getProject(), fieldName, CodeCommentQuery.getOperator(suggestedLiteral));
+ } catch (OneException e) {
+ return null;
+ }
+ }
+ }
+ return super.describe(parseExpect, suggestedLiteral);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 6c24965d5e..9421072671 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -15,14 +15,13 @@ import com.google.common.collect.Lists;
import io.onedev.codeassist.FenceAware;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.ParentedElement;
-import io.onedev.codeassist.grammar.ElementSpec;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.grammar.LiteralElementSpec;
-import io.onedev.codeassist.grammar.RuleRefElementSpec;
import io.onedev.codeassist.parser.Element;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.server.OneDev;
import io.onedev.server.entityquery.issue.IssueQuery;
+import io.onedev.server.entityquery.issue.IssueQueryParser;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.IssueManager;
@@ -30,9 +29,7 @@ import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.entityquery.issue.IssueQueryParser;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.Constants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
@@ -58,11 +55,13 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
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) {
- super(IssueQueryParser.class, "query");
+ super(IssueQueryParser.class, "query", false);
this.projectModel = projectModel;
}
@@ -77,17 +76,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
}
@Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
- @Override
- protected List<InputSuggestion> suggest(ParentedElement expectedElement, String matchWith) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
@@ -118,7 +109,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.remove(Issue.FIELD_SUBMITTER);
for (InputSpec field: project.getIssueWorkflow().getFieldSpecs())
candidates.add(field.getName());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = Lists.newArrayList(Issue.FIELD_VOTE_COUNT, Issue.FIELD_COMMENT_COUNT, Issue.FIELD_NUMBER,
Issue.FIELD_SUBMIT_DATE, Issue.FIELD_UPDATE_DATE);
@@ -126,14 +117,14 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)
candidates.add(field.getName());
}
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if ("criteriaValue".equals(spec.getLabel())) {
- List<Element> fieldElements = expectedElement.getParent().findChildrenByLabel("criteriaField", true);
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
if (fieldElements.isEmpty()) {
suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));
} else {
String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());
- List<Element> operatorElements = expectedElement.getParent().findChildrenByLabel("operator", true);
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
Preconditions.checkState(operatorElements.size() == 1);
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
@@ -142,11 +133,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
if (fieldSpec instanceof DateInput || fieldName.equals(Issue.FIELD_SUBMIT_DATE)
|| fieldName.equals(Issue.FIELD_UPDATE_DATE)) {
- List<String> candidates = new ArrayList<>(DateUtils.RELAX_DATE_EXAMPLES);
- candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
- candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));
+ suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldSpec instanceof UserChoiceInput) {
suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));
} else if (fieldSpec instanceof IssueChoiceInput) {
@@ -159,21 +147,21 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));
} else if (fieldSpec instanceof GroupChoiceInput) {
List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(Issue.FIELD_STATE)) {
List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldSpec instanceof ChoiceInput) {
OneContext.push(newOneContext());
try {
List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} finally {
OneContext.pop();
}
} else if (fieldName.equals(Issue.FIELD_MILESTONE)) {
List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(Issue.FIELD_TITLE) || fieldName.equals(Issue.FIELD_DESCRIPTION)
|| fieldName.equals(Issue.FIELD_VOTE_COUNT) || fieldName.equals(Issue.FIELD_COMMENT_COUNT)
|| fieldName.equals(Issue.FIELD_NUMBER) || fieldSpec instanceof NumberInput
@@ -220,24 +208,14 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
return "quote as literal value";
}
- }.suggest(expectedElement.getSpec(), matchWith);
+ }.suggest(terminalExpect);
}
}
return null;
}
@Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- List<String> hints = super.getHints(expectedElement, matchWith);
- if (expectedElement.getSpec() instanceof LiteralElementSpec
- || expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- hints.add("Input text without space to match options");
- }
- return hints;
- }
-
- @Override
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
if (suggestedLiteral.equals("mine")) {
if (SecurityUtils.getUser() != null)
return Optional.of("issues relevant to me");
@@ -253,24 +231,19 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
else if (suggestedLiteral.equals("closed"))
return Optional.of("issues with state in closed category");
- if (expectedElement.getParent() != null
- && expectedElement.getParent().getParent() != null
- && expectedElement.getParent().getParent().getSpec() instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleRefElementSpec = (RuleRefElementSpec) expectedElement.getParent().getParent().getSpec();
- if (ruleRefElementSpec.getRuleName().equals("criteria")) {
- List<Element> fieldElements = expectedElement.getParent().getParent()
- .findChildrenByLabel("criteriaField", false);
- if (!fieldElements.isEmpty()) {
- String fieldName = IssueQuery.getValue(fieldElements.iterator().next().getMatchedText());
- try {
- IssueQuery.checkField(getProject(), fieldName, IssueQuery.getOperator(suggestedLiteral));
- } catch (OneException e) {
- return null;
- }
+ parseExpect = parseExpect.findExpectByLabel("operator");
+ if (parseExpect != null) {
+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = IssueQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ try {
+ IssueQuery.checkField(getProject(), fieldName, IssueQuery.getOperator(suggestedLiteral));
+ } catch (OneException e) {
+ return null;
}
}
- }
- return super.describe(expectedElement, suggestedLiteral);
+ }
+ return super.describe(parseExpect, suggestedLiteral);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java
index d3b8f2e6a5..1adf9e669c 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java
@@ -6,17 +6,16 @@ import java.util.List;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
+import com.google.common.collect.Lists;
+
import io.onedev.codeassist.InputCompletion;
import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.Substitution;
import io.onedev.server.model.Project;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.utils.Range;
-import com.google.common.collect.Lists;
-
@SuppressWarnings("serial")
public class PathPatternAssistBehavior extends InputAssistBehavior {
@@ -40,8 +39,7 @@ public class PathPatternAssistBehavior extends InputAssistBehavior {
int caret = suggestion.getCaret();
if (caret == -1)
caret = suggestion.getContent().length();
- Substitution substitution = new Substitution(0, inputStatus.getContent().length(), suggestion.getContent());
- completions.add(new InputCompletion(substitution, caret, null, suggestion.getMatch()));
+ completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
}
return completions;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index cc020f709a..afde96139b 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -14,14 +14,14 @@ import com.google.common.collect.Lists;
import io.onedev.codeassist.FenceAware;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.ParentedElement;
-import io.onedev.codeassist.grammar.ElementSpec;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
-import io.onedev.codeassist.grammar.LiteralElementSpec;
-import io.onedev.codeassist.grammar.RuleRefElementSpec;
import io.onedev.codeassist.parser.Element;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.server.OneDev;
import io.onedev.server.entityquery.pullrequest.PullRequestQuery;
+import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;
import io.onedev.server.exception.OneException;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
@@ -31,9 +31,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryLexer;
-import io.onedev.server.entityquery.pullrequest.PullRequestQueryParser;
-import io.onedev.server.util.Constants;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.utils.Range;
@@ -47,8 +44,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
private static final String VALUE_CLOSE = "\"";
+ private static final String ESCAPE_CHARS = "\"\\";
+
public PullRequestQueryBehavior(IModel<Project> projectModel) {
- super(PullRequestQueryParser.class, "query");
+ super(PullRequestQueryParser.class, "query", false);
this.projectModel = projectModel;
}
@@ -63,17 +62,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
}
@Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
- @Override
- protected List<InputSuggestion> suggest(ParentedElement expectedElement, String matchWith) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
@@ -87,7 +78,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
description = user.getDisplayName();
else
description = null;
- suggestions.add(new InputSuggestion(user.getName(), description, match).escape("\"\\"));
+ suggestions.add(new InputSuggestion(user.getName(), description, match).escape(ESCAPE_CHARS));
}
}
return suggestions;
@@ -102,14 +93,14 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(PullRequest.FIELD_PATHS.keySet());
candidates.remove(PullRequest.FIELD_SUBMITTER);
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = Lists.newArrayList(PullRequest.FIELD_NUMBER,
PullRequest.FIELD_SUBMIT_DATE, PullRequest.FIELD_UPDATE_DATE, PullRequest.FIELD_CLOSE_DATE);
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if ("criteriaValue".equals(spec.getLabel())) {
- List<Element> fieldElements = expectedElement.getParent().findChildrenByLabel("criteriaField", true);
- List<Element> operatorElements = expectedElement.getParent().findChildrenByLabel("operator", true);
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
Preconditions.checkState(operatorElements.size() == 1);
String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
int operator = PullRequestQuery.getOperator(operatorName);
@@ -125,26 +116,23 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
PullRequestQuery.checkField(project, fieldName, operator);
if (fieldName.equals(PullRequest.FIELD_SUBMIT_DATE) || fieldName.equals(PullRequest.FIELD_UPDATE_DATE)
|| fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {
- List<String> candidates = new ArrayList<>(DateUtils.RELAX_DATE_EXAMPLES);
- candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
- candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));
+ suggestions.addAll(getSuggestions(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
} else if (fieldName.equals(PullRequest.FIELD_STATE)) {
List<String> candidates = Lists.newArrayList(PullRequest.STATE_OPEN);
for (CloseInfo.Status status: CloseInfo.Status.values())
candidates.add(status.toString());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)) {
List<String> candidates = new ArrayList<>();
for (Project each: OneDev.getInstance(ProjectManager.class).findAll())
candidates.add(each.getName());
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(PullRequest.FIELD_TARGET_BRANCH) || fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {
List<String> candidates = new ArrayList<>();
for (RefInfo refInfo: project.getBranches())
candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));
- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));
+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(PullRequest.FIELD_TITLE) || fieldName.equals(PullRequest.FIELD_DESCRIPTION)
|| fieldName.equals(PullRequest.FIELD_NUMBER)) {
return null;
@@ -161,42 +149,27 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
return "quote as literal value";
}
- }.suggest(expectedElement.getSpec(), matchWith);
+ }.suggest(terminalExpect);
}
}
return null;
}
@Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- List<String> hints = super.getHints(expectedElement, matchWith);
- if (expectedElement.getSpec() instanceof LiteralElementSpec
- || expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- hints.add("Input text without space to match options");
- }
- return hints;
- }
-
- @Override
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
- if (expectedElement.getParent() != null
- && expectedElement.getParent().getParent() != null
- && expectedElement.getParent().getParent().getSpec() instanceof RuleRefElementSpec) {
- RuleRefElementSpec ruleRefElementSpec = (RuleRefElementSpec) expectedElement.getParent().getParent().getSpec();
- if (ruleRefElementSpec.getRuleName().equals("criteria")) {
- List<Element> fieldElements = expectedElement.getParent().getParent()
- .findChildrenByLabel("criteriaField", false);
- if (!fieldElements.isEmpty()) {
- String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());
- try {
- PullRequestQuery.checkField(getProject(), fieldName, PullRequestQuery.getOperator(suggestedLiteral));
- } catch (OneException e) {
- return null;
- }
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ parseExpect = parseExpect.findExpectByLabel("operator");
+ if (parseExpect != null) {
+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ try {
+ PullRequestQuery.checkField(getProject(), fieldName, PullRequestQuery.getOperator(suggestedLiteral));
+ } catch (OneException e) {
+ return null;
}
}
- }
- return super.describe(expectedElement, suggestedLiteral);
+ }
+ return super.describe(parseExpect, suggestedLiteral);
}
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java
index c9c1a5c860..d66b230e78 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java
@@ -11,7 +11,6 @@ import com.google.common.collect.Lists;
import io.onedev.codeassist.InputCompletion;
import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.Substitution;
import io.onedev.server.model.Project;
import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
@@ -40,8 +39,7 @@ public class TagPatternAssistBehavior extends InputAssistBehavior {
int caret = suggestion.getCaret();
if (caret == -1)
caret = suggestion.getContent().length();
- Substitution substitution = new Substitution(0, inputStatus.getContent().length(), suggestion.getContent());
- completions.add(new InputCompletion(substitution, caret, null, suggestion.getMatch()));
+ completions.add(new InputCompletion(suggestion.getContent(), suggestion.getContent(), caret, null, suggestion.getMatch()));
}
return completions;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
index e208fcb87c..dac3f2bf7e 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java
@@ -27,8 +27,8 @@ import io.onedev.codeassist.CodeAssist;
import io.onedev.codeassist.InputCompletion;
import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.ParentedElement;
-import io.onedev.codeassist.grammar.ElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.utils.Range;
import io.onedev.utils.StringUtils;
@@ -49,44 +49,39 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
protected final String ruleName;
- public ANTLRAssistBehavior(Class<? extends Parser> parserClass, String ruleName) {
- this(parserClass, AntlrUtils.getLexerClass(parserClass), ruleName);
+ public ANTLRAssistBehavior(Class<? extends Parser> parserClass, String ruleName, boolean findAllPaths) {
+ this(parserClass, AntlrUtils.getLexerClass(parserClass), ruleName, findAllPaths);
}
public ANTLRAssistBehavior(Class<? extends Parser> parserClass,
- Class<? extends Lexer> lexerClass, String ruleName) {
+ Class<? extends Lexer> lexerClass, String ruleName, boolean findAllPaths) {
this(parserClass, lexerClass,
new String[]{AntlrUtils.getDefaultGrammarFile(lexerClass)},
- AntlrUtils.getDefaultTokenFile(lexerClass), ruleName);
+ AntlrUtils.getDefaultTokenFile(lexerClass), ruleName, findAllPaths);
}
public ANTLRAssistBehavior(Class<? extends Parser> parserClass, Class<? extends Lexer> lexerClass,
- String grammarFiles[], String tokenFile, String ruleName) {
+ String grammarFiles[], String tokenFile, String ruleName, boolean findAllPaths) {
this.lexerClass = lexerClass;
this.parserClass = parserClass;
- codeAssist = new CodeAssist(lexerClass, grammarFiles, tokenFile) {
+ codeAssist = new CodeAssist(lexerClass, grammarFiles, tokenFile, findAllPaths) {
@Override
- protected List<InputSuggestion> suggest(ParentedElement element, String matchWith) {
- return ANTLRAssistBehavior.this.suggest(element, matchWith);
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ return ANTLRAssistBehavior.this.suggest(terminalExpect);
}
@Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- return ANTLRAssistBehavior.this.getHints(expectedElement, matchWith);
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ return ANTLRAssistBehavior.this.getHints(terminalExpect);
}
@Override
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
- return ANTLRAssistBehavior.this.describe(expectedElement, suggestedLiteral);
+ protected Optional<String> describe(TerminalExpect terminalExpect, String suggestedLiteral) {
+ return ANTLRAssistBehavior.this.describe(terminalExpect, suggestedLiteral);
}
- @Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- return ANTLRAssistBehavior.this.getEndOfMatch(spec, content);
- }
-
};
this.ruleName = ruleName;
}
@@ -99,17 +94,6 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
return codeAssist.suggest(inputStatus, ruleName);
}
- protected int getEndOfMatch(ElementSpec spec, String content) {
- int endOfMatch = 0;
- List<Token> tokens = codeAssist.getGrammar().lex(content);
- if (!tokens.isEmpty() && tokens.get(0).getStartIndex() == 0) {
- endOfMatch = spec.getEndOfMatch(tokens);
- if (endOfMatch > 0) // there exist an element match
- endOfMatch = tokens.get(endOfMatch-1).getStopIndex()+1; // convert to char index
- }
- return endOfMatch;
- }
-
private Constructor<? extends Lexer> getLexerCtor() {
if (lexerCtor == null) {
try {
@@ -218,14 +202,14 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
}
}
- protected abstract List<InputSuggestion> suggest(ParentedElement element, String matchWith);
+ protected abstract List<InputSuggestion> suggest(TerminalExpect terminalExpect);
@Override
protected final List<String> getHints(InputStatus inputStatus) {
return codeAssist.getHints(inputStatus, ruleName);
}
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ protected List<String> getHints(TerminalExpect terminalExpect) {
return new ArrayList<>();
}
@@ -240,7 +224,7 @@ public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
* an optional containing description of the literal, or <tt>null</tt> to suppress the suggestion
*/
@Nullable
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
if (StringUtils.isNotBlank(suggestedLiteral))
return Optional.absent();
else
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
index e411e8e0be..3f864a99bc 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html
@@ -15,7 +15,8 @@
</div>
<ul class="help list-unstyled">
<li wicket:id="hints"></li>
- <li class="completion"></li>
+ <li class="complete"></li>
+ <li class="esc">Press 'esc' to hide suggestions</li>
</ul>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
index 446d45273d..1a7c44c8a3 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
@@ -29,8 +29,7 @@ class AssistPanel extends Panel {
private final List<InputCompletion> suggestions;
- public AssistPanel(String id, Component input, InputStatus inputStatus,
- List<InputCompletion> suggestions, List<String> hints) {
+ public AssistPanel(String id, Component input, InputStatus inputStatus, List<InputCompletion> suggestions, List<String> hints) {
super(id);
this.input = input;
this.inputStatus = inputStatus;
@@ -93,7 +92,7 @@ class AssistPanel extends Panel {
WebMarkupContainer item = new WebMarkupContainer(itemId);
WebMarkupContainer link = new WebMarkupContainer("link");
Range match = suggestion.getMatch();
- String label = suggestion.getSubstitution().getContent();
+ String label = suggestion.getLabel();
if (match != null) {
String prefix = StringEscapeUtils.escapeHtml4(label.substring(0, match.getFrom()));
String suffix = StringEscapeUtils.escapeHtml4(label.substring(match.getTo()));
@@ -107,9 +106,11 @@ class AssistPanel extends Panel {
item.add(new Label("description", suggestion.getDescription()));
else
item.add(new Label("description"));
- String content = suggestion.complete(inputStatus).getContent();
+ String content = suggestion.getContent();
item.add(AttributeAppender.append("data-content", content));
item.add(AttributeAppender.append("data-caret", suggestion.getCaret()));
+ if (!suggestion.getContent().equals(inputStatus.getContent()))
+ item.add(AttributeAppender.append("class", "different"));
item.setOutputMarkupId(true);
return item;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
index f8316e964f..4a4dabf059 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java
@@ -133,12 +133,6 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
if (inputCaret != null) {
InputStatus inputStatus = new InputStatus(inputContent, inputCaret);
List<InputCompletion> suggestions = getSuggestions(new InputStatus(inputContent, inputCaret));
- for (Iterator<InputCompletion> it = suggestions.iterator(); it.hasNext();) {
- InputCompletion suggestion = it.next();
- if (inputStatus.getContentBeforeCaret().equals(suggestion.getSubstitution().getContent())) {
- it.remove();
- }
- }
int count = 0;
for (Iterator<InputCompletion> it = suggestions.iterator(); it.hasNext();) {
it.next();
@@ -152,8 +146,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
@Override
protected Component newContent(String id) {
- return new AssistPanel(id, getComponent(), inputStatus, suggestions,
- getHints(inputStatus));
+ return new AssistPanel(id, getComponent(), inputStatus, suggestions, getHints(inputStatus));
}
@Override
@@ -168,8 +161,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
target.appendJavaScript(script);
} else {
Component content = dropdown.getContent();
- Component newContent = new AssistPanel(content.getId(), getComponent(), inputStatus,
- suggestions, getHints(inputStatus));
+ Component newContent = new AssistPanel(content.getId(), getComponent(), inputStatus, suggestions, getHints(inputStatus));
content.replaceWith(newContent);
target.add(newContent);
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
index ce88dd1b0a..d2fd048c25 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css
@@ -37,7 +37,7 @@
border: 1px dashed #CCC;
color: #666;
}
-.input-assist .help.multiple li {
+.input-assist .help li {
list-style: disc;
margin-left: 18px;
}
diff --git a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
index b466bb5231..0fe2e73818 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
+++ b/core/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js
@@ -111,8 +111,8 @@ onedev.server.inputassist = {
var $active = $dropdown.find("tr.active");
if ($active.length != 0)
$input.data("update")($active);
- else
- $input.data("update")($dropdown.find("tr").first());
+ else if ($dropdown.find("tr.different").length != 0)
+ $input.data("update")($dropdown.find("tr.different").first());
}
return false;
} else {
@@ -191,12 +191,10 @@ onedev.server.inputassist = {
},
updateHelp: function($dropdown) {
- if ($dropdown.find(".help>li").length > 1)
- $dropdown.find(".help").addClass("multiple");
if ($dropdown.find("tr.active").length != 0) {
- $dropdown.find(".help>.completion").empty().append("Press 'enter' to complete selected item");
+ $dropdown.find(".help>.complete").empty().append("Press 'enter' to complete selected item");
} else {
- $dropdown.find(".help>.completion").empty().append("Press 'tab' to complete first item");
+ $dropdown.find(".help>.complete").empty().append("Press 'tab' to complete first item");
}
}
};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentCssResourceReference.java
new file mode 100644
index 0000000000..b68a6afdfa
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.codecomment;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class CodeCommentCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public CodeCommentCssResourceReference() {
+ super(CodeCommentCssResourceReference.class, "code-comment.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilter.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilter.java
deleted file mode 100644
index e2339ce747..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilter.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package io.onedev.server.web.component.codecomment;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.wicket.core.request.handler.IPageRequestHandler;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.hibernate.Criteria;
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.CommitInfoManager;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentRelation;
-import io.onedev.server.model.Project;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.FileChoice;
-import io.onedev.server.web.editable.annotation.UserChoice;
-import io.onedev.server.web.page.project.ProjectPage;
-
-@Editable
-public class CodeCommentFilter implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private static final String PARAM_CONTENT = "content";
-
- private static final String PARAM_USER = "user";
-
- private static final String PARAM_PATH = "path";
-
- private static final String PARAM_BEFORE = "before";
-
- private static final String PARAM_AFTER = "after";
-
- private String content;
-
- private String userName;
-
- private String path;
-
- private Date before;
-
- private Date after;
-
- @Editable(order=50, name="Content Containing")
- public String getContent() {
- return content;
- }
-
- public void setContent(String content) {
- this.content = content;
- }
-
- @Editable(order=100, name="Created by", description="Choose the user who created the comment")
- @UserChoice
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- @Editable(order=500, name="Commented path", description="Show comments on specified path")
- @FileChoice("getCommentedFiles")
- public String getPath() {
- return path;
- }
-
- public void setPath(String path) {
- this.path = path;
- }
-
- @Editable(order=600, name="After date", description="Show comments after specified date")
- public Date getAfter() {
- return after;
- }
-
- public void setAfter(Date after) {
- this.after = after;
- }
-
- @Editable(order=700, name="Before date", description="Show comments before specified date")
- public Date getBefore() {
- return before;
- }
-
- public void setBefore(Date before) {
- this.before = before;
- }
-
- public CodeCommentFilter() {
- }
-
- public CodeCommentFilter(PageParameters params) {
- content = params.get(PARAM_CONTENT).toString();
- userName = params.get(PARAM_USER).toString();
- path = params.get(PARAM_PATH).toString();
-
- String value = params.get(PARAM_BEFORE).toString();
- if (value != null)
- before = new Date(Long.valueOf(value));
-
- value = params.get(PARAM_AFTER).toString();
- if (value != null)
- after = new Date(Long.valueOf(value));
- }
-
- public void fillCriteria(EntityCriteria<CodeComment> criteria) {
- if (content != null)
- criteria.add(Restrictions.ilike("content", "%" + content + "%"));
- if (userName != null)
- criteria.createCriteria("user").add(Restrictions.eq("name", userName));
- if (path != null) {
- String pathQuery = path.replace('*', '%');
- if (pathQuery.endsWith("/"))
- pathQuery += "%";
- criteria.add(Restrictions.ilike("markPos.path", pathQuery));
- }
-
- if (before != null)
- criteria.add(Restrictions.le("date", before));
- if (after != null)
- criteria.add(Restrictions.ge("date", after));
- }
-
- public void fillRelationCriteria(EntityCriteria<CodeCommentRelation> criteria) {
- Criteria commentCriteria = criteria.createCriteria("comment");
- if (content != null)
- commentCriteria.add(Restrictions.ilike("content", "%" + content + "%"));
- if (userName != null)
- commentCriteria.createCriteria("user").add(Restrictions.eq("name", userName));
- if (path != null) {
- String pathQuery = path.replace('*', '%');
- if (pathQuery.endsWith("/"))
- pathQuery += "%";
- commentCriteria.add(Restrictions.ilike("markPos.path", pathQuery));
- }
-
- if (before != null)
- commentCriteria.add(Restrictions.le("date", before));
- if (after != null)
- commentCriteria.add(Restrictions.ge("date", after));
- }
-
- public void fillPageParams(PageParameters params) {
- if (content != null)
- params.add(PARAM_CONTENT, content);
- if (userName != null)
- params.add(PARAM_USER, userName);
- if (path != null)
- params.add(PARAM_PATH, path);
- if (before != null)
- params.add(PARAM_BEFORE, before.getTime());
- if (after != null)
- params.add(PARAM_AFTER, after.getTime());
- }
-
- @SuppressWarnings("unused")
- private static List<String> getCommentedFiles() {
- IPageRequestHandler handler = (IPageRequestHandler) RequestCycle.get().getActiveRequestHandler();
- Project project = ((ProjectPage) handler.getPage()).getProject();
- return OneDev.getInstance(CommitInfoManager.class).getFiles(project);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index 0211b485e9..14d8d7c408 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -1,41 +1,26 @@
<wicket:panel>
- <table class="code-comments">
- <tr>
- <td class="filter">
- <h4>Filter options</h4>
- <hr/>
- <div class="body">
- <div class="btn-group shortcuts">
- <a wicket:id="myComments" class="btn btn-sm btn-default">My</a>
- <a wicket:id="allComments" class="btn btn-sm btn-default">All</a>
- </div>
- <form wicket:id="filterForm">
- <div wicket:id="editor" class="no-autofocus"></div>
- <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Search</button>
- </form>
+ <div class="code-comments">
+ <div class="head">
+ <form wicket:id="query" class="clearable-wrapper">
+ <div class="input-group no-autofocus">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order comments here"></input>
+ <span class="input-group-btn">
+ <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
+ </span>
</div>
- </td>
- <td class="spacing">&nbsp;</td>
- <td class="result">
- <table wicket:id="comments"></table>
- </td>
- </tr>
- </table>
- <wicket:fragment wicket:id="commentFrag">
- <div class="title">
- <a wicket:id="avatar" class="avatar"></a>
- <a wicket:id="user" class="user"></a>
- commented on
- <a wicket:id="file" class="file"><span wicket:id="label"></span></a>
- <span wicket:id="date"></span>
- <span class="middot"></span>
- <a wicket:id="detail" class="detail">view detail</a>
+ </form>
+ <div class="others clearfix">
+ <div wicket:id="pageInfo" class="page-info pull-right"></div>
+ </div>
</div>
- <div wicket:id="content" class="content"></div>
- <div wicket:id="lastActivity" class="last-activity">
- <span wicket:id="user"></span>
- <span wicket:id="description"></span>
- <span wicket:id="date"></span>
+ <div class="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="comments" class="table"></table>
</div>
- </wicket:fragment>
+ </div>
+ <wicket:fragment wicket:id="lastActivityFrag">
+ <span wicket:id="user"></span>
+ <span wicket:id="description"></span>
+ <span wicket:id="date"></span>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 0499680edc..390b0e1678 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -1,119 +1,188 @@
package io.onedev.server.web.component.codecomment;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.ObjectId;
-import org.hibernate.FetchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
+import io.onedev.server.entityquery.codecomment.CodeCommentQuery;
import io.onedev.server.manager.CodeCommentManager;
-import io.onedev.server.manager.CodeCommentRelationManager;
import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.CodeCommentRelation;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.component.avatar.AvatarLink;
-import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
-import io.onedev.server.web.component.link.UserLink;
-import io.onedev.server.web.component.markdown.MarkdownViewer;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.behavior.CodeCommentQueryBehavior;
+import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;
+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.utils.StringUtils;
@SuppressWarnings("serial")
-public class CodeCommentListPanel extends Panel {
+public abstract class CodeCommentListPanel extends Panel {
- private final IModel<CodeCommentFilter> filterOptionModel;
+ private static final Logger logger = LoggerFactory.getLogger(RequestListPage.class);
- private final PagingHistorySupport pagingHistorySupport;
+ private static final int MAX_COMMENT_LEN = 75;
- public CodeCommentListPanel(String id, IModel<CodeCommentFilter> filterOptionModel,
- PagingHistorySupport pagingHistorySupport) {
- super(id);
+ private IModel<CodeCommentQuery> parsedQueryModel = new LoadableDetachableModel<CodeCommentQuery>() {
+
+ @Override
+ protected CodeCommentQuery load() {
+ try {
+ CodeCommentQuery parsedQuery = CodeCommentQuery.parse(getProject(), query, true);
+ if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())
+ error("Please login to perform this query");
+ else
+ return parsedQuery;
+ } catch (Exception e) {
+ logger.error("Error parsing code comment query: " + query, e);
+ error(e.getMessage());
+ }
+ return null;
+ }
- this.filterOptionModel = filterOptionModel;
- this.pagingHistorySupport = pagingHistorySupport;
+ };
+
+ private String query;
+
+ private DataTable<CodeComment, Void> commentsTable;
+
+ public CodeCommentListPanel(String id, String query) {
+ super(id);
+ this.query = query;
}
+ private CodeCommentManager getCodeCommentManager() {
+ return OneDev.getInstance(CodeCommentManager.class);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- add(new Link<Void>("myComments") {
+ TextField<String> input = new TextField<String>("input", Model.of(query));
+ input.add(new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.getUser() != null);
+ public Project getObject() {
+ return getProject();
}
-
+
+ }));
+ input.add(new AjaxFormComponentUpdatingBehavior("input"){
+
@Override
- public void onClick() {
- CodeCommentFilter filterOption = new CodeCommentFilter();
- filterOption.setUserName(SecurityUtils.getUser().getName());
- filterOptionModel.setObject(filterOption);
+ protected void onUpdate(AjaxRequestTarget target) {
+ query = input.getModelObject();
}
});
- add(new Link<Void>("allComments") {
+
+ Form<?> form = new Form<Void>("query");
+ form.add(input);
+ form.add(new AjaxButton("submit") {
@Override
- public void onClick() {
- filterOptionModel.setObject(new CodeCommentFilter());
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onQueryUpdated(target);
}
});
- Form<?> filterForm = new Form<Void>("filterForm") {
+ add(form);
+
+ add(new NotificationPanel("feedback", this));
+
+ SortableDataProvider<CodeComment, Void> dataProvider = new SortableDataProvider<CodeComment, Void>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends CodeComment> iterator(long first, long count) {
+ return getCodeCommentManager().query(getProject(), getPullRequest(), parsedQueryModel.getObject(),
+ (int)first, (int)count).iterator();
+ }
+
+ @Override
+ public long size() {
+ CodeCommentQuery parsedQuery = parsedQueryModel.getObject();
+ if (parsedQuery != null)
+ return getCodeCommentManager().count(getProject(), getPullRequest(), parsedQuery.getCriteria());
+ else
+ return 0;
+ }
@Override
- protected void onSubmit() {
- super.onSubmit();
+ public IModel<CodeComment> model(CodeComment object) {
+ Long commentId = object.getId();
+ return new LoadableDetachableModel<CodeComment>() {
+
+ @Override
+ protected CodeComment load() {
+ return OneDev.getInstance(CodeCommentManager.class).load(commentId);
+ }
+
+ };
}
};
- filterForm.add(BeanContext.editModel("editor", filterOptionModel));
- add(filterForm);
List<IColumn<CodeComment, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Code Comment")) {
+
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
+ cellItem.add(new Label(componentId, ""));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "new-indicator";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("File")) {
private void openComment(CodeComment comment) {
if (!comment.isValid()) {
@@ -137,179 +206,101 @@ public class CodeCommentListPanel extends Panel {
}
@Override
- public void populateItem(Item<ICellPopulator<CodeComment>> cellItem,
- String componentId, IModel<CodeComment> rowModel) {
- CodeComment comment = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "commentFrag", CodeCommentListPanel.this);
- User userForDisplay = User.getForDisplay(comment.getUser(), comment.getUserName());
- fragment.add(new AvatarLink("avatar", userForDisplay));
- fragment.add(new UserLink("user", userForDisplay));
-
- Link<Void> fileLink = new Link<Void>("file") {
-
- @Override
- public void onClick() {
- openComment(rowModel.getObject());
- }
-
- };
- fileLink.add(new Label("label", comment.getMarkPos().getPath()));
- fragment.add(fileLink);
-
- fragment.add(new Label("date", DateUtils.formatAge(comment.getDate())));
-
- fragment.add(new Link<Void>("detail") {
+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
+ cellItem.add(new Link<Void>(componentId) {
@Override
public void onClick() {
openComment(rowModel.getObject());
}
-
- });
-
- fragment.add(new MarkdownViewer("content", new IModel<String>() {
-
- @Override
- public String getObject() {
- return rowModel.getObject().getContent();
- }
@Override
- public void detach() {
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("a");
}
@Override
- public void setObject(String object) {
- CodeComment comment = rowModel.getObject();
- comment.setContent(object);
- OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest());
+ public IModel<?> getBody() {
+ return Model.of(rowModel.getObject().getMarkPos().getPath());
}
- }, null));
-
- WebMarkupContainer lastActivityContainer = new WebMarkupContainer("lastActivity");
- if (comment.getLastActivity() != null) {
- lastActivityContainer.add(new Label("user", comment.getLastActivity().getUserName())
- .setVisible(comment.getLastActivity().getUserName()!=null));
- lastActivityContainer.add(new Label("description", comment.getLastActivity().getDescription()));
- lastActivityContainer.add(new Label("date", DateUtils.formatAge(comment.getLastActivity().getDate())));
- } else {
- lastActivityContainer.add(new WebMarkupContainer("action"));
- lastActivityContainer.add(new WebMarkupContainer("user"));
- lastActivityContainer.add(new WebMarkupContainer("date"));
- lastActivityContainer.setVisible(false);
- }
- fragment.add(lastActivityContainer);
-
- cellItem.add(fragment);
-
- Date lastUpdateDate;
- if (comment.getLastActivity() != null)
- lastUpdateDate = comment.getLastActivity().getDate();
- else
- lastUpdateDate = comment.getDate();
- cellItem.add(AttributeAppender.append("class",
- comment.isVisitedAfter(lastUpdateDate)?"comment":"comment new"));
+ });
}
-
- });
- IDataProvider<CodeComment> dataProvider = new IDataProvider<CodeComment>() {
+ });
+
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Comment Content")) {
@Override
- public void detach() {
+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
+ CodeComment comment = rowModel.getObject();
+ cellItem.add(new Label(componentId, StringUtils.abbreviate(comment.getContent(), MAX_COMMENT_LEN)));
}
- @Override
- public Iterator<? extends CodeComment> iterator(long first, long count) {
- if (getPullRequest() != null) {
- EntityCriteria<CodeCommentRelation> criteria = EntityCriteria.of(CodeCommentRelation.class);
- criteria.setFetchMode("comment", FetchMode.JOIN);
- criteria.add(Restrictions.eq("request", getPullRequest()));
- filterOptionModel.getObject().fillRelationCriteria(criteria);
- criteria.addOrder(Order.desc("id"));
- return OneDev.getInstance(CodeCommentRelationManager.class)
- .findRange(criteria, (int)first, (int)count)
- .stream()
- .map(CodeCommentRelation::getComment)
- .iterator();
- } else {
- EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
- criteria.add(Restrictions.eq("project", getProject()));
- filterOptionModel.getObject().fillCriteria(criteria);
- criteria.addOrder(Order.desc("id"));
- return OneDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();
- }
- }
+ });
+
+ columns.add(new AbstractColumn<CodeComment, Void>(Model.of("Last Activity")) {
@Override
- public long size() {
- ProjectPage page = (ProjectPage) getPage();
-
- if (getPullRequest() != null) {
- EntityCriteria<CodeCommentRelation> criteria = EntityCriteria.of(CodeCommentRelation.class);
- criteria.add(Restrictions.eq("request", getPullRequest()));
- filterOptionModel.getObject().fillRelationCriteria(criteria);
- return OneDev.getInstance(CodeCommentRelationManager.class).count(criteria);
- } else {
- EntityCriteria<CodeComment> criteria = EntityCriteria.of(CodeComment.class);
- criteria.add(Restrictions.eq("project", page.getProject()));
- filterOptionModel.getObject().fillCriteria(criteria);
- return OneDev.getInstance(Dao.class).count(criteria);
- }
+ public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
+ CodeComment comment = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "lastActivityFrag", CodeCommentListPanel.this);
+ fragment.add(new Label("user", comment.getLastActivity().getUserName()));
+ fragment.add(new Label("description", comment.getLastActivity().getDescription()));
+ fragment.add(new Label("date", DateUtils.formatAge(comment.getLastActivity().getDate())));
+
+ cellItem.add(fragment);
}
- @Override
- public IModel<CodeComment> model(CodeComment object) {
- Long commentId = object.getId();
- return new LoadableDetachableModel<CodeComment>() {
+ });
+
+ add(commentsTable = new HistoryAwareDataTable<CodeComment, Void>("comments", columns, dataProvider,
+ WebConstants.PAGE_SIZE, getPagingHistorySupport()) {
- @Override
- protected CodeComment load() {
- return OneDev.getInstance(CodeCommentManager.class).load(commentId);
- }
-
- };
+ @Override
+ protected Item<CodeComment> newRowItem(String id, int index, IModel<CodeComment> model) {
+ Item<CodeComment> item = super.newRowItem(id, index, model);
+ CodeComment comment = model.getObject();
+ item.add(AttributeAppender.append("class",
+ comment.isVisitedAfter(comment.getLastActivity().getDate())?"comment":"comment new"));
+ return item;
}
-
- };
- DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,
- dataProvider, WebConstants.PAGE_SIZE);
- dataTable.setCurrentPage(pagingHistorySupport.getCurrentPage());
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
+ });
+
+ add(new NavigatorLabel("pageInfo", commentsTable) {
@Override
- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
- return new HistoryAwarePagingNavigator(navigatorId, table, pagingHistorySupport);
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(commentsTable.getItemCount() != 0);
}
});
- add(dataTable);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));
}
- private Project getProject() {
- return ((ProjectPage) getPage()).getProject();
+ public String getQuery() {
+ return query;
}
-
+
@Override
protected void onDetach() {
- filterOptionModel.detach();
+ parsedQueryModel.detach();
super.onDetach();
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CodeCommentResourceReference()));
- }
+ protected abstract Project getProject();
+
+ protected abstract PagingHistorySupport getPagingHistorySupport();
+
+ protected abstract void onQueryUpdated(AjaxRequestTarget target);
@Nullable
- private PullRequest getPullRequest() {
- if (getPage() instanceof RequestDetailPage)
- return ((RequestDetailPage)getPage()).getPullRequest();
- else
- return null;
- }
-
+ protected abstract PullRequest getPullRequest();
}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 2f8c6ecd75..1302000fad 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -556,7 +556,7 @@ public abstract class CodeCommentPanel extends Panel {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new CaretResourceReference()));
- response.render(CssHeaderItem.forReference(new CodeCommentResourceReference()));
+ response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));
}
private void onAddReply(AjaxRequestTarget target) {
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentResourceReference.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentResourceReference.java
deleted file mode 100644
index 64404ac2f5..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.codecomment;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class CodeCommentResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public CodeCommentResourceReference() {
- super(CodeCommentResourceReference.class, "code-comment.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
index ac8d605b20..ebe7ef7d9a 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/InvalidCodeCommentPanel.java
@@ -60,7 +60,7 @@ public class InvalidCodeCommentPanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CodeCommentResourceReference()));
+ response.render(CssHeaderItem.forReference(new CodeCommentCssResourceReference()));
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
index c49c53ad06..021b59dad4 100644
--- a/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css
@@ -1,60 +1,12 @@
-.code-comments td.filter {
- width: 25%;
- border: 2px solid #E0E0E0;
- padding: 20px;
-}
-.code-comments td.filter>.body>.shortcuts {
- margin-bottom: 12px;
-}
-.code-comments td.spacing {
- width: 20px;
-}
-.code-comments td.result {
- border: 2px solid #E0E0E0;
- text-align: left;
-}
-.code-comments td.comment {
- padding: 20px 20px 0 20px;
- border-left: 4px solid white;
-}
-.code-comments td.comment.new {
- border-left: 4px solid #4667EE;
-}
-.code-comments td.comment>div {
- padding-bottom: 20px;
- border-bottom: 2px dotted #BBB;
-}
-.code-comments td.result tr:last-child td.comment>div {
- border-bottom: none;
-}
-
-.code-comments td.comment>div>.title {
- color: #888;
- font-size: 16px;
- margin-bottom: 8px;
-}
-.code-comments td.comment>div>.title>.middot:before {
- margin: 0 8px 0 8px;
- font-size: 20px;
- line-height: 9px;
-}
-.code-comments td.comment>div>.content {
- margin-left: 30px;
-}
-.code-comments td.comment>div>.last-activity {
- color: #888;
- margin-left: 20px;
-}
-.code-comments td.comment>div>.title a, .code-comments td.comment>div>.last-activity a {
- color: #444;
+.code-comments>.head>* {
+ margin-bottom: 20px;
}
-
-.code-comments td.result .norecords-td {
- padding: 20px;
- font-size: 20px;
+.code-comments .new-indicator {
+ width: 4px;
+ padding: 0;
}
-.code-comments .alert {
- border-radius: 0;
+.code-comments tr.comment.new td.new-indicator {
+ background: #4667EE;
}
.code-comment>.outdated-context {
@@ -145,10 +97,6 @@
font-size: inherit;
line-height: inherit;
}
-.code-comments .markdown-rendered {
- font-size: inherit;
- line-height: inherit;
-}
.invalid-code-comment>.head {
font-size: 20px;
diff --git a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 5a1879ae45..f7e6eca448 100644
--- a/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -61,7 +61,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.codeassist.InputCompletion;
import io.onedev.codeassist.InputStatus;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.Substitution;
import io.onedev.jsymbol.util.NoAntiCacheImage;
import io.onedev.server.OneDev;
import io.onedev.server.codesearch.IndexManager;
@@ -633,8 +632,7 @@ public class RevisionDiffPanel extends Panel {
String suggestedContent = suggestion.getContent();
if (exclude)
suggestedContent = "-" + suggestedContent;
- Substitution substitution = new Substitution(0, inputStatus.getContent().length(), suggestedContent);
- completions.add(new InputCompletion(substitution, caret, null, suggestion.getMatch()));
+ completions.add(new InputCompletion(suggestedContent, suggestedContent, caret, null, suggestion.getMatch()));
}
return completions;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
index 6b3ead11aa..c072c675cb 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java
@@ -255,7 +255,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.canManage(getProject()) && issuesTable.getItemCount() != 0);
+ setVisible(SecurityUtils.canManage(getProject()));
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java b/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java
index c334288b3e..31a65cfaf3 100644
--- a/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java
@@ -11,10 +11,10 @@ import com.google.common.base.Optional;
import io.onedev.codeassist.FenceAware;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.ParentedElement;
-import io.onedev.codeassist.grammar.ElementSpec;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
import io.onedev.codeassist.grammar.RuleRefElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.server.model.Project;
import io.onedev.server.security.ProjectPrivilege;
import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser;
@@ -33,7 +33,7 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
private static final String ESCAPE_CHARS = "\\()";
public ReviewRequirementSpecAssistBehavior(IModel<Project> projectModel) {
- super(ReviewRequirementSpecParser.class, "spec");
+ super(ReviewRequirementSpecParser.class, "spec", false);
this.projectModel = projectModel;
}
@@ -44,15 +44,15 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
}
@Override
- protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Value")) {
return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
@Override
protected List<InputSuggestion> match(String unfencedMatchWith) {
- if (expectedElement.findParentByRule("userCriteria") != null) {
+ if (terminalExpect.findExpectByRule("userCriteria") != null) {
return SuggestionUtils.suggestUser(projectModel.getObject(), ProjectPrivilege.READ,
unfencedMatchWith, ESCAPE_CHARS);
} else {
@@ -65,13 +65,14 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
return "value needs to be enclosed in brackets";
}
- }.suggest(expectedElement.getSpec(), matchWith);
+ }.suggest(terminalExpect);
} else if (spec.getRuleName().equals("DIGIT")) {
List<InputSuggestion> suggestions = new ArrayList<>();
suggestions.add(new InputSuggestion("1", "require one review from the group", null));
suggestions.add(new InputSuggestion("2", "require two reviews from the group", null));
suggestions.add(new InputSuggestion("3", "require three reviews from the group", null));
+ String matchWith = terminalExpect.getUnmatchedText();
for (Iterator<InputSuggestion> it = suggestions.iterator(); it.hasNext();) {
InputSuggestion suggestion = it.next();
if (!suggestion.getContent().startsWith(matchWith) || suggestion.getContent().equals(matchWith))
@@ -85,10 +86,10 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
}
@Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ protected List<String> getHints(TerminalExpect terminalExpect) {
List<String> hints = new ArrayList<>();
- if (expectedElement.getSpec() instanceof RuleRefElementSpec) {
- RuleRefElementSpec spec = (RuleRefElementSpec) expectedElement.getSpec();
+ if (terminalExpect.getParent() != null && terminalExpect.getParent().getElementSpec() instanceof RuleRefElementSpec) {
+ RuleRefElementSpec spec = (RuleRefElementSpec) terminalExpect.getParent().getElementSpec();
if (spec.getRuleName().equals("count")) {
hints.add("Specify required reviews from the group");
hints.add("If not specified, one review is required from the group");
@@ -98,7 +99,7 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
}
@Override
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
String description;
switch (suggestedLiteral) {
case "all":
@@ -116,12 +117,4 @@ public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior {
return Optional.fromNullable(description);
}
- @Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/FileChoice.java b/core/src/main/java/io/onedev/server/web/editable/annotation/FileChoice.java
deleted file mode 100644
index 6cbd20fe05..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/annotation/FileChoice.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.web.editable.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FileChoice {
- String value();
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html
deleted file mode 100644
index 9fef077b64..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:panel>
- <div class="clearable-wrapper">
- <input wicket:id="input" autocomplete="off" spellcheck="false" class="form-control"></input>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java
deleted file mode 100644
index cc8ef6a463..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package io.onedev.server.web.editable.filechoice;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import io.onedev.codeassist.InputCompletion;
-import io.onedev.codeassist.InputStatus;
-import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.Substitution;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.editable.ErrorContext;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.annotation.FileChoice;
-import io.onedev.server.web.util.SuggestionUtils;
-import io.onedev.utils.Range;
-import io.onedev.utils.ReflectionUtils;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
-@SuppressWarnings("serial")
-public class FileChoiceEditor extends PropertyEditor<String> {
-
- private final List<String> choices = new ArrayList<>();
-
- private TextField<String> input;
-
- @SuppressWarnings("unchecked")
- public FileChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
-
- FileChoice fileChoice = propertyDescriptor.getPropertyGetter().getAnnotation(FileChoice.class);
- Preconditions.checkNotNull(fileChoice);
- for (String each: (List<String>)ReflectionUtils
- .invokeStaticMethod(propertyDescriptor.getBeanClass(), fileChoice.value())) {
- choices.add(each);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new TextField<String>("input", Model.of(getModelObject()));
- input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
-
- input.add(new InputAssistBehavior() {
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- for (InputSuggestion suggestion: SuggestionUtils.suggestPath(choices,
- inputStatus.getContentBeforeCaret().trim(), null)) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- Substitution substitution = new Substitution(0, inputStatus.getContent().length(), suggestion.getContent());
- completions.add(new InputCompletion(substitution, caret, null, suggestion.getMatch()));
- }
- return completions;
- }
-
- @Override
- protected List<String> getHints(InputStatus inputStatus) {
- return Lists.newArrayList("Use * to match any string in the path");
- }
-
- @Override
- protected List<Range> getErrors(String inputContent) {
- return null;
- }
-
- @Override
- protected int getAnchor(String content) {
- for (int i=0; i<content.length(); i++) {
- if (!Character.isWhitespace(content.charAt(i)))
- return i;
- }
- return content.length();
- }
-
- });
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java
deleted file mode 100644
index d05ff0fc92..0000000000
--- a/core/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package io.onedev.server.web.editable.filechoice;
-
-import java.lang.reflect.Method;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.IModel;
-
-import io.onedev.server.web.editable.EditSupport;
-import io.onedev.server.web.editable.EmptyValueLabel;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.editable.PropertyViewer;
-import io.onedev.server.web.editable.annotation.FileChoice;
-
-@SuppressWarnings("serial")
-public class FileEditSupport implements EditSupport {
-
- @Override
- public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
- Method propertyGetter = descriptor.getPropertyGetter();
- FileChoice fileChoice = propertyGetter.getAnnotation(FileChoice.class);
- if (fileChoice != null) {
- if (propertyGetter.getReturnType() == String.class) {
- return new PropertyContext<String>(descriptor) {
-
- @Override
- public PropertyViewer renderForView(String componentId, final IModel<String> model) {
- return new PropertyViewer(componentId, descriptor) {
-
- @Override
- protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null) {
- return new Label(id, model.getObject());
- } else {
- return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
- }
-
- };
- }
-
- @Override
- public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
- return new FileChoiceEditor(componentId, descriptor, model);
- }
-
- };
- } else {
- throw new RuntimeException("Annotation 'FileChoice' should be applied to property with type 'String'.");
- }
- } else {
- return null;
- }
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
index cd688937cb..0ed690e38e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
@@ -1,11 +1,14 @@
package io.onedev.server.web.page.project.comments;
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.server.web.component.codecomment.CodeCommentFilter;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.PagingHistorySupport;
@@ -15,52 +18,59 @@ public class ProjectCodeCommentsPage extends ProjectPage {
private static final String PARAM_CURRENT_PAGE = "currentPage";
- private final CodeCommentFilter filterOption;
+ private static final String PARAM_QUERY = "query";
+
+ private final String query;
public ProjectCodeCommentsPage(PageParameters params) {
super(params);
-
- filterOption = new CodeCommentFilter(params);
+ query = params.get(PARAM_QUERY).toString();
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(new CodeCommentListPanel("codeComments", new IModel<CodeCommentFilter>() {
+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
@Override
- public void detach() {
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getProject(), query);
+ params.add(PARAM_CURRENT_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
}
+
+ };
+
+ add(new CodeCommentListPanel("codeComments", query) {
@Override
- public CodeCommentFilter getObject() {
- return filterOption;
+ protected Project getProject() {
+ return ProjectCodeCommentsPage.this.getProject();
}
@Override
- public void setObject(CodeCommentFilter object) {
- PageParameters params = paramsOf(getProject());
- object.fillPageParams(params);
- setResponsePage(ProjectCodeCommentsPage.class, params);
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return pagingHistorySupport;
}
-
- }, new PagingHistorySupport() {
-
+
@Override
- public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getProject());
- filterOption.fillPageParams(params);
- params.add(PARAM_CURRENT_PAGE, currentPage+1);
- return params;
+ protected void onQueryUpdated(AjaxRequestTarget target) {
+ PageParameters params = paramsOf(getProject(), getQuery());
+ setResponsePage(ProjectCodeCommentsPage.class, params);
}
-
+
@Override
- public int getCurrentPage() {
- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
+ protected PullRequest getPullRequest() {
+ return null;
}
- }));
+ });
}
@Override
@@ -69,4 +79,11 @@ public class ProjectCodeCommentsPage extends ProjectPage {
response.render(CssHeaderItem.forReference(new ProjectCodeCommentsResourceReference()));
}
+ public static PageParameters paramsOf(Project project, @Nullable String query) {
+ PageParameters params = paramsOf(project);
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ return params;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
index d459c9c301..93f33644a8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/CommitQueryBehavior.java
@@ -14,9 +14,9 @@ import com.google.common.collect.Lists;
import io.onedev.codeassist.FenceAware;
import io.onedev.codeassist.InputSuggestion;
-import io.onedev.codeassist.ParentedElement;
-import io.onedev.codeassist.grammar.ElementSpec;
import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+import io.onedev.codeassist.parser.ParseExpect;
import io.onedev.server.OneDev;
import io.onedev.server.git.NameAndEmail;
import io.onedev.server.manager.CommitInfoManager;
@@ -46,7 +46,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
"4 weeks ago", "1 month 2 days ago", "1 year ago");
public CommitQueryBehavior(IModel<Project> projectModel) {
- super(CommitQueryParser.class, "query");
+ super(CommitQueryParser.class, "query", false);
this.projectModel = projectModel;
}
@@ -57,15 +57,15 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
}
@Override
- protected List<InputSuggestion> suggest(ParentedElement expectedElement, String matchWith) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Value")) {
return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
@Override
protected List<InputSuggestion> match(String unfencedMatchWith) {
- int tokenType = expectedElement.getRoot().getLastMatchedToken().getType();
+ int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
Project project = projectModel.getObject();
@@ -95,7 +95,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
}
for (Map.Entry<String, Range> entry: suggestedInputs.entrySet())
- suggestions.add(new InputSuggestion(entry.getKey(), -1, true, null, entry.getValue()).escape(ESCAPE_CHARS));
+ suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()).escape(ESCAPE_CHARS));
break;
case CommitQueryParser.BEFORE:
case CommitQueryParser.AFTER:
@@ -103,11 +103,13 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));
candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));
- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));
+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, unfencedMatchWith));
break;
case CommitQueryParser.PATH:
suggestions.addAll(SuggestionUtils.suggestPath(projectModel.getObject(), unfencedMatchWith, ESCAPE_CHARS));
break;
+ default:
+ return null;
}
return suggestions;
}
@@ -117,19 +119,19 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
return "value needs to be enclosed in parenthesis";
}
- }.suggest(expectedElement.getSpec(), matchWith);
+ }.suggest(terminalExpect);
}
}
return null;
}
@Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ protected List<String> getHints(TerminalExpect terminalExpect) {
List<String> hints = new ArrayList<>();
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
- int tokenType = expectedElement.getRoot().getLastMatchedToken().getType();
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Value") && !terminalExpect.getUnmatchedText().contains(VALUE_CLOSE)) {
+ int tokenType = terminalExpect.getState().getLastMatchedToken().getType();
if (tokenType == CommitQueryParser.COMMITTER) {
hints.add("Use * to match any part of committer");
} else if (tokenType == CommitQueryParser.AUTHOR) {
@@ -147,15 +149,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
}
@Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
- @Override
- protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
String description;
switch (suggestedLiteral) {
case "revision":
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
index f0d2237ece..d7a662c159 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java
@@ -154,7 +154,6 @@ public abstract class RequestDetailPage extends ProjectPage {
if (!getPullRequest().isValid())
throw new RestartResponseException(InvalidRequestPage.class, InvalidRequestPage.paramsOf(getPullRequest()));
-
reviewUpdateId = requestModel.getObject().getLatestUpdate().getId();
position = QueryPosition.from(params);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java
index 578360ffc5..a5df789f62 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.project.pullrequests.requestdetail.codecomments;
-import org.apache.wicket.model.IModel;
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.cycle.IRequestCycleListener;
@@ -9,23 +11,27 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.UserInfoManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.codecomment.CodeCommentFilter;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.QueryPosition;
@SuppressWarnings("serial")
public class RequestCodeCommentsPage extends RequestDetailPage {
private static final String PARAM_CURRENT_PAGE = "currentPage";
- private final CodeCommentFilter filterOption;
+ private static final String PARAM_QUERY = "query";
+
+ private final String query;
public RequestCodeCommentsPage(PageParameters params) {
super(params);
-
- filterOption = new CodeCommentFilter(params);
+
+ query = params.get(PARAM_QUERY).toString();
}
@Override
@@ -37,40 +43,46 @@ public class RequestCodeCommentsPage extends RequestDetailPage {
protected void onInitialize() {
super.onInitialize();
- add(new CodeCommentListPanel("codeComments", new IModel<CodeCommentFilter>() {
+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
@Override
- public void detach() {
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getPullRequest(), getPosition(), query);
+ params.add(PARAM_CURRENT_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
}
+
+ };
+
+ add(new CodeCommentListPanel("codeComments", query) {
@Override
- public CodeCommentFilter getObject() {
- return filterOption;
+ protected Project getProject() {
+ return RequestCodeCommentsPage.this.getProject();
}
@Override
- public void setObject(CodeCommentFilter object) {
- PageParameters params = paramsOf(getPullRequest(), getPosition());
- object.fillPageParams(params);
- setResponsePage(RequestCodeCommentsPage.class, params);
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return pagingHistorySupport;
}
-
- }, new PagingHistorySupport() {
-
+
@Override
- public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getPullRequest(), getPosition());
- filterOption.fillPageParams(params);
- params.add(PARAM_CURRENT_PAGE, currentPage+1);
- return params;
+ protected void onQueryUpdated(AjaxRequestTarget target) {
+ PageParameters params = paramsOf(getPullRequest(), getPosition(), getQuery());
+ setResponsePage(RequestCodeCommentsPage.class, params);
}
-
+
@Override
- public int getCurrentPage() {
- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
+ protected PullRequest getPullRequest() {
+ return RequestCodeCommentsPage.this.getPullRequest();
}
- }));
+ });
RequestCycle.get().getListeners().add(new IRequestCycleListener() {
@@ -117,4 +129,11 @@ public class RequestCodeCommentsPage extends RequestDetailPage {
});
}
+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position, @Nullable String query) {
+ PageParameters params = paramsOf(request, position);
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ return params;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 48cc3d389b..cac6fe5ed1 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -13,11 +13,12 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
+
add(new Link<Void>("test") {
@Override
public void onClick() {
+
}
});
diff --git a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 06f4ac5466..29ac20db71 100644
--- a/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -173,7 +173,7 @@ public class SuggestionUtils {
caret = text.length();
else
caret = -1;
- InputSuggestion suggestion = new InputSuggestion(text, caret, true, null, entry.getValue());
+ InputSuggestion suggestion = new InputSuggestion(text, caret, null, entry.getValue());
if (escapeChars != null)
suggestion = suggestion.escape(escapeChars);
suggestions.add(suggestion);
diff --git a/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
new file mode 100644
index 0000000000..a8554808b6
--- /dev/null
+++ b/core/src/test/java/io/onedev/server/entityquery/codecomment/TestCodeCommentQueryGrammar.java
@@ -0,0 +1,57 @@
+package io.onedev.server.entityquery.codecomment;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.onedev.codeassist.CodeAssist;
+import io.onedev.codeassist.FenceAware;
+import io.onedev.codeassist.InputStatus;
+import io.onedev.codeassist.InputSuggestion;
+import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+
+public class TestCodeCommentQueryGrammar {
+
+ private CodeAssist codeAssist = new CodeAssist(CodeCommentQueryLexer.class, false) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (elementSpec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith) {
+ return null;
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ };
+
+ @Test
+ public void test() {
+ List<? extends InputStatus> suggestions;
+
+ suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ assertEquals(1, suggestions.size());
+ assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+
+ suggestions = codeAssist.suggest(new InputStatus("created by me", 13), "query");
+ assertEquals(3, suggestions.size());
+ assertEquals("created by me:13", suggestions.get(0).toString());
+ assertEquals("\"created by me\" :16", suggestions.get(1).toString());
+ assertEquals("created by me :14", suggestions.get(2).toString());
+ }
+
+}
diff --git a/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
new file mode 100644
index 0000000000..6e5e7aed0b
--- /dev/null
+++ b/core/src/test/java/io/onedev/server/entityquery/issue/TestIssueQueryGrammar.java
@@ -0,0 +1,57 @@
+package io.onedev.server.entityquery.issue;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.onedev.codeassist.CodeAssist;
+import io.onedev.codeassist.FenceAware;
+import io.onedev.codeassist.InputStatus;
+import io.onedev.codeassist.InputSuggestion;
+import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+
+public class TestIssueQueryGrammar {
+
+ private CodeAssist codeAssist = new CodeAssist(IssueQueryLexer.class, false) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (elementSpec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith) {
+ return null;
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ };
+
+ @Test
+ public void test() {
+ List<? extends InputStatus> suggestions;
+
+ suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ assertEquals(1, suggestions.size());
+ assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+
+ suggestions = codeAssist.suggest(new InputStatus("open", 4), "query");
+ assertEquals(3, suggestions.size());
+ assertEquals("open:4", suggestions.get(0).toString());
+ assertEquals("\"open\" :7", suggestions.get(1).toString());
+ assertEquals("open :5", suggestions.get(2).toString());
+ }
+
+}
diff --git a/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java b/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
new file mode 100644
index 0000000000..4e074b3710
--- /dev/null
+++ b/core/src/test/java/io/onedev/server/entityquery/pullrequest/TestPullRequestQueryGrammar.java
@@ -0,0 +1,57 @@
+package io.onedev.server.entityquery.pullrequest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+
+import org.junit.Test;
+
+import io.onedev.codeassist.CodeAssist;
+import io.onedev.codeassist.FenceAware;
+import io.onedev.codeassist.InputStatus;
+import io.onedev.codeassist.InputSuggestion;
+import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.codeassist.parser.TerminalExpect;
+
+public class TestPullRequestQueryGrammar {
+
+ private CodeAssist codeAssist = new CodeAssist(PullRequestQueryLexer.class, false) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (elementSpec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith) {
+ return null;
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ };
+
+ @Test
+ public void test() {
+ List<? extends InputStatus> suggestions;
+
+ suggestions = codeAssist.suggest(new InputStatus("\"Date\" is before 2018-09-01 2:30PM", 34), "query");
+ assertEquals(1, suggestions.size());
+ assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());
+
+ suggestions = codeAssist.suggest(new InputStatus("open", 4), "query");
+ assertEquals(3, suggestions.size());
+ assertEquals("open:4", suggestions.get(0).toString());
+ assertEquals("\"open\" :7", suggestions.get(1).toString());
+ assertEquals("open :5", suggestions.get(2).toString());
+ }
+
+}