The Unified and Autonomous Development Platform
Depends on utils project
robin shen276b47b01440
diff --git a/core/pom.xml b/core/pom.xmlindex 80640540e1..20075caffd 100644--- a/core/pom.xml+++ b/core/pom.xml@@ -186,6 +186,11 @@</exclusion></exclusions></dependency>+ <dependency>+ <groupId>com.gitplex</groupId>+ <artifactId>jsyntax</artifactId>+ <version>1.0.0-SNAPSHOT</version>+ </dependency><dependency><groupId>com.vladsch.flexmark</groupId><artifactId>flexmark</artifactId>diff --git a/core/src/main/java/com/gitplex/server/util/StringUtils.java b/core/src/main/java/com/gitplex/server/util/StringUtils.javaindex eb012b994d..f1b328ac45 100644--- a/core/src/main/java/com/gitplex/server/util/StringUtils.java+++ b/core/src/main/java/com/gitplex/server/util/StringUtils.java@@ -11,7 +11,6 @@ import java.util.StringTokenizer;import javax.annotation.Nullable;-import com.gitplex.jsyntax.TokenUtils;import com.google.common.base.CaseFormat;public class StringUtils extends org.apache.commons.lang3.StringUtils {@@ -303,8 +302,4 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {return cost[len0 - 1];}- public static String escapeHtml(String text) {- return TokenUtils.escapeHtml(text);- }-}diff --git a/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.javaindex eb2be3ba59..b9f743c645 100644--- a/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java+++ b/core/src/main/java/com/gitplex/server/util/diff/DiffUtils.java@@ -12,7 +12,6 @@ import javax.annotation.Nullable;import com.gitplex.jsyntax.TextToken;import com.gitplex.jsyntax.TokenTypes;-import com.gitplex.jsyntax.TokenUtils;import com.gitplex.jsyntax.Tokenized;import com.gitplex.jsyntax.Tokenizer;import com.gitplex.jsyntax.TokenizerRegistry;@@ -20,6 +19,7 @@ import com.gitplex.server.model.support.TextRange;import com.gitplex.server.util.StringUtils;import com.gitplex.server.util.diff.DiffMatchPatch.Diff;import com.gitplex.server.util.diff.DiffMatchPatch.Operation;+import com.gitplex.jsyntax.TokenUtils;import com.google.common.base.Preconditions;public class DiffUtils {diff --git a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.javaindex 9fdc119b6e..330fd39016 100644--- a/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java@@ -39,7 +39,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;import com.gitplex.jsymbol.Range;import com.gitplex.jsyntax.TextToken;-import com.gitplex.jsyntax.TokenUtils;import com.gitplex.jsyntax.Tokenized;import com.gitplex.server.GitPlex;import com.gitplex.server.git.BlameBlock;@@ -79,6 +78,7 @@ import com.gitplex.server.web.page.project.commit.CommitDetailPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage;import com.gitplex.server.web.util.DateUtils;+import com.gitplex.jsyntax.TokenUtils;import com.google.common.base.Preconditions;@SuppressWarnings("serial")