The Unified and Autonomous Development Platform
Refactor various code assist grammar and input behaviors
Robin Shenbeeeeca93b22
diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.javaindex 15e6d0c3c5..acb8b75ecc 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java@@ -21,7 +21,7 @@ public class CacheSpec implements Serializable {private String path;@Editable(order=100, description="Specify key of the cache. Caches with same key can be reused by different builds. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmpty@RegEx(interpolative=true, value="[a-zA-Z0-9\\-_]+", message="Can only contain alphanumeric, dash and underscore")@@ -34,7 +34,8 @@ public class CacheSpec implements Serializable {}@Editable(order=200, description="Specify path to cache. Non-absolute path is considered to be relative to job workspace. "- + "Specify \".\" (without quote) to cache workspace itself. <b>Note:</b> Type '@' to start inserting variable")+ + "Specify \".\" (without quote) to cache workspace itself. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@Path@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.javaindex b0704ea208..4f14f508fa 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java@@ -20,7 +20,7 @@ public class EnvVar implements Serializable {private String value;@Editable(order=100, description="Specify name of the environment variable. "- + "<b>Note:</b> Type '@' to start inserting job variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@VariableName@NotEmpty@@ -33,7 +33,7 @@ public class EnvVar implements Serializable {}@Editable(order=200, description="Specify value of the environment variable. "- + "<b>Note:</b> Type '@' to start inserting job variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getValue() {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/ci/job/Job.javaindex e524e9e5c9..c41d30fb52 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/Job.java@@ -98,7 +98,8 @@ public class Job implements Serializable, Validatable {this.name = name;}- @Editable(order=110, description="Specify docker image of the job. <b>Note:</b> Type '@' to start inserting variable")+ @Editable(order=110, description="Specify docker image of the job. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -124,7 +125,8 @@ public class Job implements Serializable, Validatable {@Editable(order=120, description="Specify commands to execute in above image, with one command per line. "+ "For Windows based images, commands will be interpretated by cmd.exe, and for Unix/Linux "- + "based images, commands will be interpretated by shell. <b>Note:</b> Input '@' to start inserting variable")+ + "based images, commands will be interpretated by shell. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative@Code(language = Code.SHELL, variableProvider="getVariables")@Size(min=1, message="may not be empty")@@ -217,10 +219,10 @@ public class Job implements Serializable, Validatable {}@Editable(order=9115, group="Artifacts & Reports", description="Optionally specify files to publish as job artifacts. "- + "Artifact files are relative to OneDev workspace, and may use * or ? for pattern match. Variable can be "- + "inserted by typing '@'")+ + "Artifact files are relative to OneDev workspace, and may use * or ? for pattern match. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")- @Patterns+ @Patterns(interpolative = true)@NameOfEmptyValue("No artifacts")public String getArtifacts() {return artifacts;@@ -242,7 +244,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9200, name="CPU Requirement", group="Resource Requirements", description="Specify CPU requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getCpuRequirement() {@@ -255,7 +257,7 @@ public class Job implements Serializable, Validatable {@Editable(order=9300, group="Resource Requirements", description="Specify memory requirement of the job. "+ "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getMemoryRequirement() {diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.javaindex ab1808e364..1c1c44204f 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java@@ -59,9 +59,9 @@ public class JobDependency implements Serializable {@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "+ "from the dependency into job workspace. Leave empty to do not retrieve any artifacts. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")- @Patterns+ @Patterns(interpolative = true)@NameOfEmptyValue("Do not retrieve")public String getArtifacts() {return artifacts;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java b/server-core/src/main/java/io/onedev/server/ci/job/JobReport.javaindex cd641ec93c..dec4fa45bf 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java@@ -24,9 +24,9 @@ public abstract class JobReport implements Serializable {private transient PatternSet patternSet;@Editable(order=100, description="Specify files relative to OneDev workspace. Use * or ? for pattern match. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")- @Patterns+ @Patterns(interpolative = true)@NotEmptypublic String getFilePatterns() {return filePatterns;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java b/server-core/src/main/java/io/onedev/server/ci/job/JobService.javaindex ed644daadb..e61bd67a31 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/JobService.java@@ -31,7 +31,7 @@ public class JobService implements Serializable {private String memoryRequirement = "128m";@Editable(order=100, description="Specify name of the service, which can be used to access "- + "the service. <b>Note:</b> Type '@' to start inserting variable")+ + "the service. <b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@VariableName@NotEmpty@@ -43,8 +43,8 @@ public class JobService implements Serializable {this.name = name;}- @Editable(order=200, description="Specify docker image of the service. Type '@' to start "- + "inserting variable")+ @Editable(order=200, description="Specify docker image of the service. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getImage() {@@ -56,7 +56,7 @@ public class JobService implements Serializable {}@Editable(order=220, description="Optionally specify arguments to run above image. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")public String getArguments() {return arguments;@@ -78,8 +78,8 @@ public class JobService implements Serializable {@Editable(order=400, description="Specify command to check readiness of the service. This command will "+ "be interpretated by cmd.exe on Windows images, and by shell on Linux images. It will be "- + "executed repeatedly until a zero code is returned to indicate service ready. Variable can "- + "be inserted to this field by typing '@'")+ + "executed repeatedly until a zero code is returned to indicate service ready. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@NotEmptypublic String getReadinessCheckCommand() {return readinessCheckCommand;diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.javaindex e2027db57d..7852bde204 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java@@ -17,6 +17,7 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Project;import io.onedev.server.util.EditContext;import io.onedev.server.util.SecurityUtils;+import io.onedev.server.util.interpolative.Segment;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Interpolative;@@ -65,7 +66,7 @@ public class ProjectDependency implements Serializable {}@Editable(order=300, name="Build", description="Specify build to retrieve artifacts from. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables", literalSuggester="suggestBuilds")@NotEmptypublic String getBuildNumber() {@@ -96,10 +97,10 @@ public class ProjectDependency implements Serializable {return new ArrayList<>();}- @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve "- + "into job workspace. <b>Note:</b> Type '@' to start inserting variable")+ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into job workspace. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")- @Patterns(suggester="suggestArtifacts")+ @Patterns(suggester="suggestArtifacts", interpolative=true)@NotEmptypublic String getArtifacts() {return artifacts;@@ -118,7 +119,9 @@ public class ProjectDependency implements Serializable {private static List<InputSuggestion> suggestArtifacts(String matchWith) {Project project = getInputProject();String buildNumber = (String) EditContext.get().getInputValue("buildNumber");- if (project != null && io.onedev.server.util.interpolative.Interpolative.fromString(buildNumber).getSegments().isEmpty()) {+ if (project != null && io.onedev.server.util.interpolative.Interpolative.fromString(buildNumber).getSegments(Segment.Type.VARIABLE).isEmpty()) {+ if (buildNumber.startsWith("#"))+ buildNumber = buildNumber.substring(1);Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(buildNumber));if (build != null)return SuggestionUtils.suggestArtifacts(build, matchWith);diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.javaindex 608e0405df..74151a58a4 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultJobLogManager.java@@ -160,7 +160,7 @@ public class DefaultJobLogManager implements JobLogManager {paramName = "";List<String> paramValues = new ArrayList<>();for (TerminalNode terminalNode: paramContext.Value())- paramValues.add(LogInstruction.unescape(LogInstruction.removeQuotes(terminalNode.getText())));+ paramValues.add(LogInstruction.getValue(terminalNode));params.put(paramName, paramValues);}doLog("Executing log instruction '" + name + "'...");diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4 b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4index 2ccd4d2f50..7ea415c963 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4@@ -21,11 +21,5 @@ WS;Value- : '\'' (ESCAPE|~['\\])+? '\''- ;--fragment--ESCAPE- : '\\'['\\]+ : '\'' ('\\'.|~['\\])+? '\'';diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.javaindex 27f378dd34..0f37966cac 100644--- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java+++ b/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java@@ -10,8 +10,11 @@ import org.antlr.v4.runtime.CharStreams;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;+import org.antlr.v4.runtime.tree.TerminalNode;+import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.launcher.loader.ExtensionPoint;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneException;import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext;import io.onedev.server.model.Build;@@ -21,22 +24,12 @@ public abstract class LogInstruction {public static final String PREFIX = "##onedev";- public static final String ESCAPE_CHARS = "\\\"";-public abstract String getName();public abstract void execute(Build build, Map<String, List<String>> params);- public static String unescape(String value) {- return value.replace("\\'", "'").replace("\\\\", "\\");- }-- public static String removeQuotes(String value) {- if (value.startsWith("'"))- value = value.substring(1);- if (value.endsWith("'"))- value = value.substring(0, value.length()-1);- return value;+ public static String getValue(TerminalNode valueNode) {+ return StringUtils.unescape(FenceAware.unfence(valueNode.getText()));}public static InstructionContext parse(String instructionString) {@@ -58,16 +51,5 @@ public abstract class LogInstruction {parser.setErrorHandler(new BailErrorStrategy());return parser.instruction();}-- public static String escape(String value) {- StringBuilder builder = new StringBuilder();- for (int i=0; i<value.length(); i++) {- char ch = value.charAt(i);- if (ESCAPE_CHARS.indexOf(ch) != -1)- builder.append("\\");- builder.append(ch);- }- return builder.toString();- }}diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 042d17a084..0eb808be79 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -30,7 +30,6 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.lib.Repository;import org.eclipse.jgit.revwalk.RevCommit;@@ -47,6 +46,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.BeanUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.LockUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.cache.BuildInfoManager;@@ -589,7 +589,7 @@ public class Build extends AbstractEntity implements Referenceable {public String interpolate(@Nullable String interpolativeString) {if (interpolativeString != null)- return Interpolative.fromString(interpolativeString).interpolateWith(new VariableInterpolator(this));+ return StringUtils.unescape(Interpolative.fromString(interpolativeString).interpolateWith(new VariableInterpolator(this)));elsereturn null;}diff --git a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.javaindex 39ad9246ef..748009ac48 100755--- a/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java+++ b/server-core/src/main/java/io/onedev/server/model/support/inputspec/booleaninput/BooleanInput.java@@ -7,14 +7,14 @@ import javax.validation.ValidationException;import com.google.common.collect.Lists;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.inputspec.booleaninput.defaultvalueprovider.DefaultValueProvider;+import io.onedev.server.web.util.LocaleUtils;public class BooleanInput {public static List<String> getPossibleValues() {- return Lists.newArrayList(StringUtils.describe(true), StringUtils.describe(false));+ return Lists.newArrayList(LocaleUtils.describe(true), LocaleUtils.describe(false));}public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,@@ -35,9 +35,9 @@ public class BooleanInput {throw new ValidationException("Invalid boolean value");} else if (strings.size() == 1) {String string = strings.iterator().next();- if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(StringUtils.describe(true)))+ if (string.equalsIgnoreCase("true") || string.equalsIgnoreCase(LocaleUtils.describe(true)))return true;- else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(StringUtils.describe(false)))+ else if (string.equalsIgnoreCase("false") || string.equalsIgnoreCase(LocaleUtils.describe(false)))return false;elsethrow new ValidationException("Invalid boolean value");@@ -48,9 +48,9 @@ public class BooleanInput {public static List<String> convertToStrings(Object value) {if (value instanceof Boolean)- return Lists.newArrayList(StringUtils.describe((Boolean)value));+ return Lists.newArrayList(LocaleUtils.describe((Boolean)value));else- return Lists.newArrayList(StringUtils.describe(false));+ return Lists.newArrayList(LocaleUtils.describe(false));}}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4 b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4index cc08a59848..679b8d5e6d 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.g4@@ -113,5 +113,5 @@ WS;Value- : '(' ('\\'[()]|~[()])+? ')'+ : '(' ('\\'.|~[\\()])+? ')';diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.javaindex f957b87938..dd86fa687e 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java@@ -14,12 +14,13 @@ import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;import org.antlr.v4.runtime.tree.TerminalNode;-import org.apache.commons.lang.StringUtils;import org.apache.commons.lang.math.NumberUtils;import org.eclipse.jgit.lib.ObjectId;import org.slf4j.Logger;import org.slf4j.LoggerFactory;+import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;@@ -148,9 +149,8 @@ public class CommitQuery implements Serializable {return criterias.stream().anyMatch(it->it.needsLogin());}- private static String getValue(TerminalNode terminalNode) {- String value = terminalNode.getText().substring(1);- return unescapeBraces(value.substring(0, value.length()-1));+ private static String getValue(TerminalNode valueNode) {+ return StringUtils.unescape(FenceAware.unfence(valueNode.getText()));}public boolean matches(RefUpdated event, User user) {@@ -160,16 +160,6 @@ public class CommitQuery implements Serializable {return false;}- public static String escapeBraces(String value) {- value = StringUtils.replace(value, ")", "\\)");- return StringUtils.replace(value, "(", "\\(");- }-- public static String unescapeBraces(String value) {- value = StringUtils.replace(value, "\\)", ")");- return StringUtils.replace(value, "\\(", "(");- }-public void fill(Project project, RevListCommand command) {criterias.stream().forEach(it->it.fill(project, command));}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.javaindex 03d8098c6d..419b743241 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java@@ -7,12 +7,13 @@ import java.util.List;import javax.persistence.criteria.Path;-import org.apache.commons.lang.StringUtils;import org.eclipse.jgit.errors.RevisionSyntaxException;import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Splitter;+import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;import io.onedev.commons.utils.WordUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -36,12 +37,10 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializapublic abstract List<EntitySort> getSorts();- public static String getValue(String tokenText) {- String value = tokenText.substring(1);- value = value.substring(0, value.length()-1);- return unescapeQuotes(value);+ public static String getValue(String token) {+ return StringUtils.unescape(FenceAware.unfence(token));}-+public static int getIntValue(String value) {try {return Integer.parseInt(value);@@ -146,15 +145,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa}public static String quote(String value) {- return "\"" + escapeQuotes(value) + "\"";- }-- public static String escapeQuotes(String value) {- return StringUtils.replace(value, "\"", "\\\"");- }-- public static String unescapeQuotes(String value) {- return StringUtils.replace(value, "\\\"", "\"");+ return "\"" + StringUtils.escape(value, "\"") + "\"";}public static <T> Path<T> getPath(Path<?> root, String pathName) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index 8ad7ecba1d..88c075e9a1 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -141,7 +141,7 @@ RParens;Quoted- : '"' ('\\"'|~'"')+? '"'+ : '"' ('\\'.|~[\\"])+? '"';WSdiff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4index 455a16bd49..ca76118540 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4@@ -93,7 +93,7 @@ RParens;Quoted- : '"' ('\\"'|~'"')+? '"'+ : '"' ('\\'.|~[\\"])+? '"';WSdiff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 097bbc0351..c4990cbcf3 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -139,7 +139,7 @@ RParens;Quoted- : '"' ('\\"'|~'"')+? '"'+ : '"' ('\\'.|~[\\"])+? '"';WSdiff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index 8bf94185a8..223edc1ddd 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -161,7 +161,7 @@ RParens;Quoted- : '"' ('\\"'|~'"')+? '"'+ : '"' ('\\'.|~[\\"])+? '"';WSdiff --git a/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java b/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.javaindex 7e1d649e19..dea0ad096c 100644--- a/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java+++ b/server-core/src/main/java/io/onedev/server/util/CommitMessageTransformer.java@@ -1,6 +1,7 @@package io.onedev.server.util;import java.util.Collection;+import java.util.function.Function;import java.util.regex.Matcher;import java.util.regex.Pattern;@@ -17,7 +18,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import org.unbescape.html.HtmlEscape;-import io.onedev.commons.utils.Transformer;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.ProjectManager;@@ -30,7 +30,7 @@ import io.onedev.server.model.support.CommitMessageTransform;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-public class CommitMessageTransformer implements Transformer<String> {+public class CommitMessageTransformer implements Function<String, String> {private static final Logger logger = LoggerFactory.getLogger(CommitMessageTransformer.class);@@ -59,7 +59,7 @@ public class CommitMessageTransformer implements Transformer<String> {}@Override- public String transform(String commitMessage) {+ public String apply(String commitMessage) {commitMessage = transform(commitMessage, project.getCommitMessageTransforms());commitMessage = linkEntities(project, commitMessage, new EntityInfoProvider() {diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4 b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4index e05d2b2f58..83a9ac2386 100644--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.g4@@ -4,8 +4,6 @@ interpolative: segment* EOF;segment: Literal|Variable;-Variable: '@' (ESCAPE|~[@])+? '@';-Literal: (ESCAPE|~[@])+;--fragment-ESCAPE: '\\@';+Variable: '@' CHAR+? '@';+Literal: CHAR+;+CHAR: ('\\'.|~[@\\]);diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.javaindex 588f87b14c..fe3a30691a 100644--- a/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/Interpolative.java@@ -1,98 +1,81 @@-package io.onedev.server.util.interpolative;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;-import java.util.function.Function;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import org.apache.commons.lang3.StringUtils;--import io.onedev.server.OneException;-import io.onedev.server.util.interpolative.InterpolativeParser.InterpolativeContext;-import io.onedev.server.util.interpolative.InterpolativeParser.SegmentContext;-import io.onedev.server.util.interpolative.Segment.Type;--public class Interpolative implements Serializable {-- private static final long serialVersionUID = 1L;-- public static final char MARK = '@';-- private final List<Segment> segments;-- public Interpolative(List<Segment> segments) {- this.segments = segments;- }-- public static Interpolative fromString(String interpolativeString) {- List<Segment> segments = new ArrayList<>();- for (SegmentContext segment: parse(interpolativeString).segment()) {- if (segment.Literal() != null)- segments.add(new Segment(Type.LITERAL, unescape(segment.Literal().getText())));- else- segments.add(new Segment(Type.VARIABLE, unescape(segment.Variable().getText())));- }- return new Interpolative(segments);- }-- public List<Segment> getSegments() {- return segments;- }-- public String interpolateWith(Function<String, String> interpolator) {- StringBuilder builder = new StringBuilder();- for (Segment segment: segments) {- if (segment.getType() == Type.LITERAL)- builder.append(segment.getContent());- else- builder.append(interpolator.apply(segment.getContent()));- }- return builder.toString();- }-- public static String unescape(String literal) {- String markString = String.valueOf(MARK);- if (literal.startsWith(markString))- literal = literal.substring(1, literal.length()-1);- return StringUtils.replace(literal, "\\" + markString, markString);- }-- public static InterpolativeContext parse(String interpolativeString) {- CharStream is = CharStreams.fromString(interpolativeString);- InterpolativeLexer lexer = new InterpolativeLexer(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 interpolative");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- InterpolativeParser parser = new InterpolativeParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.interpolative();- }-- public static String escape(String literal) {- StringBuilder builder = new StringBuilder();- for (int i=0; i<literal.length(); i++) {- char ch = literal.charAt(i);- if (ch == MARK)- builder.append("\\");- builder.append(ch);- }- return builder.toString();- }-+package io.onedev.server.util.interpolative;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.function.Function;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CharStream;+import org.antlr.v4.runtime.CharStreams;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.server.OneException;+import io.onedev.server.util.interpolative.InterpolativeParser.InterpolativeContext;+import io.onedev.server.util.interpolative.InterpolativeParser.SegmentContext;+import io.onedev.server.util.interpolative.Segment.Type;++public class Interpolative implements Serializable {++ private static final long serialVersionUID = 1L;++ private final List<Segment> segments;++ public Interpolative(List<Segment> segments) {+ this.segments = segments;+ }++ public static Interpolative fromString(String interpolativeString) {+ List<Segment> segments = new ArrayList<>();+ for (SegmentContext segment: parse(interpolativeString).segment()) {+ if (segment.Literal() != null)+ segments.add(new Segment(Type.LITERAL, segment.Literal().getText()));+ else+ segments.add(new Segment(Type.VARIABLE, FenceAware.unfence(segment.Variable().getText())));+ }+ return new Interpolative(segments);+ }++ public List<Segment> getSegments(@Nullable Type type) {+ return segments.stream().filter(it -> type==null || it.getType() == type).collect(Collectors.toList());+ }++ public String interpolateWith(Function<String, String> interpolator) {+ StringBuilder builder = new StringBuilder();+ for (Segment segment: segments) {+ if (segment.getType() == Type.LITERAL)+ builder.append(segment.getContent());+ else+ builder.append(interpolator.apply(segment.getContent()));+ }+ return builder.toString();+ }++ public static InterpolativeContext parse(String interpolativeString) {+ CharStream is = CharStreams.fromString(interpolativeString);+ InterpolativeLexer lexer = new InterpolativeLexer(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 interpolative");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ InterpolativeParser parser = new InterpolativeParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.interpolative();+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4 b/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4index c7ae1cf356..62de679030 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4+++ b/server-core/src/main/java/io/onedev/server/util/patternset/InterpolativePatternSet.g4@@ -5,13 +5,9 @@ segment: literal|Variable;literal: WS* pattern (WS+ pattern)* WS*;pattern: Excluded? (Quoted|NQuoted);-Variable: '@' (AT_ESCAPE|~[@])+? '@';-Quoted: '"' (QUOTE_ESCAPE|AT_ESCAPE|~["@])+? '"';-NQuoted: (~[-"@ ]|QUOTE_ESCAPE|AT_ESCAPE)(~["@ ]|QUOTE_ESCAPE|AT_ESCAPE)*;+Variable: '@' ('\\'.|~[\\@])+? '@';+Quoted: '"' ('\\'.|~[\\@"])+? '"';+NQuoted: (~[-"@ ]|'\\'.)(~["@ ]|'\\'.)*;Excluded: '-';WS: ' ';--fragment-QUOTE_ESCAPE: '\\"';-AT_ESCAPE: '\\@';diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4 b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4index de0aae9f32..5d90ab4484 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.g4@@ -4,11 +4,11 @@ patterns: WS* pattern (WS+ pattern)* WS* EOF;pattern: Excluded? (Quoted|NQuoted);-Quoted: '"' (ESCAPE|~["])+? '"';-NQuoted: (~[-" ]|ESCAPE)(~[" ]|ESCAPE)*;+Quoted: '"' ('\\'.|~[\\"])+? '"';+NQuoted: ('\\'.|~[-\\" ])('\\'.|~[\\" ])*;Excluded: '-';WS: ' ';fragment-ESCAPE: '\\"';+ESCAPE: '\\'[\\"];diff --git a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.javaindex 3450db4e24..e87c46c3fd 100644--- a/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java+++ b/server-core/src/main/java/io/onedev/server/util/patternset/PatternSet.java@@ -1,155 +1,140 @@-package io.onedev.server.util.patternset;--import java.io.File;-import java.io.Serializable;-import java.util.ArrayList;-import java.util.Collection;-import java.util.HashSet;-import java.util.Set;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import org.apache.commons.lang3.StringUtils;-import org.apache.tools.ant.DirectoryScanner;--import io.onedev.commons.utils.match.Matcher;-import io.onedev.server.OneException;-import io.onedev.server.util.patternset.PatternSetParser.PatternContext;-import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;--public class PatternSet implements Serializable {-- private static final long serialVersionUID = 1L;-- private final Set<String> includes;-- private final Set<String> excludes;-- public PatternSet(Set<String> includes, Set<String> excludes) {- this.includes = includes;- this.excludes = excludes;- }-- public Set<String> getIncludes() {- return includes;- }-- public Set<String> getExcludes() {- return excludes;- }-- public boolean matches(Matcher matcher, String value) {- for (String exclude: excludes) {- if (matcher.matches(exclude, value))- return false;- }- for (String include: includes) {- if (matcher.matches(include, value))- return true;- }- if (excludes.isEmpty())- return false;- else- return includes.isEmpty();- }-- public Collection<File> listFiles(File dir) {- Collection<File> files = new ArrayList<File>();-- DirectoryScanner scanner = new DirectoryScanner();- scanner.setBasedir(dir);- scanner.setIncludes(includes.toArray(new String[0]));- scanner.setExcludes(excludes.toArray(new String[0]));- scanner.scan();-- for (String path: scanner.getIncludedFiles())- files.add(new File(dir, path));-- return files;- }-- public static PatternSet fromString(@Nullable String patternSetString) {- Set<String> includes = new HashSet<>();- Set<String> excludes = new HashSet<>();-- if (patternSetString != null) {- PatternsContext patterns = parse(patternSetString);-- for (PatternContext pattern: patterns.pattern()) {- String value;- if (pattern.Quoted() != null)- value = unescape(pattern.Quoted().getText());- else- value = unescape(pattern.NQuoted().getText());- if (pattern.Excluded() != null)- excludes.add(value);- else- includes.add(value);- }- }-- return new PatternSet(includes, excludes);- }-- public static String unescape(String pattern) {- if (pattern.startsWith("\""))- pattern = pattern.substring(1, pattern.length()-1);- return StringUtils.replace(pattern, "\\\"", "\"");- }-- public static PatternsContext parse(String patternSetString) {- CharStream is = CharStreams.fromString(patternSetString);- PatternSetLexer lexer = new PatternSetLexer(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 patterns");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- PatternSetParser parser = new PatternSetParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.patterns();- }-- public static String quoteIfNecessary(String pattern) {- if (StringUtils.containsAny(pattern, " \"") || pattern.startsWith("-"))- return "\"" + escape(pattern) + "\"";- else- return pattern;- }-- public static String escape(String pattern) {- StringBuilder builder = new StringBuilder();- for (int i=0; i<pattern.length(); i++) {- char ch = pattern.charAt(i);- if (ch == '"')- builder.append("\\");- builder.append(ch);- }- return builder.toString();- }-- @Override- public String toString() {- StringBuilder builder = new StringBuilder();- for (String include: getIncludes())- builder.append(include).append(" ");- for (String exclude: getExcludes())- builder.append("-").append(exclude).append(" ");- return builder.toString().trim();- }-+package io.onedev.server.util.patternset;++import java.io.File;+import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;+import java.util.HashSet;+import java.util.Set;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CharStream;+import org.antlr.v4.runtime.CharStreams;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;+import org.apache.tools.ant.DirectoryScanner;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;+import io.onedev.commons.utils.match.Matcher;+import io.onedev.server.OneException;+import io.onedev.server.util.patternset.PatternSetParser.PatternContext;+import io.onedev.server.util.patternset.PatternSetParser.PatternsContext;++public class PatternSet implements Serializable {++ private static final long serialVersionUID = 1L;++ private final Set<String> includes;++ private final Set<String> excludes;++ public PatternSet(Set<String> includes, Set<String> excludes) {+ this.includes = includes;+ this.excludes = excludes;+ }++ public Set<String> getIncludes() {+ return includes;+ }++ public Set<String> getExcludes() {+ return excludes;+ }++ public boolean matches(Matcher matcher, String value) {+ for (String exclude: excludes) {+ if (matcher.matches(exclude, value))+ return false;+ }+ for (String include: includes) {+ if (matcher.matches(include, value))+ return true;+ }+ if (excludes.isEmpty())+ return false;+ else+ return includes.isEmpty();+ }++ public Collection<File> listFiles(File dir) {+ Collection<File> files = new ArrayList<File>();++ DirectoryScanner scanner = new DirectoryScanner();+ scanner.setBasedir(dir);+ scanner.setIncludes(includes.toArray(new String[0]));+ scanner.setExcludes(excludes.toArray(new String[0]));+ scanner.scan();++ for (String path: scanner.getIncludedFiles())+ files.add(new File(dir, path));++ return files;+ }++ public static PatternSet fromString(@Nullable String patternSetString) {+ Set<String> includes = new HashSet<>();+ Set<String> excludes = new HashSet<>();++ if (patternSetString != null) {+ PatternsContext patterns = parse(patternSetString);++ for (PatternContext pattern: patterns.pattern()) {+ String value;+ if (pattern.Quoted() != null)+ value = FenceAware.unfence(pattern.Quoted().getText());+ else+ value = pattern.NQuoted().getText();+ value = StringUtils.unescape(value);+ if (pattern.Excluded() != null)+ excludes.add(value);+ else+ includes.add(value);+ }+ }++ return new PatternSet(includes, excludes);+ }++ public static PatternsContext parse(String patternSetString) {+ CharStream is = CharStreams.fromString(patternSetString);+ PatternSetLexer lexer = new PatternSetLexer(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 patterns");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ PatternSetParser parser = new PatternSetParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.patterns();+ }++ public static String quoteIfNecessary(String pattern) {+ pattern = StringUtils.escape(pattern, "\"");+ if (pattern.indexOf(" ") != -1 || pattern.startsWith("-"))+ pattern = "\"" + pattern + "\"";+ return pattern;+ }++ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ for (String include: getIncludes())+ builder.append(include).append(" ");+ for (String exclude: getExcludes())+ builder.append("-").append(exclude).append(" ");+ return builder.toString().trim();+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4 b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4index 4e2cd53cb1..9c4c38a665 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.g4@@ -1,17 +1,17 @@-grammar ReviewRequirement;--requirement: ' '* criteria (' '+ criteria)* ' '* EOF;--criteria: userCriteria | groupCriteria;--userCriteria: USER Value;-groupCriteria: GROUP Value (':' count)?;--count: 'all' | DIGIT;--DIGIT: [1-9][0-9]*;--USER: 'user';-GROUP: 'group';--Value: '(' ('\\'[()]|~[()])+? ')';+grammar ReviewRequirement;++requirement: ' '* criteria (' '+ criteria)* ' '* EOF;++criteria: userCriteria | groupCriteria;++userCriteria: USER Value;+groupCriteria: GROUP Value (':' count)?;++count: 'all' | DIGIT;++DIGIT: [1-9][0-9]*;++USER: 'user';+GROUP: 'group';++Value: '(' ('\\'.|~[\\()])+? ')';diff --git a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.javaindex 2830dd3c45..a7b8803a14 100644--- a/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java+++ b/server-core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java@@ -1,204 +1,194 @@-package io.onedev.server.util.reviewrequirement;--import java.util.ArrayList;-import java.util.LinkedHashMap;-import java.util.List;-import java.util.Map;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;-import org.antlr.v4.runtime.tree.TerminalNode;-import org.apache.commons.lang.StringUtils;--import io.onedev.server.OneDev;-import io.onedev.server.OneException;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.User;-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;-import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;--public class ReviewRequirement {-- private final List<User> users;-- private final Map<Group, Integer> groups;-- public ReviewRequirement(List<User> users, Map<Group, Integer> groups) {- this.users = users;- this.groups = groups;- }-- public static ReviewRequirement fromString(@Nullable String requirementString) {- List<User> users = new ArrayList<>();- Map<Group, Integer> groups = new LinkedHashMap<>();-- if (requirementString != null) {- RequirementContext requirement = parse(requirementString);-- for (CriteriaContext criteria: requirement.criteria()) {- if (criteria.userCriteria() != null) {- String userName = getValue(criteria.userCriteria().Value());- User user = OneDev.getInstance(UserManager.class).findByName(userName);- if (user != null) {- if (!users.contains(user)) {- users.add(user);- } else {- throw new OneException("User '" + userName + "' is included multiple times");- }- } else {- throw new OneException("Unable to find user '" + userName + "'");- }- } else if (criteria.groupCriteria() != null) {- String groupName = getValue(criteria.groupCriteria().Value());- Group group = OneDev.getInstance(GroupManager.class).find(groupName);- if (group != null) {- if (!groups.containsKey(group)) {- CountContext count = criteria.groupCriteria().count();- if (count != null) {- if (count.DIGIT() != null)- groups.put(group, Integer.parseInt(count.DIGIT().getText()));- else- groups.put(group, 0);- } else {- groups.put(group, 1);- }- } else {- throw new OneException("Group '" + groupName + "' is included multiple times");- }- } else {- throw new OneException("Unable to find group '" + groupName + "'");- }- }- }- }-- return new ReviewRequirement(users, groups);- }-- public static RequirementContext parse(String requirementString) {- CharStream is = CharStreams.fromString(requirementString);- ReviewRequirementLexer lexer = new ReviewRequirementLexer(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 review requirement");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- ReviewRequirementParser parser = new ReviewRequirementParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.requirement();- }-- private static String getValue(TerminalNode terminal) {- String value = terminal.getText().substring(1);- return unescapeBraces(value.substring(0, value.length()-1).trim());- }-- public static String escapeBraces(String value) {- value = StringUtils.replace(value, ")", "\\)");- return StringUtils.replace(value, "(", "\\(");- }-- public static String unescapeBraces(String value) {- value = StringUtils.replace(value, "\\)", ")");- return StringUtils.replace(value, "\\(", "(");- }-- public List<User> getUsers() {- return users;- }-- public Map<Group, Integer> getGroups() {- return groups;- }-- public boolean satisfied(User user) {- for (User eachUser: users) {- if (!eachUser.equals(user))- return false;- }- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {- Group group = entry.getKey();- int requiredCount = entry.getValue();- if (requiredCount == 0 || requiredCount > group.getMembers().size())- requiredCount = group.getMembers().size();-- if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))- return false;- }- return true;- }-- @Nullable- public static String onRenameGroup(String reviewRequirementString, String oldName, String newName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(oldName))- group.setName(newName);- }- return reviewRequirement.toString();- }-- public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);- for (User user: reviewRequirement.getUsers()) {- if (user.getName().equals(oldName))- user.setName(newName);- }- return reviewRequirement.toString();- }-- public static boolean isUsingUser(String reviewRequirementString, String userName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);- for (User user: reviewRequirement.getUsers()) {- if (user.getName().equals(userName))- return true;- }- return false;- }-- public static boolean isUsingGroup(String reviewRequirementString, String groupName) {- ReviewRequirement reviewRequirement = fromString(reviewRequirementString);- for (Group group: reviewRequirement.getGroups().keySet()) {- if (group.getName().equals(groupName))- return true;- }- return false;- }-- @Nullable- @Override- public String toString() {- StringBuilder builder = new StringBuilder();- for (User user: users)- builder.append("user(").append(ReviewRequirement.escapeBraces(user.getName())).append(") ");- for (Map.Entry<Group, Integer> entry: groups.entrySet()) {- builder.append("group(").append(ReviewRequirement.escapeBraces(entry.getKey().getName())).append(")");- if (entry.getValue() == 0)- builder.append(":all");- else if (entry.getValue() != 1)- builder.append(":").append(entry.getValue());- builder.append(" ");- }- if (builder.length() != 0)- return builder.toString().trim();- else- return null;- }-}+package io.onedev.server.util.reviewrequirement;++import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.List;+import java.util.Map;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CharStream;+import org.antlr.v4.runtime.CharStreams;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;+import org.antlr.v4.runtime.tree.TerminalNode;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.OneException;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Group;+import io.onedev.server.model.User;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CountContext;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.CriteriaContext;+import io.onedev.server.util.reviewrequirement.ReviewRequirementParser.RequirementContext;++public class ReviewRequirement {++ private final List<User> users;++ private final Map<Group, Integer> groups;++ public ReviewRequirement(List<User> users, Map<Group, Integer> groups) {+ this.users = users;+ this.groups = groups;+ }++ public static ReviewRequirement fromString(@Nullable String requirementString) {+ List<User> users = new ArrayList<>();+ Map<Group, Integer> groups = new LinkedHashMap<>();++ if (requirementString != null) {+ RequirementContext requirement = parse(requirementString);++ for (CriteriaContext criteria: requirement.criteria()) {+ if (criteria.userCriteria() != null) {+ String userName = getValue(criteria.userCriteria().Value());+ User user = OneDev.getInstance(UserManager.class).findByName(userName);+ if (user != null) {+ if (!users.contains(user)) {+ users.add(user);+ } else {+ throw new OneException("User '" + userName + "' is included multiple times");+ }+ } else {+ throw new OneException("Unable to find user '" + userName + "'");+ }+ } else if (criteria.groupCriteria() != null) {+ String groupName = getValue(criteria.groupCriteria().Value());+ Group group = OneDev.getInstance(GroupManager.class).find(groupName);+ if (group != null) {+ if (!groups.containsKey(group)) {+ CountContext count = criteria.groupCriteria().count();+ if (count != null) {+ if (count.DIGIT() != null)+ groups.put(group, Integer.parseInt(count.DIGIT().getText()));+ else+ groups.put(group, 0);+ } else {+ groups.put(group, 1);+ }+ } else {+ throw new OneException("Group '" + groupName + "' is included multiple times");+ }+ } else {+ throw new OneException("Unable to find group '" + groupName + "'");+ }+ }+ }+ }++ return new ReviewRequirement(users, groups);+ }++ public static RequirementContext parse(String requirementString) {+ CharStream is = CharStreams.fromString(requirementString);+ ReviewRequirementLexer lexer = new ReviewRequirementLexer(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 review requirement");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ ReviewRequirementParser parser = new ReviewRequirementParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.requirement();+ }++ private static String getValue(TerminalNode terminal) {+ return StringUtils.unescape(FenceAware.unfence(terminal.getText()));+ }++ public List<User> getUsers() {+ return users;+ }++ public Map<Group, Integer> getGroups() {+ return groups;+ }++ public boolean satisfied(User user) {+ for (User eachUser: users) {+ if (!eachUser.equals(user))+ return false;+ }+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {+ Group group = entry.getKey();+ int requiredCount = entry.getValue();+ if (requiredCount == 0 || requiredCount > group.getMembers().size())+ requiredCount = group.getMembers().size();++ if (requiredCount > 1 || requiredCount == 1 && !group.getMembers().contains(user))+ return false;+ }+ return true;+ }++ @Nullable+ public static String onRenameGroup(String reviewRequirementString, String oldName, String newName) {+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ for (Group group: reviewRequirement.getGroups().keySet()) {+ if (group.getName().equals(oldName))+ group.setName(newName);+ }+ return reviewRequirement.toString();+ }++ public static String onRenameUser(String reviewRequirementString, String oldName, String newName) {+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ for (User user: reviewRequirement.getUsers()) {+ if (user.getName().equals(oldName))+ user.setName(newName);+ }+ return reviewRequirement.toString();+ }++ public static boolean isUsingUser(String reviewRequirementString, String userName) {+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ for (User user: reviewRequirement.getUsers()) {+ if (user.getName().equals(userName))+ return true;+ }+ return false;+ }++ public static boolean isUsingGroup(String reviewRequirementString, String groupName) {+ ReviewRequirement reviewRequirement = fromString(reviewRequirementString);+ for (Group group: reviewRequirement.getGroups().keySet()) {+ if (group.getName().equals(groupName))+ return true;+ }+ return false;+ }++ @Nullable+ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ for (User user: users)+ builder.append("user(").append(StringUtils.escape(user.getName(), "()")).append(") ");+ for (Map.Entry<Group, Integer> entry: groups.entrySet()) {+ builder.append("group(").append(StringUtils.escape(entry.getKey().getName(), "()")).append(")");+ if (entry.getValue() == 0)+ builder.append(":all");+ else if (entry.getValue() != 1)+ builder.append(":").append(entry.getValue());+ builder.append(" ");+ }+ if (builder.length() != 0)+ return builder.toString().trim();+ else+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.javaindex 77a79d3340..dc972d6f76 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedGroup.java@@ -1,37 +1,38 @@-package io.onedev.server.util.usermatcher;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.model.Group;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;--public class SpecifiedGroup implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- private String groupName;-- public String getGroupName() {- return groupName;- }-- public void setGroupName(String groupName) {- this.groupName = groupName;- }-- @Override- public boolean matches(Project project, User user) {- GroupManager groupManager = OneDev.getInstance(GroupManager.class);- Group group = Preconditions.checkNotNull(groupManager.find(groupName));- return group.getMembers().contains(user);- }-- @Override- public String toString() {- return "group(" + UserMatcher.escape(groupName) + ")";- }--}+package io.onedev.server.util.usermatcher;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;+import io.onedev.server.model.Group;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;++public class SpecifiedGroup implements UserMatcherCriteria {++ private static final long serialVersionUID = 1L;++ private String groupName;++ public String getGroupName() {+ return groupName;+ }++ public void setGroupName(String groupName) {+ this.groupName = groupName;+ }++ @Override+ public boolean matches(Project project, User user) {+ GroupManager groupManager = OneDev.getInstance(GroupManager.class);+ Group group = Preconditions.checkNotNull(groupManager.find(groupName));+ return group.getMembers().contains(user);+ }++ @Override+ public String toString() {+ return "group(" + StringUtils.escape(groupName, "()") + ")";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.javaindex adce188f55..88b526554a 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/SpecifiedUser.java@@ -1,36 +1,37 @@-package io.onedev.server.util.usermatcher;--import com.google.common.base.Preconditions;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;--public class SpecifiedUser implements UserMatcherCriteria {-- private static final long serialVersionUID = 1L;-- private String userName;-- public String getUserName() {- return userName;- }-- public void setUserName(String userName) {- this.userName = userName;- }-- @Override- public boolean matches(Project project, User user) {- UserManager userManager = OneDev.getInstance(UserManager.class);- User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName));- return specifiedUser.equals(user);- }-- @Override- public String toString() {- return "user(" + UserMatcher.escape(userName) + ")";- }--}+package io.onedev.server.util.usermatcher;++import com.google.common.base.Preconditions;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;++public class SpecifiedUser implements UserMatcherCriteria {++ private static final long serialVersionUID = 1L;++ private String userName;++ public String getUserName() {+ return userName;+ }++ public void setUserName(String userName) {+ this.userName = userName;+ }++ @Override+ public boolean matches(Project project, User user) {+ UserManager userManager = OneDev.getInstance(UserManager.class);+ User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName));+ return specifiedUser.equals(user);+ }++ @Override+ public String toString() {+ return "user(" + StringUtils.escape(userName, "()") + ")";+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4 b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4index d2c2166114..71fcebbbae 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.g4@@ -1,81 +1,75 @@-grammar UserMatcher;--userMatcher- : WS* criteria (WS+ OR WS+ criteria)* (WS+ EXCEPT WS+ exceptCriteria (WS+ AND WS+ exceptCriteria)*)? WS* EOF- ;--criteria- : Anyone- | ProjectAdministrators- | CodeWriters- | CodeReaders- | IssueReaders- | userCriteria- | groupCriteria- ;--exceptCriteria- : criteria- ;--Anyone- : 'anyone'- ;--ProjectAdministrators- : 'project' WS+ 'administrators'- ;--CodeWriters- : 'code' WS+ 'writers'- ;--CodeReaders- : 'code' WS+ 'readers'- ;--IssueReaders- : 'issue' WS+ 'readers'- ;--userCriteria- : USER Value- ;--groupCriteria- : GROUP Value- ;--AND- : 'and'- ;--OR- : 'or'- ;--USER- : 'user'- ;--GROUP- : 'group'- ;--EXCEPT- : 'except'- ;--WS- : ' '- ;--Value- : '(' (ESCAPE|~[()\\])+? ')'- ;--fragment--ESCAPE- : '\\'[()\\]- ;+grammar UserMatcher;++userMatcher+ : WS* criteria (WS+ OR WS+ criteria)* (WS+ EXCEPT WS+ exceptCriteria (WS+ AND WS+ exceptCriteria)*)? WS* EOF+ ;++criteria+ : Anyone+ | ProjectAdministrators+ | CodeWriters+ | CodeReaders+ | IssueReaders+ | userCriteria+ | groupCriteria+ ;++exceptCriteria+ : criteria+ ;++Anyone+ : 'anyone'+ ;++ProjectAdministrators+ : 'project' WS+ 'administrators'+ ;++CodeWriters+ : 'code' WS+ 'writers'+ ;++CodeReaders+ : 'code' WS+ 'readers'+ ;++IssueReaders+ : 'issue' WS+ 'readers'+ ;++userCriteria+ : USER Value+ ;++groupCriteria+ : GROUP Value+ ;++AND+ : 'and'+ ;++OR+ : 'or'+ ;++USER+ : 'user'+ ;++GROUP+ : 'group'+ ;++EXCEPT+ : 'except'+ ;++WS+ : ' '+ ;++Value+ : '(' ('\\'.|~[()\\])+? ')'+ ;diff --git a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.javaindex 77e282c775..ab6d3c6ab3 100644--- a/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java+++ b/server-core/src/main/java/io/onedev/server/util/usermatcher/UserMatcher.java@@ -1,235 +1,216 @@-package io.onedev.server.util.usermatcher;--import java.io.Serializable;-import java.util.ArrayList;-import java.util.List;-import java.util.stream.Collectors;--import javax.annotation.Nullable;--import org.antlr.v4.runtime.BailErrorStrategy;-import org.antlr.v4.runtime.BaseErrorListener;-import org.antlr.v4.runtime.CharStream;-import org.antlr.v4.runtime.CharStreams;-import org.antlr.v4.runtime.CommonTokenStream;-import org.antlr.v4.runtime.RecognitionException;-import org.antlr.v4.runtime.Recognizer;--import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneException;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.util.usermatcher.UserMatcherParser.CriteriaContext;-import io.onedev.server.util.usermatcher.UserMatcherParser.ExceptCriteriaContext;-import io.onedev.server.util.usermatcher.UserMatcherParser.UserMatcherContext;--public class UserMatcher implements Serializable {-- private static final long serialVersionUID = 1L;-- public static final String ESCAPE_CHARS = "\\()";-- private final List<UserMatcherCriteria> criterias;-- private final List<UserMatcherCriteria> exceptCriterias;-- public UserMatcher(List<UserMatcherCriteria> criterias, List<UserMatcherCriteria> exceptCriterias) {- this.criterias = criterias;- this.exceptCriterias = exceptCriterias;- }-- public List<UserMatcherCriteria> getCriterias() {- return criterias;- }-- public List<UserMatcherCriteria> getExceptCriterias() {- return exceptCriterias;- }-- public boolean matches(Project project, User user) {- for (UserMatcherCriteria criteria: exceptCriterias) {- if (criteria.matches(project, user))- return false;- }- for (UserMatcherCriteria criteria: criterias) {- if (criteria.matches(project, user))- return true;- }- return false;- }-- private static UserMatcherCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {- if (criteriaContext.Anyone() != null) {- return new Anyone();- } else if (criteriaContext.ProjectAdministrators() != null) {- return new ProjectAdministrators();- } else if (criteriaContext.CodeWriters() != null) {- return new CodeWriters();- } else if (criteriaContext.CodeReaders() != null) {- return new CodeReaders();- } else if (criteriaContext.IssueReaders() != null) {- return new IssueReaders();- } else if (criteriaContext.userCriteria() != null) {- String userName = unescape(removeParens(criteriaContext.userCriteria().Value().getText()));- SpecifiedUser specifiedUser = new SpecifiedUser();- specifiedUser.setUserName(userName);- return specifiedUser;- } else if (criteriaContext.groupCriteria() != null) {- String groupName = unescape(removeParens(criteriaContext.groupCriteria().Value().getText()));- SpecifiedGroup specifiedGroup = new SpecifiedGroup();- specifiedGroup.setGroupName(groupName);- return specifiedGroup;- } else {- throw new OneException("Unrecognized user matcher criteria");- }- }-- public static UserMatcher fromString(@Nullable String userMatcherString) {- List<UserMatcherCriteria> criterias = new ArrayList<>();- List<UserMatcherCriteria> exceptCriterias = new ArrayList<>();-- if (userMatcherString != null) {- UserMatcherContext userMatcherContext = parse(userMatcherString);-- for (CriteriaContext criteriaContext: userMatcherContext.criteria())- criterias.add(getUserMatcherCriteria(criteriaContext));-- for (ExceptCriteriaContext exceptCriteriaContext: userMatcherContext.exceptCriteria()) {- exceptCriterias.add(getUserMatcherCriteria(exceptCriteriaContext.criteria()));- }- }-- return new UserMatcher(criterias, exceptCriterias);- }-- public static String unescape(String value) {- return value.replace("\\(", "(").replace("\\)", ")").replace("\\\\", "\\");- }-- public static String removeParens(String value) {- if (value.startsWith("("))- value = value.substring(1);- if (value.endsWith(")"))- value = value.substring(0, value.length()-1);- return value;- }-- public static UserMatcherContext parse(String userMatcherString) {- CharStream is = CharStreams.fromString(userMatcherString);- UserMatcherLexer lexer = new UserMatcherLexer(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 user matcher");- }-- });- CommonTokenStream tokens = new CommonTokenStream(lexer);- UserMatcherParser parser = new UserMatcherParser(tokens);- parser.removeErrorListeners();- parser.setErrorHandler(new BailErrorStrategy());- return parser.userMatcher();- }-- public static String escape(String value) {- StringBuilder builder = new StringBuilder();- for (int i=0; i<value.length(); i++) {- char ch = value.charAt(i);- if (ESCAPE_CHARS.indexOf(ch) != -1)- builder.append("\\");- builder.append(ch);- }- return builder.toString();- }-- @Override- public String toString() {- StringBuilder builder = new StringBuilder();- List<String> criteriaStrings = criterias.stream().map(it->it.toString()).collect(Collectors.toList());- builder.append(StringUtils.join(criteriaStrings, " or "));-- if (!exceptCriterias.isEmpty()) {- List<String> exceptCriteriaStrings = exceptCriterias.stream().map(it->it.toString()).collect(Collectors.toList());- if (builder.length() != 0)- builder.append(" ");- builder.append("except ").append(StringUtils.join(exceptCriteriaStrings, " and "));- }-- if (builder.length() != 0)- return builder.toString();- else- return new Anyone().toString();- }-- private static void onRenameGroup(List<UserMatcherCriteria> criterias, String oldName, String newName) {- for (UserMatcherCriteria criteria: criterias) {- if (criteria instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;- if (specifiedGroup.getGroupName().equals(oldName))- specifiedGroup.setGroupName(newName);- }- }- }-- public static String onRenameGroup(String userMatcherString, String oldName, String newName) {- UserMatcher userMatcher = fromString(userMatcherString);- onRenameGroup(userMatcher.getCriterias(), oldName, newName);- onRenameGroup(userMatcher.getExceptCriterias(), oldName, newName);- return userMatcher.toString();- }-- private static void onRenameUser(List<UserMatcherCriteria> criterias, String oldName, String newName) {- for (UserMatcherCriteria criteria: criterias) {- if (criteria instanceof SpecifiedUser) {- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;- if (specifiedUser.getUserName().equals(oldName))- specifiedUser.setUserName(newName);- }- }- }-- public static String onRenameUser(String userMatcherString, String oldName, String newName) {- UserMatcher userMatcher = fromString(userMatcherString);- onRenameUser(userMatcher.getCriterias(), oldName, newName);- onRenameUser(userMatcher.getExceptCriterias(), oldName, newName);- return userMatcher.toString();- }-- private static boolean isUsingUser(List<UserMatcherCriteria> criterias, String userName) {- for (UserMatcherCriteria criteria: criterias) {- if (criteria instanceof SpecifiedUser) {- SpecifiedUser specifiedUser = (SpecifiedUser) criteria;- if (specifiedUser.getUserName().equals(userName))- return true;- }- }- return false;- }-- public static boolean isUsingUser(String userMatcherString, String userName) {- UserMatcher userMatcher = fromString(userMatcherString);- return isUsingUser(userMatcher.getCriterias(), userName)- || isUsingUser(userMatcher.getExceptCriterias(), userName);- }-- private static boolean isUsingGroup(List<UserMatcherCriteria> criterias, String groupName) {- for (UserMatcherCriteria criteria: criterias) {- if (criteria instanceof SpecifiedGroup) {- SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;- if (specifiedGroup.getGroupName().equals(groupName))- return true;- }- }- return false;- }-- public static boolean isUsingGroup(String userMatcherString, String groupName) {- UserMatcher userMatcher = fromString(userMatcherString);- return isUsingGroup(userMatcher.getCriterias(), groupName)- || isUsingGroup(userMatcher.getExceptCriterias(), groupName);- }--}+package io.onedev.server.util.usermatcher;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import java.util.stream.Collectors;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CharStream;+import org.antlr.v4.runtime.CharStreams;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;+import org.antlr.v4.runtime.tree.TerminalNode;++import io.onedev.commons.codeassist.FenceAware;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneException;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.util.usermatcher.UserMatcherParser.CriteriaContext;+import io.onedev.server.util.usermatcher.UserMatcherParser.ExceptCriteriaContext;+import io.onedev.server.util.usermatcher.UserMatcherParser.UserMatcherContext;++public class UserMatcher implements Serializable {++ private static final long serialVersionUID = 1L;++ private final List<UserMatcherCriteria> criterias;++ private final List<UserMatcherCriteria> exceptCriterias;++ public UserMatcher(List<UserMatcherCriteria> criterias, List<UserMatcherCriteria> exceptCriterias) {+ this.criterias = criterias;+ this.exceptCriterias = exceptCriterias;+ }++ public List<UserMatcherCriteria> getCriterias() {+ return criterias;+ }++ public List<UserMatcherCriteria> getExceptCriterias() {+ return exceptCriterias;+ }++ public boolean matches(Project project, User user) {+ for (UserMatcherCriteria criteria: exceptCriterias) {+ if (criteria.matches(project, user))+ return false;+ }+ for (UserMatcherCriteria criteria: criterias) {+ if (criteria.matches(project, user))+ return true;+ }+ return false;+ }++ private static UserMatcherCriteria getUserMatcherCriteria(CriteriaContext criteriaContext) {+ if (criteriaContext.Anyone() != null) {+ return new Anyone();+ } else if (criteriaContext.ProjectAdministrators() != null) {+ return new ProjectAdministrators();+ } else if (criteriaContext.CodeWriters() != null) {+ return new CodeWriters();+ } else if (criteriaContext.CodeReaders() != null) {+ return new CodeReaders();+ } else if (criteriaContext.IssueReaders() != null) {+ return new IssueReaders();+ } else if (criteriaContext.userCriteria() != null) {+ String userName = getValue(criteriaContext.userCriteria().Value());+ SpecifiedUser specifiedUser = new SpecifiedUser();+ specifiedUser.setUserName(userName);+ return specifiedUser;+ } else if (criteriaContext.groupCriteria() != null) {+ String groupName = getValue(criteriaContext.groupCriteria().Value());+ SpecifiedGroup specifiedGroup = new SpecifiedGroup();+ specifiedGroup.setGroupName(groupName);+ return specifiedGroup;+ } else {+ throw new OneException("Unrecognized user matcher criteria");+ }+ }++ public static UserMatcher fromString(@Nullable String userMatcherString) {+ List<UserMatcherCriteria> criterias = new ArrayList<>();+ List<UserMatcherCriteria> exceptCriterias = new ArrayList<>();++ if (userMatcherString != null) {+ UserMatcherContext userMatcherContext = parse(userMatcherString);++ for (CriteriaContext criteriaContext: userMatcherContext.criteria())+ criterias.add(getUserMatcherCriteria(criteriaContext));++ for (ExceptCriteriaContext exceptCriteriaContext: userMatcherContext.exceptCriteria()) {+ exceptCriterias.add(getUserMatcherCriteria(exceptCriteriaContext.criteria()));+ }+ }++ return new UserMatcher(criterias, exceptCriterias);+ }++ private static String getValue(TerminalNode terminal) {+ return StringUtils.unescape(FenceAware.unfence(terminal.getText()));+ }++ public static UserMatcherContext parse(String userMatcherString) {+ CharStream is = CharStreams.fromString(userMatcherString);+ UserMatcherLexer lexer = new UserMatcherLexer(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 user matcher");+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ UserMatcherParser parser = new UserMatcherParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ return parser.userMatcher();+ }++ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ List<String> criteriaStrings = criterias.stream().map(it->it.toString()).collect(Collectors.toList());+ builder.append(StringUtils.join(criteriaStrings, " or "));++ if (!exceptCriterias.isEmpty()) {+ List<String> exceptCriteriaStrings = exceptCriterias.stream().map(it->it.toString()).collect(Collectors.toList());+ if (builder.length() != 0)+ builder.append(" ");+ builder.append("except ").append(StringUtils.join(exceptCriteriaStrings, " and "));+ }++ if (builder.length() != 0)+ return builder.toString();+ else+ return new Anyone().toString();+ }++ private static void onRenameGroup(List<UserMatcherCriteria> criterias, String oldName, String newName) {+ for (UserMatcherCriteria criteria: criterias) {+ if (criteria instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;+ if (specifiedGroup.getGroupName().equals(oldName))+ specifiedGroup.setGroupName(newName);+ }+ }+ }++ public static String onRenameGroup(String userMatcherString, String oldName, String newName) {+ UserMatcher userMatcher = fromString(userMatcherString);+ onRenameGroup(userMatcher.getCriterias(), oldName, newName);+ onRenameGroup(userMatcher.getExceptCriterias(), oldName, newName);+ return userMatcher.toString();+ }++ private static void onRenameUser(List<UserMatcherCriteria> criterias, String oldName, String newName) {+ for (UserMatcherCriteria criteria: criterias) {+ if (criteria instanceof SpecifiedUser) {+ SpecifiedUser specifiedUser = (SpecifiedUser) criteria;+ if (specifiedUser.getUserName().equals(oldName))+ specifiedUser.setUserName(newName);+ }+ }+ }++ public static String onRenameUser(String userMatcherString, String oldName, String newName) {+ UserMatcher userMatcher = fromString(userMatcherString);+ onRenameUser(userMatcher.getCriterias(), oldName, newName);+ onRenameUser(userMatcher.getExceptCriterias(), oldName, newName);+ return userMatcher.toString();+ }++ private static boolean isUsingUser(List<UserMatcherCriteria> criterias, String userName) {+ for (UserMatcherCriteria criteria: criterias) {+ if (criteria instanceof SpecifiedUser) {+ SpecifiedUser specifiedUser = (SpecifiedUser) criteria;+ if (specifiedUser.getUserName().equals(userName))+ return true;+ }+ }+ return false;+ }++ public static boolean isUsingUser(String userMatcherString, String userName) {+ UserMatcher userMatcher = fromString(userMatcherString);+ return isUsingUser(userMatcher.getCriterias(), userName)+ || isUsingUser(userMatcher.getExceptCriterias(), userName);+ }++ private static boolean isUsingGroup(List<UserMatcherCriteria> criterias, String groupName) {+ for (UserMatcherCriteria criteria: criterias) {+ if (criteria instanceof SpecifiedGroup) {+ SpecifiedGroup specifiedGroup = (SpecifiedGroup) criteria;+ if (specifiedGroup.getGroupName().equals(groupName))+ return true;+ }+ }+ return false;+ }++ public static boolean isUsingGroup(String userMatcherString, String groupName) {+ UserMatcher userMatcher = fromString(userMatcherString);+ return isUsingGroup(userMatcher.getCriterias(), groupName)+ || isUsingGroup(userMatcher.getExceptCriterias(), groupName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.javaindex 40acc7560b..b382f0a645 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/CommitHashValidator.java@@ -6,6 +6,7 @@ import javax.validation.ConstraintValidatorContext;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.interpolative.Segment;import io.onedev.server.util.validation.annotation.CommitHash;public class CommitHashValidator implements ConstraintValidator<CommitHash, String> {@@ -22,9 +23,7 @@ public class CommitHashValidator implements ConstraintValidator<CommitHash, Stri@Overridepublic boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null)- return true;- if (interpolative && !Interpolated.get() && !Interpolative.fromString(value).getSegments().isEmpty())+ if (value == null || interpolative && !Interpolated.get() && !Interpolative.fromString(value).getSegments(Segment.Type.VARIABLE).isEmpty())return true;if (!ObjectId.isId(value)) {diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.javaindex bcf95bb0dc..3814e855bd 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java@@ -8,6 +8,7 @@ import javax.validation.ConstraintValidatorContext;import io.onedev.commons.launcher.bootstrap.Bootstrap;import io.onedev.commons.utils.FileUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.Directory;@@ -26,14 +27,14 @@ public class DirectoryValidator implements ConstraintValidator<Directory, Stringreturn true;if (annotation.interpolative() && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.javaindex 9198c2345d..21dda64349 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/DnsNameValidator.java@@ -6,6 +6,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.DnsName;@@ -28,14 +29,14 @@ public class DnsNameValidator implements ConstraintValidator<DnsName, String> {return true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.javaindex 430782d2d3..a67be42d26 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java@@ -5,6 +5,7 @@ import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.GroupName;@@ -26,14 +27,14 @@ public class GroupNameValidator implements ConstraintValidator<GroupName, Stringreturn true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.javaindex 90b8231578..a060ab7186 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/InterpolativeValidator.java@@ -38,7 +38,7 @@ public class InterpolativeValidator implements ConstraintValidator<InterpolativeconstraintContext.disableDefaultConstraintViolation();String message = this.message;if (message.length() == 0)- message = "Malformed interpolative";+ message = "Malformed interpolative: please make sure '@' and '\\' is escaped appropriately";constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();return false;}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.javaindex fcb6d29161..1e4199695e 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/NumericValidator.java@@ -5,6 +5,7 @@ import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.web.editable.annotation.Numeric;@@ -25,14 +26,14 @@ public class NumericValidator implements ConstraintValidator<Numeric, String> {return true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "1";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.javaindex fc03ababa3..71782fcfab 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathSegmentValidator.java@@ -1,66 +1,67 @@-package io.onedev.server.util.validation;--import java.nio.file.Paths;-import java.util.function.Function;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import io.onedev.server.util.interpolative.Interpolative;-import io.onedev.server.util.validation.annotation.PathSegment;--public class PathSegmentValidator implements ConstraintValidator<PathSegment, String> {-- private boolean interpolative;-- private String message;-- @Override- public void initialize(PathSegment constaintAnnotation) {- interpolative = constaintAnnotation.interpolative();- message = constaintAnnotation.message();- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null)- return true;-- if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {-- @Override- public String apply(String t) {- return "a";- }-- });- } catch (Exception e) {- return true; // will be handled by interpolative validator- }-- boolean valid = true;- String message = this.message;- if (value.contains("/") || value.contains("\\")) {- valid = false;- if (message.length() == 0)- message = "Slash and back slash characters are not allowed";- } else {- try {- Paths.get(value);- } catch (Exception e) {- valid = false;- if (message.length() == 0)- message = e.getMessage();- }- }-- if (!valid) {- constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- }-- return true;- }-}+package io.onedev.server.util.validation;++import java.nio.file.Paths;+import java.util.function.Function;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.validation.annotation.PathSegment;++public class PathSegmentValidator implements ConstraintValidator<PathSegment, String> {++ private boolean interpolative;++ private String message;++ @Override+ public void initialize(PathSegment constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (interpolative && !Interpolated.get()) try {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ }));+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }++ boolean valid = true;+ String message = this.message;+ if (value.contains("/") || value.contains("\\")) {+ valid = false;+ if (message.length() == 0)+ message = "Slash and back slash characters are not allowed";+ } else {+ try {+ Paths.get(value);+ } catch (Exception e) {+ valid = false;+ if (message.length() == 0)+ message = e.getMessage();+ }+ }++ if (!valid) {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }++ return true;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.javaindex 31fdddb4b5..10d9402b5a 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/PathValidator.java@@ -1,50 +1,51 @@-package io.onedev.server.util.validation;--import java.nio.file.Paths;-import java.util.function.Function;--import javax.validation.ConstraintValidator;-import javax.validation.ConstraintValidatorContext;--import io.onedev.server.util.interpolative.Interpolative;-import io.onedev.server.util.validation.annotation.Path;--public class PathValidator implements ConstraintValidator<Path, String> {-- private boolean interpolative;-- private String message;-- @Override- public void initialize(Path constaintAnnotation) {- interpolative = constaintAnnotation.interpolative();- message = constaintAnnotation.message();- }-- @Override- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {- if (value == null)- return true;-- if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {-- @Override- public String apply(String t) {- return "a";- }-- });- } catch (Exception e) {- return true; // will be handled by interpolative validator- }- try {- Paths.get(value);- return true;- } catch (Exception e) {- constraintContext.disableDefaultConstraintViolation();- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();- return false;- }- }-}+package io.onedev.server.util.validation;++import java.nio.file.Paths;+import java.util.function.Function;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.commons.utils.StringUtils;+import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.util.validation.annotation.Path;++public class PathValidator implements ConstraintValidator<Path, String> {++ private boolean interpolative;++ private String message;++ @Override+ public void initialize(Path constaintAnnotation) {+ interpolative = constaintAnnotation.interpolative();+ message = constaintAnnotation.message();+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null)+ return true;++ if (interpolative && !Interpolated.get()) try {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {++ @Override+ public String apply(String t) {+ return "a";+ }++ }));+ } catch (Exception e) {+ return true; // will be handled by interpolative validator+ }+ try {+ Paths.get(value);+ return true;+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ }+}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.javaindex 644aba3a85..5c409aec82 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java@@ -6,6 +6,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.ProjectName;@@ -29,14 +30,14 @@ public class ProjectNameValidator implements ConstraintValidator<ProjectName, Streturn true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.javaindex 32b699bebf..e07e5b3ae8 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/RegExValidator.java@@ -6,6 +6,7 @@ import java.util.regex.Pattern;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.RegEx;@@ -30,14 +31,14 @@ public class RegExValidator implements ConstraintValidator<RegEx, String> {return true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.javaindex 92c7bd4c99..05b1304b0d 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java@@ -5,6 +5,7 @@ import java.util.function.Function;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.UserName;@@ -26,14 +27,14 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>return true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.javaindex 6e92e4f4ce..d510c3356d 100644--- a/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java+++ b/server-core/src/main/java/io/onedev/server/util/validation/VariableNameValidator.java@@ -6,6 +6,7 @@ import javax.lang.model.SourceVersion;import javax.validation.ConstraintValidator;import javax.validation.ConstraintValidatorContext;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.Interpolative;import io.onedev.server.util.validation.annotation.VariableName;@@ -27,14 +28,14 @@ public class VariableNameValidator implements ConstraintValidator<VariableName,return true;if (interpolative && !Interpolated.get()) try {- value = Interpolative.fromString(value).interpolateWith(new Function<String, String>() {+ value = StringUtils.unescape(Interpolative.fromString(value).interpolateWith(new Function<String, String>() {@Overridepublic String apply(String t) {return "a";}- });+ }));} catch (Exception e) {return true; // will be handled by interpolative validator}diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 59e243a9d7..a9d79568e4 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -108,7 +108,7 @@ public class OneUrlMapper extends CompoundRequestMapper {addMyPages();addAdministrationPages();addSecurityPages();-+addResources();}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex 52f0477dad..4ec33dcd28 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -2,9 +2,7 @@ package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;-import java.util.stream.Collectors;-import org.apache.commons.collections4.CollectionUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -54,10 +52,6 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return projectModel.getObject();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());- }-private CacheManager getCacheManager() {return OneDev.getInstance(CacheManager.class);}@@ -67,22 +61,19 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if (spec.getRuleName().equals("Quoted")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = BuildQuery.unescapeQuotes(matchWith.toLowerCase());- List<InputSuggestion> suggestions = new ArrayList<>();Project project = getProject();-if ("criteriaField".equals(spec.getLabel())) {List<String> fields = new ArrayList<>(BuildConstants.QUERY_FIELDS);List<String> paramNames = new ArrayList<>(getCacheManager().getBuildParamNames());Collections.sort(paramNames);fields.addAll(paramNames);- suggestions.addAll(escape(SuggestionUtils.suggest(fields, normalizedMatchWith)));+ return SuggestionUtils.suggest(fields, matchWith);} else if ("orderField".equals(spec.getLabel())) {- suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), normalizedMatchWith)));+ return SuggestionUtils.suggest(new ArrayList<>(BuildConstants.ORDER_FIELDS.keySet()), matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -91,13 +82,13 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {int operator = BuildQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy)- suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));+ return SuggestionUtils.suggestUsers(matchWith);else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));+ return SuggestionUtils.suggestBuilds(project, matchWith);else if (operator == BuildQueryLexer.FixedIssue)- suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, normalizedMatchWith)));+ return SuggestionUtils.suggestIssues(project, matchWith);else- suggestions.addAll(escape(SuggestionUtils.suggestPullRequests(project, normalizedMatchWith)));+ return SuggestionUtils.suggestPullRequests(project, matchWith);} else {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());try {@@ -106,24 +97,23 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {|| fieldName.equals(BuildConstants.FIELD_QUEUEING_DATE)|| fieldName.equals(BuildConstants.FIELD_RUNNING_DATE)|| fieldName.equals(BuildConstants.FIELD_FINISH_DATE)) {- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES,- normalizedMatchWith));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty()? suggestions: null;} else if (fieldName.equals(BuildConstants.FIELD_JOB)) {- suggestions.addAll(escape(SuggestionUtils.suggestJobs(projectModel.getObject(), normalizedMatchWith)));+ return SuggestionUtils.suggestJobs(projectModel.getObject(), matchWith);} else if (fieldName.equals(BuildConstants.FIELD_NUMBER)) {- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));+ return SuggestionUtils.suggestBuilds(project, matchWith);} else {List<String> paramValues = new ArrayList<>(getCacheManager().getBuildParamValues(fieldName));Collections.sort(paramValues);- suggestions.addAll(escape(SuggestionUtils.suggest(paramValues, normalizedMatchWith)));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(paramValues, matchWith);+ return !suggestions.isEmpty()? suggestions: null;}} catch (OneException ex) {}}}- return suggestions;+ return new ArrayList<>();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.javaindex 64ce902135..75e26dd38a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java@@ -2,9 +2,7 @@ package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;-import java.util.stream.Collectors;-import org.apache.commons.collections4.CollectionUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -23,7 +21,6 @@ import io.onedev.server.model.Project;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer;import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser;-import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.util.CodeCommentConstants;import io.onedev.server.util.DateUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -49,27 +46,20 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {return projectModel.getObject();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());- }-@Overrideprotected 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(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = PullRequestQuery.unescapeQuotes(matchWith.toLowerCase());- List<InputSuggestion> suggestions = new ArrayList<>();Project project = getProject();-if ("criteriaField".equals(spec.getLabel())) {- suggestions.addAll(escape(SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, normalizedMatchWith)));+ return SuggestionUtils.suggest(CodeCommentConstants.QUERY_FIELDS, matchWith);} else if ("orderField".equals(spec.getLabel())) {- suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), normalizedMatchWith)));+ return SuggestionUtils.suggest(new ArrayList<>(CodeCommentConstants.ORDER_FIELDS.keySet()), matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -77,20 +67,20 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = CodeCommentQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == CodeCommentQueryLexer.CreatedBy) {- suggestions.addAll(SuggestionUtils.suggestUsers(normalizedMatchWith));- } else {+ if (operator == CodeCommentQueryLexer.CreatedBy)+ return SuggestionUtils.suggestUsers(matchWith);+ elsereturn null;- }} else {String fieldName = CodeCommentQuery.getValue(fieldElements.get(0).getMatchedText());try {CodeCommentQuery.checkField(project, fieldName, operator);- if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE) || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));+ if (fieldName.equals(CodeCommentConstants.FIELD_CREATE_DATE)+ || fieldName.equals(CodeCommentConstants.FIELD_UPDATE_DATE)) {+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty()? suggestions: null;} else if (fieldName.equals(CodeCommentConstants.FIELD_PATH)) {- suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), normalizedMatchWith)));+ return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);} else {return null;}@@ -98,7 +88,7 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {}}}- return suggestions;+ return new ArrayList<>();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.javaindex c45425ee46..3507d6408d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java@@ -4,9 +4,7 @@ import java.util.ArrayList;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.stream.Collectors;-import org.apache.commons.collections4.CollectionUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -28,7 +26,6 @@ import io.onedev.server.git.NameAndEmail;import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQueryParser;import io.onedev.server.util.Constants;-import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -53,33 +50,24 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {projectModel.detach();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("()")).collect(Collectors.toList());- }-@Overrideprotected 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(), "(", ")") {+ return new FenceAware(codeAssist.getGrammar(), '(', ')') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = ReviewRequirement.unescapeBraces(matchWith.toLowerCase());int tokenType = terminalExpect.getState().getLastMatchedToken().getType();- List<InputSuggestion> suggestions = new ArrayList<>();Project project = projectModel.getObject();switch (tokenType) {case CommitQueryParser.BRANCH:- suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, normalizedMatchWith)));- break;+ return SuggestionUtils.suggestBranches(project, matchWith);case CommitQueryParser.TAG:- suggestions.addAll(escape(SuggestionUtils.suggestTags(project, normalizedMatchWith)));- break;+ return SuggestionUtils.suggestTags(project, matchWith);case CommitQueryParser.BUILD:- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));- break;+ return SuggestionUtils.suggestBuilds(project, matchWith);case CommitQueryParser.AUTHOR:case CommitQueryParser.COMMITTER:Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();@@ -92,29 +80,27 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {elsecontent = user.getName();content = content.trim();- PatternApplied applied = WildcardUtils.applyPattern(normalizedMatchWith, content, false);+ PatternApplied applied = WildcardUtils.applyPattern(matchWith, content, false);if (applied != null)suggestedInputs.put(applied.getText(), applied.getMatch());}+ List<InputSuggestion> suggestions = new ArrayList<>();for (Map.Entry<String, LinearRange> entry: suggestedInputs.entrySet())- suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()).escape("()"));- break;+ suggestions.add(new InputSuggestion(entry.getKey(), -1, null, entry.getValue()));+ return suggestions;case CommitQueryParser.BEFORE:case CommitQueryParser.AFTER:List<String> candidates = new ArrayList<>(DATE_EXAMPLES);candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));- suggestions.addAll(SuggestionUtils.suggest(candidates, normalizedMatchWith));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));- break;+ suggestions = SuggestionUtils.suggest(candidates, matchWith);+ return !suggestions.isEmpty()? suggestions: null;case CommitQueryParser.PATH:- suggestions.addAll(escape(SuggestionUtils.suggestBlobs(projectModel.getObject(), normalizedMatchWith)));- break;+ return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);default:return null;}- return suggestions;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.javaindex eece8e386b..ee8ed6e720 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativeAssistBehavior.java@@ -1,12 +1,9 @@package io.onedev.server.web.behavior;-import java.util.HashSet;+import java.util.ArrayList;import java.util.List;-import java.util.Set;import java.util.stream.Collectors;-import org.antlr.v4.runtime.Token;-import com.google.common.base.Optional;import com.google.common.collect.Lists;@@ -15,8 +12,7 @@ import io.onedev.commons.codeassist.InputSuggestion;import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.util.interpolative.Interpolative;-import io.onedev.server.util.interpolative.InterpolativeLexer;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.interpolative.InterpolativeParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -30,32 +26,15 @@ public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {@Overrideprotected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {- String mark = String.valueOf(Interpolative.MARK);LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();- Set<String> matches = new HashSet<>();- for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {- if (token.getType() == InterpolativeLexer.Variable)- matches.add(Interpolative.unescape(token.getText()));- }-String unmatched = terminalExpect.getUnmatchedText();- if (spec.getRuleName().equals("Variable") && unmatched.startsWith(mark)) {- return new FenceAware(codeAssist.getGrammar(), mark, mark) {+ if (spec.getRuleName().equals("Variable") && unmatched.startsWith("@")) {+ return new FenceAware(codeAssist.getGrammar(), '@', '@') {@Override- protected List<InputSuggestion> match(String unfencedMatchWith) {- List<InputSuggestion> suggestions = suggestVariables(unfencedMatchWith)- .stream()- .filter(it->!matches.contains(it.getContent()))- .collect(Collectors.toList());- if (unfencedMatchWith.length() != 0- && !matches.contains(unfencedMatchWith)- && suggestions.isEmpty()) {- return null;- } else {- return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());- }+ protected List<InputSuggestion> match(String matchWith) {+ return suggestVariables(matchWith);}@Override@@ -65,17 +44,14 @@ public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {}.suggest(terminalExpect);} else if (spec.getRuleName().equals("Literal")) {- List<InputSuggestion> suggestions = suggestLiterals(unmatched)- .stream()- .filter(it->!matches.contains(it.getContent()))- .collect(Collectors.toList());- if (unmatched.length() != 0- && !matches.contains(unmatched)- && suggestions.isEmpty()) {+ unmatched = StringUtils.unescape(unmatched);+ List<InputSuggestion> suggestions = suggestLiterals(unmatched);+ if (!suggestions.isEmpty())+ return suggestions.stream().map(it->it.escape("@")).collect(Collectors.toList());+ else if (unmatched.length() == 0)+ return new ArrayList<>();+ elsereturn null;- } else {- return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());- }}}return null;@@ -83,15 +59,12 @@ public abstract class InterpolativeAssistBehavior extends ANTLRAssistBehavior {@Overrideprotected List<String> getHints(TerminalExpect terminalExpect) {- return Lists.newArrayList(- String.format("Type '%c' to start inserting variable", Interpolative.MARK),- String.format("Type '\\%c' to input normal '%c' character",- Interpolative.MARK, Interpolative.MARK));+ return Lists.newArrayList("Prepend '\\' to escape '@' or '\\'");}@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (suggestedLiteral.equals(String.valueOf(Interpolative.MARK)))+ if (suggestedLiteral.equals("@"))return null;elsereturn Optional.fromNullable(null);diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.javaindex c821dcb861..df4f8ef576 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/InterpolativePatternSetAssistBehavior.java@@ -6,7 +6,6 @@ import java.util.Set;import java.util.stream.Collectors;import org.antlr.v4.runtime.Token;-import org.apache.commons.lang3.StringUtils;import com.google.common.base.Optional;@@ -16,10 +15,9 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.LinearRange;-import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.patternset.InterpolativePatternSetLexer;import io.onedev.server.util.patternset.InterpolativePatternSetParser;-import io.onedev.server.util.patternset.PatternSet;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@SuppressWarnings("serial")@@ -33,35 +31,18 @@ public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistBprotected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();-- String mark = String.valueOf(Interpolative.MARK);- Set<String> matches = new HashSet<>();- for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {- if (token.getType() == InterpolativePatternSetLexer.Variable) {- matches.add(Interpolative.unescape(token.getText()));- } else if (token.getType() == InterpolativePatternSetLexer.Quoted- || token.getType() == InterpolativePatternSetLexer.NQuoted) {- matches.add(PatternSet.unescape(token.getText()));- }- }-String unmatched = terminalExpect.getUnmatchedText();- if (spec.getRuleName().equals("Variable") && unmatched.startsWith(mark)) {- return new FenceAware(codeAssist.getGrammar(), mark, mark) {++ if (spec.getRuleName().equals("Variable") && unmatched.startsWith("@")) {+ return new FenceAware(codeAssist.getGrammar(), '@', '@') {@Override- protected List<InputSuggestion> match(String unfencedMatchWith) {- List<InputSuggestion> suggestions = suggestVariables(unfencedMatchWith)- .stream()- .filter(it->!matches.contains(it.getContent()))- .collect(Collectors.toList());- if (unfencedMatchWith.length() != 0- && !matches.contains(unfencedMatchWith)- && suggestions.isEmpty()) {+ protected List<InputSuggestion> match(String matchWith) {+ List<InputSuggestion> suggestions = suggestVariables(matchWith);+ if (!suggestions.isEmpty() || matchWith.length() == 0)+ return suggestions;+ elsereturn null;- } else {- return suggestions.stream().map(it->it.escape(mark)).collect(Collectors.toList());- }}@Override@@ -70,48 +51,58 @@ public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistB}}.suggest(terminalExpect);- } else if (spec.getRuleName().equals("NQuoted")) {- List<InputSuggestion> suggestions = suggestPatterns(unmatched);- return suggestions- .stream()- .filter(it->!matches.contains(it.getContent()))- .map(it->{- if (StringUtils.containsAny(it.getContent(), " \"") || it.getContent().startsWith("-")) {- InputSuggestion suggestion = it.escape("\"" + mark);- suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",- suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,- suggestion.getDescription(),- new LinearRange(suggestion.getMatch().getFrom()+1, suggestion.getMatch().getTo()+1));- return suggestion;- } else {- return it;- }- })- .collect(Collectors.toList());- } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {-- @Override- protected List<InputSuggestion> match(String unfencedMatchWith) {- List<InputSuggestion> suggestions = suggestPatterns(unfencedMatchWith)- .stream()- .filter(it->!matches.contains(it.getContent()))- .collect(Collectors.toList());- if (unfencedMatchWith.length() != 0- && !matches.contains(unfencedMatchWith)- && suggestions.isEmpty()) {+ } else {+ Set<String> matches = new HashSet<>();+ for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {+ if (token.getType() == InterpolativePatternSetLexer.Quoted)+ matches.add(StringUtils.unescape(FenceAware.unfence(token.getText())));+ else+ matches.add(StringUtils.unescape(token.getText()));+ }+ if (spec.getRuleName().equals("NQuoted")) {+ List<InputSuggestion> suggestions = suggestPatterns(unmatched);+ return suggestions+ .stream()+ .filter(it->!matches.contains(it.getContent()))+ .map(it->{+ if (it.getContent().contains(" ") || it.getContent().startsWith("-")) {+ InputSuggestion suggestion = it.escape("\"@");+ suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",+ suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,+ suggestion.getDescription(),+ new LinearRange(suggestion.getMatch().getFrom()+1, suggestion.getMatch().getTo()+1));+ return suggestion;+ } else {+ return it;+ }+ })+ .collect(Collectors.toList());+ } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {+ /*+ * provide this suggestion only when we typed quote as otherwise we will have duplicated suggestions+ * (one for nquoted, and one for quoted)+ */+ return new FenceAware(codeAssist.getGrammar(), '"', '"', "@") {++ @Override+ protected List<InputSuggestion> match(String matchWith) {+ List<InputSuggestion> suggestions = suggestPatterns(matchWith)+ .stream()+ .filter(it -> !matches.contains(it.getContent()))+ .collect(Collectors.toList());+ if (!suggestions.isEmpty() || matches.contains(matchWith) || matchWith.length() == 0)+ return suggestions;+ else+ return null;+ }++ @Override+ protected String getFencingDescription() {return null;- } else {- return suggestions.stream().map(it->it.escape("\"" + mark)).collect(Collectors.toList());}- }-- @Override- protected String getFencingDescription() {- return null;- }-- }.suggest(terminalExpect);++ }.suggest(terminalExpect);+ }}}return null;@@ -119,7 +110,7 @@ public abstract class InterpolativePatternSetAssistBehavior extends ANTLRAssistB@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (suggestedLiteral.equals(String.valueOf(Interpolative.MARK)))+ if (suggestedLiteral.equals("@"))return null;String description;switch (suggestedLiteral) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex d16d8551f6..068ad920a3 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -15,7 +15,6 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;-import org.apache.commons.collections4.CollectionUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -32,15 +31,9 @@ import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.GroupManager;-import io.onedev.server.entitymanager.IssueManager;-import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Build;-import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.GlobalIssueSetting;import io.onedev.server.model.support.issue.fieldspec.BooleanField;import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;@@ -61,7 +54,6 @@ import io.onedev.server.util.DateUtils;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@SuppressWarnings("serial")@@ -69,8 +61,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {private final IModel<Project> projectModel;- private static final int MAX_ISSUE_TITLE_LEN = 75;-public IssueQueryBehavior(IModel<Project> projectModel) {super(IssueQueryParser.class, "query", false);this.projectModel = projectModel;@@ -86,10 +76,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return projectModel.getObject();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());- }-@Overrideprotected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();@@ -97,42 +83,35 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if (spec.getRuleName().equals("Quoted")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = IssueQuery.unescapeQuotes(matchWith.toLowerCase());- List<InputSuggestion> suggestions = new ArrayList<>();Project project = getProject();-if ("criteriaField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);for (FieldSpec field: issueSetting.getFieldSpecs())candidates.add(field.getName());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("orderField".equals(spec.getLabel())) {List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());for (FieldSpec field: issueSetting.getFieldSpecs()) {if (field instanceof NumberField || field instanceof ChoiceField || field instanceof DateField)candidates.add(field.getName());}- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} else if ("revisionValue".equals(spec.getLabel())) {String revisionType = terminalExpect.getState().findMatchedElementsByLabel("revisionType", true).iterator().next().getMatchedText();- switch (revisionType) {- case "branch":- if (getProject() != null)- suggestions.addAll(escape(SuggestionUtils.suggestBranches(project, normalizedMatchWith)));- break;- case "tag":- if (getProject() != null)- suggestions.addAll(escape(SuggestionUtils.suggestTags(project, normalizedMatchWith)));- break;- case "build":- if (getProject() != null)- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));- break;+ if (project != null) {+ switch (revisionType) {+ case "branch":+ return SuggestionUtils.suggestBranches(project, matchWith);+ case "tag":+ return SuggestionUtils.suggestTags(project, matchWith);+ case "build":+ return SuggestionUtils.suggestBuilds(project, matchWith);+ }}} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);@@ -142,9 +121,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {int operator = IssueQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {if (operator == IssueQueryLexer.SubmittedBy)- suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));- else- suggestions.addAll(escape(SuggestionUtils.suggestBuilds(project, normalizedMatchWith)));+ return SuggestionUtils.suggestUsers(matchWith);+ else if (project != null)+ return SuggestionUtils.suggestBuilds(project, matchWith);} else {String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());@@ -153,47 +132,40 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)|| fieldName.equals(FIELD_UPDATE_DATE)) {- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty()? suggestions: null;} else if (fieldSpec instanceof UserChoiceField) {- suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));+ return SuggestionUtils.suggestUsers(matchWith);} else if (fieldSpec instanceof IssueChoiceField) {- List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);- for (Issue issue: issues) {- InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);- suggestions.add(suggestion);- }+ if (project != null)+ return SuggestionUtils.suggestIssues(project, matchWith);} else if (fieldSpec instanceof BuildChoiceField) {- List<Build> builds = OneDev.getInstance(BuildManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);- for (Build build: builds) {- InputSuggestion suggestion = new InputSuggestion("#" + build.getNumber(), null, null);- suggestions.add(suggestion);- }+ if (project != null)+ return SuggestionUtils.suggestBuilds(project, matchWith);} else if (fieldSpec instanceof PullRequestChoiceField) {- List<PullRequest> requests = OneDev.getInstance(PullRequestManager.class).query(project, normalizedMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);- for (PullRequest request: requests) {- InputSuggestion suggestion = new InputSuggestion("#" + request.getNumber(), StringUtils.abbreviate(request.getTitle(), MAX_ISSUE_TITLE_LEN), null);- suggestions.add(suggestion);- }+ if (project != null)+ return SuggestionUtils.suggestPullRequests(project, matchWith);} else if (fieldSpec instanceof BooleanField) {- suggestions.addAll(SuggestionUtils.suggest(Lists.newArrayList("true", "false"), normalizedMatchWith));+ return SuggestionUtils.suggest(Lists.newArrayList("true", "false"), matchWith);} else if (fieldSpec instanceof GroupChoiceField) {List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(FIELD_STATE)) {List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldSpec instanceof ChoiceField) {ComponentContext.push(new ComponentContext(getComponent()));try {List<String> candidates = new ArrayList<>(((ChoiceField)fieldSpec).getChoiceProvider().getChoices(true).keySet());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} finally {ComponentContext.pop();}} else if (fieldName.equals(FIELD_MILESTONE)) {- List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ if (project != null) {+ List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ return SuggestionUtils.suggest(candidates, matchWith);+ }} else if (fieldName.equals(FIELD_TITLE) || fieldName.equals(FIELD_DESCRIPTION)|| fieldName.equals(FIELD_COMMENT) || fieldName.equals(FIELD_VOTE_COUNT)|| fieldName.equals(FIELD_COMMENT_COUNT) || fieldName.equals(FIELD_NUMBER)@@ -204,7 +176,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {}}}- return suggestions;+ return new ArrayList<>();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.javaindex 3897c4f5cf..fec3d4cf4f 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PatternSetAssistBehavior.java@@ -6,7 +6,6 @@ import java.util.Set;import java.util.stream.Collectors;import org.antlr.v4.runtime.Token;-import org.apache.commons.lang3.StringUtils;import com.google.common.base.Optional;@@ -16,7 +15,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.commons.utils.LinearRange;-import io.onedev.server.util.patternset.PatternSet;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.util.patternset.PatternSetLexer;import io.onedev.server.util.patternset.PatternSetParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;@@ -35,8 +34,10 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {Set<String> matches = new HashSet<>();for (Token token: terminalExpect.getRoot().getState().getMatchedTokens()) {- if (token.getType() == PatternSetLexer.Quoted || token.getType() == PatternSetLexer.NQuoted)- matches.add(PatternSet.unescape(token.getText()));+ if (token.getType() == PatternSetLexer.Quoted)+ matches.add(StringUtils.unescape(FenceAware.unfence(token.getText())));+ else+ matches.add(StringUtils.unescape(token.getText()));}String unmatched = terminalExpect.getUnmatchedText();@@ -46,7 +47,7 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {.stream().filter(it->!matches.contains(it.getContent())).map(it->{- if (StringUtils.containsAny(it.getContent(), " \"") || it.getContent().startsWith("-")) {+ if (it.getContent().contains(" ") || it.getContent().startsWith("-")) {InputSuggestion suggestion = it.escape("\"");suggestion = new InputSuggestion("\"" + suggestion.getContent() + "\"",suggestion.getCaret()!=-1? suggestion.getCaret()+1: -1,@@ -58,22 +59,23 @@ public abstract class PatternSetAssistBehavior extends ANTLRAssistBehavior {}}).collect(Collectors.toList());- } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ } else if (spec.getRuleName().equals("Quoted") && unmatched.startsWith("\"")) {+ /*+ * provide this suggestion only when we typed quote as otherwise we will have duplicated suggestions+ * (one for nquoted, and one for quoted)+ */+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Override- protected List<InputSuggestion> match(String unfencedMatchWith) {- List<InputSuggestion> suggestions = PatternSetAssistBehavior.this.suggest(unfencedMatchWith)+ protected List<InputSuggestion> match(String matchWith) {+ List<InputSuggestion> suggestions = PatternSetAssistBehavior.this.suggest(matchWith).stream()- .filter(it->!matches.contains(it.getContent()))+ .filter(it -> !matches.contains(it.getContent())).collect(Collectors.toList());- if (unfencedMatchWith.length() != 0- && !matches.contains(unfencedMatchWith)- && suggestions.isEmpty()) {+ if (!suggestions.isEmpty() || matches.contains(matchWith) || matchWith.length() == 0)+ return suggestions;+ elsereturn null;- } else {- return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());- }}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 4cc87744de..bf52da6a50 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -2,9 +2,7 @@ package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;-import java.util.stream.Collectors;-import org.apache.commons.collections4.CollectionUtils;import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -18,11 +16,7 @@ import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;import io.onedev.commons.codeassist.parser.Element;import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;-import io.onedev.server.OneDev;import io.onedev.server.OneException;-import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.git.GitUtils;-import io.onedev.server.git.RefInfo;import io.onedev.server.model.Project;import io.onedev.server.model.support.pullrequest.MergeStrategy;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;@@ -53,28 +47,20 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {return projectModel.getObject();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("\"")).collect(Collectors.toList());- }-@Overrideprotected 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(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = PullRequestQuery.unescapeQuotes(matchWith.toLowerCase());- List<InputSuggestion> suggestions = new ArrayList<>();Project project = getProject();-if ("criteriaField".equals(spec.getLabel())) {- suggestions.addAll(escape(SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, normalizedMatchWith)));+ return SuggestionUtils.suggest(PullRequestConstants.QUERY_FIELDS, matchWith);} else if ("orderField".equals(spec.getLabel())) {- suggestions.addAll(escape(SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()),- normalizedMatchWith)));+ return SuggestionUtils.suggest(new ArrayList<>(PullRequestConstants.ORDER_FIELDS.keySet()), matchWith);} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);@@ -83,9 +69,9 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {int operator = PullRequestQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {if (operator == PullRequestQueryLexer.IncludesIssue)- suggestions.addAll(escape(SuggestionUtils.suggestIssues(project, normalizedMatchWith)));+ return SuggestionUtils.suggestIssues(project, matchWith);else if (operator != PullRequestQueryLexer.IncludesCommit)- suggestions.addAll(escape(SuggestionUtils.suggestUsers(normalizedMatchWith)));+ return SuggestionUtils.suggestUsers(matchWith);elsereturn null;} else {@@ -95,24 +81,18 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)|| fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)|| fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {- suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, normalizedMatchWith));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(terminalExpect, matchWith));+ List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);+ return !suggestions.isEmpty()? suggestions: null;} else if (fieldName.equals(PullRequestConstants.FIELD_SOURCE_PROJECT)) {- List<String> candidates = new ArrayList<>();- for (Project each: OneDev.getInstance(ProjectManager.class).query())- candidates.add(each.getName());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggestProjects(matchWith);} else if (fieldName.equals(PullRequestConstants.FIELD_TARGET_BRANCH)|| fieldName.equals(PullRequestConstants.FIELD_SOURCE_BRANCH)) {- List<String> candidates = new ArrayList<>();- for (RefInfo refInfo: project.getBranches())- candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggestBranches(project, matchWith);} else if (fieldName.equals(PullRequestConstants.FIELD_MERGE_STRATEGY)) {List<String> candidates = new ArrayList<>();for (MergeStrategy strategy: MergeStrategy.values())candidates.add(strategy.toString());- suggestions.addAll(escape(SuggestionUtils.suggest(candidates, normalizedMatchWith)));+ return SuggestionUtils.suggest(candidates, matchWith);} else if (fieldName.equals(PullRequestConstants.FIELD_TITLE)|| fieldName.equals(PullRequestConstants.FIELD_DESCRIPTION)|| fieldName.equals(PullRequestConstants.FIELD_NUMBER)@@ -124,7 +104,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {}}}- return suggestions;+ return new ArrayList<>();}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.javaindex 5efad4b821..6221813f45 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/UserMatcherBehavior.java@@ -1,8 +1,6 @@package io.onedev.server.web.behavior;-import java.util.ArrayList;import java.util.List;-import java.util.stream.Collectors;import io.onedev.commons.codeassist.FenceAware;import io.onedev.commons.codeassist.InputSuggestion;@@ -15,42 +13,28 @@ import io.onedev.server.web.util.SuggestionUtils;@SuppressWarnings("serial")public class UserMatcherBehavior extends ANTLRAssistBehavior {- private static final String VALUE_OPEN = "(";-- private static final String VALUE_CLOSE = ")";-- private static final String ESCAPE_CHARS = "\\()";-public UserMatcherBehavior() {super(UserMatcherParser.class, "userMatcher", false);}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape(ESCAPE_CHARS)).collect(Collectors.toList());- }-@Overrideprotected 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) {+ return new FenceAware(codeAssist.getGrammar(), '(', ')') {@Override- protected List<InputSuggestion> match(String unfencedMatchWith) {+ protected List<InputSuggestion> match(String matchWith) {int tokenType = terminalExpect.getState().getLastMatchedToken().getType();- List<InputSuggestion> suggestions = new ArrayList<>();switch (tokenType) {case UserMatcherParser.USER:- suggestions.addAll(escape(SuggestionUtils.suggestUsers(unfencedMatchWith)));- break;+ return SuggestionUtils.suggestUsers(matchWith);case UserMatcherParser.GROUP:- suggestions.addAll(escape(SuggestionUtils.suggestGroups(unfencedMatchWith)));- break;+ return SuggestionUtils.suggestGroups(matchWith);default:return null;}- return suggestions;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.javaindex 3538c506f5..fb4104ef8f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java@@ -2,6 +2,7 @@ package io.onedev.server.web.component.commit.message;import java.util.ArrayList;import java.util.List;+import java.util.function.Function;import java.util.regex.Pattern;import javax.annotation.Nullable;@@ -19,7 +20,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.commons.utils.Highlighter;-import io.onedev.commons.utils.Transformer;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.util.CommitMessageTransformer;@@ -56,19 +56,19 @@ public class CommitMessagePanel extends Panel {}private String highlight(String text, @Nullable String commitUrl) {- return Highlighter.highlightPatterns(text, highlightPatternsModel.getObject(), new Transformer<String>() {+ return Highlighter.highlightPatterns(text, highlightPatternsModel.getObject(), new Function<String, String>() {@Override- public String transform(String text) {- String transformed = new CommitMessageTransformer(getProject(), commitUrl).transform(text);+ public String apply(String text) {+ String transformed = new CommitMessageTransformer(getProject(), commitUrl).apply(text);return "<span class='highlight'>" + transformed + "</span>";}- }, new Transformer<String>() {+ }, new Function<String, String>() {@Override- public String transform(String text) {- return new CommitMessageTransformer(getProject(), commitUrl).transform(text);+ public String apply(String text) {+ return new CommitMessageTransformer(getProject(), commitUrl).apply(text);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.javaindex 2d69af514e..3199516190 100644--- a/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/component/review/ReviewRequirementBehavior.java@@ -3,7 +3,6 @@ package io.onedev.server.web.component.review;import java.util.ArrayList;import java.util.Iterator;import java.util.List;-import java.util.stream.Collectors;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -18,7 +17,6 @@ import io.onedev.commons.codeassist.parser.ParseExpect;import io.onedev.commons.codeassist.parser.TerminalExpect;import io.onedev.server.model.Project;import io.onedev.server.security.permission.ProjectPrivilege;-import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.server.util.reviewrequirement.ReviewRequirementParser;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -39,27 +37,20 @@ public class ReviewRequirementBehavior extends ANTLRAssistBehavior {projectModel.detach();}- private List<InputSuggestion> escape(List<InputSuggestion> suggestions) {- return suggestions.stream().map(it->it.escape("()")).collect(Collectors.toList());- }-@Overrideprotected 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(), "(", ")") {+ return new FenceAware(codeAssist.getGrammar(), '(', ')') {@Overrideprotected List<InputSuggestion> match(String matchWith) {- String normalizedMatchWith = ReviewRequirement.unescapeBraces(matchWith.toLowerCase());Project project = projectModel.getObject();- if (terminalExpect.findExpectByRule("userCriteria") != null) {- return escape(SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ,- normalizedMatchWith));- } else {- return escape(SuggestionUtils.suggestGroups(normalizedMatchWith));- }+ if (terminalExpect.findExpectByRule("userCriteria") != null)+ return SuggestionUtils.suggestUsers(project, ProjectPrivilege.CODE_READ, matchWith);+ else+ return SuggestionUtils.suggestGroups(matchWith);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.javaindex a646130251..093554eca9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/InterpolativePatternsEditSupport.java@@ -69,14 +69,10 @@ public class InterpolativePatternsEditSupport implements EditSupport {@Overrideprotected List<String> getHints(TerminalExpect terminalExpect) {- char interpolativeMark = io.onedev.server.util.interpolative.Interpolative.MARK;return Lists.newArrayList("Pattern containing spaces or starting with dash needs to be quoted","Use * or ? for wildcard match",- String.format("Type '%c' to start inserting variable", interpolativeMark),- String.format("Type '\\%c' to input normal '%c' character",- interpolativeMark, interpolativeMark)- );+ "Prepend '\\' to escape '@' or '\\'");}};diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.javaindex d5e36b39b6..73382bc948 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java@@ -6,7 +6,6 @@ import org.apache.wicket.Component;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.model.IModel;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.web.editable.EditSupport;import io.onedev.server.web.editable.EmptyValueLabel;import io.onedev.server.web.editable.PropertyContext;@@ -14,6 +13,7 @@ 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.NameOfEmptyValue;+import io.onedev.server.web.util.LocaleUtils;@SuppressWarnings("serial")public class BooleanEditSupport implements EditSupport {@@ -33,7 +33,7 @@ public class BooleanEditSupport implements EditSupport {@Overrideprotected Component newContent(String id, PropertyDescriptor propertyDescriptor) {if (model.getObject() != null) {- return new Label(id, StringUtils.describe(model.getObject()));+ return new Label(id, LocaleUtils.describe(model.getObject()));} else {NameOfEmptyValue nameOfEmptyValue = propertyDescriptor.getPropertyGetter().getAnnotation(NameOfEmptyValue.class);if (nameOfEmptyValue != null)diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.javaindex 255028e05e..17d6b063f7 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java@@ -4,6 +4,7 @@ import java.util.ArrayList;import java.util.List;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.CallbackParameter;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnLoadHeaderItem;@@ -11,6 +12,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.TextArea;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;+import org.apache.wicket.request.IRequestParameters;+import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.util.convert.ConversionException;import com.fasterxml.jackson.core.JsonProcessingException;@@ -25,7 +28,7 @@ import io.onedev.commons.utils.ReflectionUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.util.ComponentContext;-import io.onedev.server.util.interpolative.Interpolative;+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;@@ -36,6 +39,8 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {private TextArea<String> input;+ private AbstractPostAjaxBehavior behavior;+public CodePropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {super(id, propertyDescriptor, propertyModel);}@@ -59,6 +64,50 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {}});+ add(behavior = new AbstractPostAjaxBehavior() {++ @SuppressWarnings("unchecked")+ @Override+ protected void respond(AjaxRequestTarget target) {+ IRequestParameters params = RequestCycle.get().getRequest().getPostParameters();+ String matchWith = params.getParameterValue("matchWith").toString();+ matchWith = StringUtils.unescape(matchWith.toLowerCase());+ String line = params.getParameterValue("line").toString();+ String start = params.getParameterValue("start").toString();+ String end = params.getParameterValue("end").toString();++ String variableProvider = getCode().variableProvider();+ ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);+ ArrayNode variablesNode = mapper.createArrayNode();+ if (variableProvider.length() != 0) {+ ComponentContext.push(new ComponentContext(input));+ try {+ for (String each: (List<String>) ReflectionUtils.invokeStaticMethod(+ descriptor.getBeanClass(), variableProvider)) {+ if (each.contains(matchWith.toLowerCase())) {+ ObjectNode variableNode = mapper.createObjectNode();+ variableNode.put("text", "@" + StringUtils.escape(each, "@") + "@");+ variablesNode.add(variableNode);+ }+ }+ } finally {+ ComponentContext.pop();+ }+ }+ try {+ String script = String.format("onedev.server.codeSupport.showVariables('%s', %s, %s, %s, %s);",+ input.getMarkupId(), mapper.writeValueAsString(variablesNode), line, start, end);+ target.appendJavaScript(script);+ } catch (JsonProcessingException e) {+ throw new RuntimeException(e);+ }+ }++ });+ }++ private Code getCode() {+ return Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(Code.class));}@Override@@ -69,38 +118,21 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {return convertedInput;}- @SuppressWarnings("unchecked")@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new CodeSupportResourceReference()));- Code code = Preconditions.checkNotNull(descriptor.getPropertyGetter().getAnnotation(Code.class));-- String variableProvider = code.variableProvider();- ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);- ArrayNode variablesNode = mapper.createArrayNode();- if (variableProvider.length() != 0) {- ComponentContext.push(new ComponentContext(this));- try {- for (String each: (List<String>) ReflectionUtils.invokeStaticMethod(- descriptor.getBeanClass(), variableProvider)) {- ObjectNode variableNode = mapper.createObjectNode();- variableNode.put("text", Interpolative.MARK + each + Interpolative.MARK);- variablesNode.add(variableNode);- }- } finally {- ComponentContext.pop();- }- }-- try {- String script = String.format("onedev.server.codeSupport.onEditorDomReady('%s', '%s', %s, '%s');",- input.getMarkupId(), code.language(), mapper.writeValueAsString(variablesNode), Interpolative.MARK);- response.render(OnLoadHeaderItem.forScript(script));- } catch (JsonProcessingException e) {- throw new RuntimeException(e);- }+ CallbackParameter matchWith = CallbackParameter.explicit("matchWith");+ CallbackParameter line = CallbackParameter.explicit("line");+ CallbackParameter start = CallbackParameter.explicit("start");+ CallbackParameter end = CallbackParameter.explicit("end");+ String script = String.format(+ "onedev.server.codeSupport.onEditorDomReady('%s', '%s', %s);",+ input.getMarkupId(),+ getCode().language(),+ behavior.getCallbackFunction(matchWith, line, start, end));+ response.render(OnLoadHeaderItem.forScript(script));}}diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.jsindex a3f84cb098..b3780a44d9 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/code-support.js@@ -1,5 +1,5 @@onedev.server.codeSupport = {- onEditorDomReady: function(inputId, modeName, variables, varMark) {+ onEditorDomReady: function(inputId, modeName, varQueryCallback) {var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {indentWithTabs: true,indentUnit: 4,@@ -22,47 +22,52 @@ onedev.server.codeSupport = {onedev.server.form.markDirty($input.closest("form"));});- cm.on("keypress", function(cm, event) {- if (String.fromCharCode(event.keyCode) == varMark) {+ cm.on("keyup", function(cm, event) {+ if (event.keyCode == 50) {var cursor = cm.getCursor();var line = cursor.line;var start = cursor.ch;-- if (start < 1 || cm.doc.getLine(line).substr(start-1, 1) != "\\") {- CodeMirror.showHint(cm, function () {++ var beforeCursor = cm.doc.getLine(line).substring(0, start);++ var escapeFiltered = beforeCursor.replace("\\\\", "").replace("\\@", "");+ if ((escapeFiltered.match(/@/g) || []).length % 2 == 1) { // only show hint when type left @+ function hint(cm, showHintCallback) {var end = cm.getCursor().ch;- var matchWith = cm.doc.getLine(line).substr(start, end);- var matched = variables.filter(function (item) {- return item.text.indexOf(matchWith) >= 0;- });- for (var i = 0; i < matched.length; i++) {- if (i == matched.length-1) {- matched[i].render = function(element, self, data) {- var $element = $(element);- $element.append(data.text);- $element.parent().append(- "<li class='tips'>" +- "<div>Type '" + varMark + "' to start inserting variable</div>" +- "<div>Type '\\" + varMark + "' to input normal '" + varMark + "' character</div>" +- "</li>");- };- } else {- matched[i].render = function(element, self, data) {- $(element).append(data.text);- };- }- }- return {- list: matched,- from: CodeMirror.Pos(line, start),- to: CodeMirror.Pos(line, end)- };- }, {completeSingle: false});+ var matchWith = cm.doc.getLine(line).substring(start, end);+ $input.data("showHintCallback", showHintCallback);+ varQueryCallback(matchWith, line, start, end);+ }+ hint.async = true;+ CodeMirror.showHint(cm, hint, {completeSingle: false});}}});onedev.server.codeSupport.trackWidth(inputId);+ },+ showVariables: function(inputId, variables, line, start, end) {+ for (var i = 0; i < variables.length; i++) {+ if (i == variables.length-1) {+ variables[i].render = function(element, self, data) {+ var $element = $(element);+ $element.append(data.text);+ $element.parent().append(+ "<li class='tips'>" ++ "<div>Prepend '\\' to escape '@' or '\\'</div>" ++ "</li>");+ };+ } else {+ variables[i].render = function(element, self, data) {+ $(element).append(data.text);+ };+ }+ }+ $("#" + inputId).data("showHintCallback")({+ list: variables,+ from: CodeMirror.Pos(line, start-1),+ to: CodeMirror.Pos(line, end)+ });},onViewerDomReady: function(inputId, modeName) {var cm = CodeMirror.fromTextArea(document.getElementById(inputId), {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.javaindex da6cc84c7c..615b227a88 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java@@ -11,6 +11,7 @@ import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.ProjectDependency;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;@@ -19,7 +20,7 @@ import io.onedev.server.web.editable.PathNode;import io.onedev.server.web.editable.Path;@SuppressWarnings("serial")-abstract class ProjectDependencyEditPanel extends Panel {+abstract class ProjectDependencyEditPanel extends Panel implements JobAware {private final List<ProjectDependency> dependencies;diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.javaindex e72e9577cd..decbcee275 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java@@ -26,6 +26,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import io.onedev.server.ci.job.Job;+import io.onedev.server.ci.job.JobAware;import io.onedev.server.ci.job.ProjectDependency;import io.onedev.server.web.behavior.sortable.SortBehavior;import io.onedev.server.web.behavior.sortable.SortPosition;@@ -71,6 +73,11 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>target.add(ProjectDependencyListEditPanel.this);}+ @Override+ public Job getJob() {+ return ProjectDependencyListEditPanel.this.getJob();+ }+};}@@ -143,6 +150,11 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>target.add(ProjectDependencyListEditPanel.this);}+ @Override+ public Job getJob() {+ return ProjectDependencyListEditPanel.this.getJob();+ }+};}@@ -202,6 +214,14 @@ class ProjectDependencyListEditPanel extends PropertyEditor<List<Serializable>>}.sortable("tbody"));}+ private Job getJob() {+ JobAware jobAware = findParent(JobAware.class);+ if (jobAware != null)+ return jobAware.getJob();+ else+ return null;+ }+@Overridepublic void onEvent(IEvent<?> event) {super.onEvent(event);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.javaindex 0f485fee3b..29cda11e5a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.java@@ -31,7 +31,6 @@ import org.unbescape.html.HtmlEscape;import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.groovyscript.GroovyScript;@@ -43,6 +42,7 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.server.web.util.LocaleUtils;@SuppressWarnings("serial")public class GroovyScriptListPage extends AdministrationPage {@@ -134,7 +134,7 @@ public class GroovyScriptListPage extends AdministrationPage {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, StringUtils.describe(script.getJobAuthorization() != null));+ return new Label(componentId, LocaleUtils.describe(script.getJobAuthorization() != null));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex 5e065b343f..e7ffa8f66f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -28,7 +28,6 @@ import org.unbescape.html.HtmlEscape;import com.google.common.base.Preconditions;import com.google.common.collect.Sets;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.administration.GlobalIssueSetting;@@ -41,6 +40,7 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.layout.SideFloating;+import io.onedev.server.web.util.LocaleUtils;@SuppressWarnings("serial")public class IssueFieldListPage extends GlobalIssueSettingPage {@@ -146,7 +146,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));+ return new Label(componentId, LocaleUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 18cb73b7b4..36171a673e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -137,7 +137,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {protected void onInitialize() {super.onInitialize();- String transformed = new CommitMessageTransformer(getProject(), null).transform(getCommit().getShortMessage());+ String transformed = new CommitMessageTransformer(getProject(), null).apply(getCommit().getShortMessage());add(new Label("title", transformed).setEscapeModelStrings(false));BlobIdent blobIdent = new BlobIdent(getCommit().name(), null, FileMode.TYPE_TREE);@@ -165,7 +165,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {String message = GitUtils.getDetailMessage(getCommit());if (message != null) {- transformed = new CommitMessageTransformer(getProject(), null).transform(message);+ transformed = new CommitMessageTransformer(getProject(), null).apply(message);add(new Label("detail", transformed).setEscapeModelStrings(false));} else {add(new WebMarkupContainer("detail").setVisible(false));diff --git a/server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.java b/server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.javanew file mode 100644index 0000000000..dc9cfe3cd1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/util/LocaleUtils.java@@ -0,0 +1,9 @@+package io.onedev.server.web.util;++public class LocaleUtils {++ public static String describe(boolean value) {+ return value? "Yes": "No";+ }++}diff --git a/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.javaindex f6beb417b3..b90236b042 100644--- a/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/entityquery/codecomment/CodeCommentQueryGrammarTest.java@@ -25,7 +25,7 @@ public class CodeCommentQueryGrammarTest {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if (elementSpec.getRuleName().equals("Quoted")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {diff --git a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.javaindex c0ddfd5353..98abd3e248 100644--- a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java@@ -25,7 +25,7 @@ public class IssueQueryGrammarTest {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if (elementSpec.getRuleName().equals("Quoted")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {diff --git a/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.javaindex 626ef6f93f..3d67ad6d21 100644--- a/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/entityquery/pullrequest/PullRequestQueryGrammarTest.java@@ -25,7 +25,7 @@ public class PullRequestQueryGrammarTest {if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec elementSpec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();if (elementSpec.getRuleName().equals("Quoted")) {- return new FenceAware(codeAssist.getGrammar(), "\"", "\"") {+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {diff --git a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.javaindex 5f19c069a7..a8713ede57 100644--- a/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/util/patternset/InterpolativePatternSetGrammarTest.java@@ -23,9 +23,18 @@ public class InterpolativePatternSetGrammarTest {};- PatternSet expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());- String interpolated = Interpolative.fromString("@\"@hello world\"").interpolateWith(interpolator);- PatternSet actual = PatternSet.fromString(interpolated);+ PatternSet expected, actual;+ String interpolated;++ expected = new PatternSet(Sets.newHashSet("\"hello\""), Sets.newHashSet("\"hello world\""));+ interpolated = Interpolative.fromString("\\\"hello\\\" -@\"\\\"hello world\\\"\"@").interpolateWith(interpolator);+ actual = PatternSet.fromString(interpolated);+ assertEquals(expected.getIncludes(), actual.getIncludes());+ assertEquals(expected.getExcludes(), actual.getExcludes());++ expected = new PatternSet(Sets.newHashSet("hello world"), Sets.newHashSet());+ interpolated = Interpolative.fromString("@\"@hello world\"").interpolateWith(interpolator);+ actual = PatternSet.fromString(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());@@ -34,6 +43,12 @@ public class InterpolativePatternSetGrammarTest {actual = PatternSet.fromString(interpolated);assertEquals(expected.getIncludes(), actual.getIncludes());assertEquals(expected.getExcludes(), actual.getExcludes());++ expected = new PatternSet(Sets.newHashSet("@robin", "hello world", "world"), Sets.newHashSet("hello"));+ interpolated = Interpolative.fromString("\\@robin @\"hello world\"@ -@hello world@").interpolateWith(interpolator);+ actual = PatternSet.fromString(interpolated);+ assertEquals(expected.getIncludes(), actual.getIncludes());+ assertEquals(expected.getExcludes(), actual.getExcludes());}}diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.javaindex b551d33817..c505167840 100644--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java@@ -33,7 +33,8 @@ public class JobHtmlReport extends JobReport {private String startPage;- @Editable(order=1000, description="Specify report name. <b>Note:</b> Type '@' to start inserting variable")+ @Editable(order=1000, description="Specify report name. "+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getReportName() {@@ -45,7 +46,7 @@ public class JobHtmlReport extends JobReport {}@Editable(order=1100, description="Specify start page of the report relative to workspace, for instance: api/index.html. "- + "<b>Note:</b> Type '@' to start inserting variable")+ + "<b>Note:</b> Type '@' to <a href='https://github.com/theonedev/onedev/wiki/Variable-Substitution'>insert variable</a>")@Interpolative(variableSuggester="suggestVariables")@NotEmptypublic String getStartPage() {