Skip to content

The Unified and Autonomous Development Platform

Use jsymbol instead of symbolextractor

robin shine24ec28937bed
diff --git a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java
index cc0955643d..4ad9aeaaed 100644
--- a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java
+++ b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/ElementCompletion.java
@@ -2,7 +2,7 @@ package com.gitplex.commons.antlr.codeassist;
import javax.annotation.Nullable;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class ElementCompletion extends InputCompletion {
diff --git a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java
index 53eacecd88..186c22ac19 100644
--- a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java
+++ b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/FenceAware.java
@@ -9,7 +9,7 @@ import org.antlr.v4.runtime.Token;
import com.gitplex.commons.antlr.grammar.ElementSpec;
import com.gitplex.commons.antlr.grammar.Grammar;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public abstract class FenceAware {
diff --git a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java
index d3a90de425..bd58960cdc 100644
--- a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java
+++ b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputCompletion.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class InputCompletion implements Serializable {
diff --git a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java
index 0fd30841c8..eea8c7668e 100644
--- a/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java
+++ b/commons.antlr/src/main/java/com/gitplex/commons/antlr/codeassist/InputSuggestion.java
@@ -2,7 +2,7 @@ package com.gitplex.commons.antlr.codeassist;
import javax.annotation.Nullable;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class InputSuggestion extends InputStatus {
diff --git a/commons.git/src/main/java/com/gitplex/commons/git/Blame.java b/commons.git/src/main/java/com/gitplex/commons/git/Blame.java
index 53aac5253e..26570f6fe0 100644
--- a/commons.git/src/main/java/com/gitplex/commons/git/Blame.java
+++ b/commons.git/src/main/java/com/gitplex/commons/git/Blame.java
@@ -4,7 +4,7 @@ import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class Blame {
diff --git a/commons.git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java b/commons.git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java
index 3debb7936c..7e178eeef6 100644
--- a/commons.git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java
+++ b/commons.git/src/main/java/com/gitplex/commons/git/command/BlameCommand.java
@@ -21,7 +21,7 @@ import com.gitplex.commons.git.GitUtils;
import com.gitplex.commons.util.execution.Commandline;
import com.gitplex.commons.util.execution.ExecuteResult;
import com.gitplex.commons.util.execution.LineConsumer;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.google.common.base.Preconditions;
public class BlameCommand extends GitCommand<Map<String, Blame>> {
diff --git a/commons.util/pom.xml b/commons.util/pom.xml
index 8530ace550..95bb6f77c9 100644
--- a/commons.util/pom.xml
+++ b/commons.util/pom.xml
@@ -94,7 +94,7 @@
</dependency>
<dependency>
<groupId>com.gitplex</groupId>
- <artifactId>symbolextractor</artifactId>
+ <artifactId>jsymbol</artifactId>
<version>1.0.0-SNAPSHOT</version>
<exclusions>
<exclusion>
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/Highlighter.java b/commons.util/src/main/java/com/gitplex/commons/util/Highlighter.java
index 90d663837b..c6df6e6d9d 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/Highlighter.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/Highlighter.java
@@ -5,7 +5,7 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class Highlighter {
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java b/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
index 9c093ff29b..fda7fd7663 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/PathUtils.java
@@ -6,7 +6,7 @@ import javax.annotation.Nullable;
import org.apache.commons.io.FilenameUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class PathUtils {
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/RangeUtils.java b/commons.util/src/main/java/com/gitplex/commons/util/RangeUtils.java
index 51c6a7fa68..19f02d21fd 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/RangeUtils.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/RangeUtils.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class RangeUtils {
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java b/commons.util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java
index c4ce8057e3..883dc1edb5 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/match/PatternApplied.java
@@ -2,7 +2,7 @@ package com.gitplex.commons.util.match;
import java.io.Serializable;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class PatternApplied implements Serializable {
diff --git a/commons.util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java b/commons.util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java
index 90aa930f88..ec2a660b16 100644
--- a/commons.util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java
+++ b/commons.util/src/main/java/com/gitplex/commons/util/match/WildcardUtils.java
@@ -5,7 +5,7 @@ import java.util.List;
import javax.annotation.Nullable;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class WildcardUtils {
diff --git a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java
index b504158056..65ca7f6519 100644
--- a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java
+++ b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/ANTLRAssistBehavior.java
@@ -28,7 +28,7 @@ import com.gitplex.commons.antlr.codeassist.InputSuggestion;
import com.gitplex.commons.antlr.codeassist.ParentedElement;
import com.gitplex.commons.antlr.grammar.ElementSpec;
import com.gitplex.commons.util.StringUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
@SuppressWarnings("serial")
public abstract class ANTLRAssistBehavior extends InputAssistBehavior {
diff --git a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java
index c63d70100d..7bd288a8c9 100644
--- a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java
+++ b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/AssistPanel.java
@@ -14,7 +14,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import com.gitplex.commons.antlr.codeassist.InputCompletion;
import com.gitplex.commons.antlr.codeassist.InputStatus;
import com.gitplex.commons.wicket.behavior.infinitescroll.InfiniteScrollBehavior;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
@SuppressWarnings("serial")
class AssistPanel extends Panel {
diff --git a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java
index 3b999fa456..8729bff38f 100644
--- a/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java
+++ b/commons.wicket/src/main/java/com/gitplex/commons/wicket/behavior/inputassist/InputAssistBehavior.java
@@ -27,7 +27,7 @@ import com.gitplex.commons.wicket.component.floating.AlignPlacement;
import com.gitplex.commons.wicket.component.floating.AlignTarget;
import com.gitplex.commons.wicket.component.floating.ComponentTarget;
import com.gitplex.commons.wicket.component.floating.FloatingPanel;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
diff --git a/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java b/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java
index 7660aa49fe..0a222eb71d 100644
--- a/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java
+++ b/server.core/src/main/java/com/gitplex/server/core/entity/support/TextRange.java
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import com.gitplex.symbolextractor.TokenPosition;
+import com.gitplex.jsymbol.TokenPosition;
public class TextRange implements Serializable {
diff --git a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
index 3193a40162..75ef0461a0 100644
--- a/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
+++ b/server.search/src/main/java/com/gitplex/server/search/DefaultIndexManager.java
@@ -71,10 +71,10 @@ import com.gitplex.server.core.manager.DepotManager;
import com.gitplex.server.core.manager.StorageManager;
import com.gitplex.server.core.manager.support.BatchWorker;
import com.gitplex.server.core.manager.support.IndexResult;
-import com.gitplex.symbolextractor.ExtractException;
-import com.gitplex.symbolextractor.Symbol;
-import com.gitplex.symbolextractor.SymbolExtractor;
-import com.gitplex.symbolextractor.SymbolExtractorRegistry;
+import com.gitplex.jsymbol.ExtractException;
+import com.gitplex.jsymbol.Symbol;
+import com.gitplex.jsymbol.SymbolExtractor;
+import com.gitplex.jsymbol.SymbolExtractorRegistry;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.java
index 5847fa015d..666ccb4ac2 100644
--- a/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.java
+++ b/server.search/src/main/java/com/gitplex/server/search/hit/FileHit.java
@@ -7,9 +7,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.util.HighlightableLabel;
-import com.gitplex.symbolextractor.util.NoAntiCacheImage;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.util.HighlightableLabel;
+import com.gitplex.jsymbol.util.NoAntiCacheImage;
public class FileHit extends QueryHit {
diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/PathHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/PathHit.java
index cd4263d8c2..6fe52caf8a 100644
--- a/server.search/src/main/java/com/gitplex/server/search/hit/PathHit.java
+++ b/server.search/src/main/java/com/gitplex/server/search/hit/PathHit.java
@@ -6,9 +6,9 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.util.HighlightableLabel;
-import com.gitplex.symbolextractor.util.NoAntiCacheImage;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.util.HighlightableLabel;
+import com.gitplex.jsymbol.util.NoAntiCacheImage;
public class PathHit extends QueryHit {
diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.java
index debe94152a..420b26a774 100644
--- a/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.java
+++ b/server.search/src/main/java/com/gitplex/server/search/hit/QueryHit.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
-import com.gitplex.symbolextractor.TokenPosition;
+import com.gitplex.jsymbol.TokenPosition;
public abstract class QueryHit implements Serializable, Comparable<QueryHit> {
diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java
index c41830a201..773aabd62a 100644
--- a/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java
+++ b/server.search/src/main/java/com/gitplex/server/search/hit/SymbolHit.java
@@ -5,8 +5,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.Symbol;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.Symbol;
public class SymbolHit extends QueryHit {
diff --git a/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.java b/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.java
index 7f9a15d47c..6aeb45fcc4 100644
--- a/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.java
+++ b/server.search/src/main/java/com/gitplex/server/search/hit/TextHit.java
@@ -5,10 +5,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.request.resource.PackageResourceReference;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.TokenPosition;
-import com.gitplex.symbolextractor.util.HighlightableLabel;
-import com.gitplex.symbolextractor.util.NoAntiCacheImage;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.TokenPosition;
+import com.gitplex.jsymbol.util.HighlightableLabel;
+import com.gitplex.jsymbol.util.NoAntiCacheImage;
public class TextHit extends QueryHit {
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java
index f00ad9fd6c..417ce1e5f4 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/FileQuery.java
@@ -15,7 +15,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.gitplex.commons.util.match.WildcardUtils;
import com.gitplex.server.search.hit.FileHit;
import com.gitplex.server.search.hit.QueryHit;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.google.common.base.Splitter;
public class FileQuery extends BlobQuery {
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
index 26a40cdeff..62ef7b798a 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/PathQuery.java
@@ -15,7 +15,7 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import com.gitplex.commons.util.PathUtils;
import com.gitplex.server.search.hit.PathHit;
import com.gitplex.server.search.hit.QueryHit;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class PathQuery extends BlobQuery {
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
index 7fcf3e1c95..f1eaf62f7b 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/SymbolQuery.java
@@ -23,11 +23,11 @@ import com.gitplex.commons.util.ContentDetector;
import com.gitplex.commons.util.match.WildcardUtils;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.SymbolHit;
-import com.gitplex.symbolextractor.ExtractException;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.Symbol;
-import com.gitplex.symbolextractor.SymbolExtractor;
-import com.gitplex.symbolextractor.SymbolExtractorRegistry;
+import com.gitplex.jsymbol.ExtractException;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.Symbol;
+import com.gitplex.jsymbol.SymbolExtractor;
+import com.gitplex.jsymbol.SymbolExtractorRegistry;
import com.google.common.base.Splitter;
public class SymbolQuery extends BlobQuery {
diff --git a/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java
index eaed55283b..40350f83f5 100644
--- a/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java
+++ b/server.search/src/main/java/com/gitplex/server/search/query/TextQuery.java
@@ -24,8 +24,8 @@ import com.gitplex.server.search.IndexConstants;
import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.TextHit;
import com.gitplex.server.search.query.regex.RegexLiterals;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.TokenPosition;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.TokenPosition;
import com.google.common.base.Splitter;
public class TextQuery extends BlobQuery {
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java
index 13ec097818..2da7dedd5c 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/MatchedBlob.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.util.List;
import com.gitplex.server.search.hit.QueryHit;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class MatchedBlob implements Serializable {
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
index 935b989e70..4620e767d8 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobsearch/result/SearchResultPanel.java
@@ -33,8 +33,8 @@ import com.gitplex.server.search.hit.QueryHit;
import com.gitplex.server.search.hit.TextHit;
import com.gitplex.server.web.component.depotfile.blobview.BlobViewContext;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.util.HighlightableLabel;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.util.HighlightableLabel;
@SuppressWarnings("serial")
public abstract class SearchResultPanel extends Panel {
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
index 89b6a54f70..5ee295cd87 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/BlobViewContext.java
@@ -12,7 +12,7 @@ import com.gitplex.server.core.entity.CodeComment;
import com.gitplex.server.core.entity.Depot;
import com.gitplex.server.core.entity.support.TextRange;
import com.gitplex.server.search.hit.QueryHit;
-import com.gitplex.symbolextractor.TokenPosition;
+import com.gitplex.jsymbol.TokenPosition;
import com.gitplex.commons.git.BlobIdent;
public interface BlobViewContext extends Serializable {
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
index 90f4775560..7e234aaade 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/depotfile/blobview/source/SourceViewPanel.java
@@ -82,11 +82,11 @@ import com.gitplex.server.web.component.symboltooltip.SymbolTooltipPanel;
import com.gitplex.server.web.page.depot.commit.CommitDetailPage;
import com.gitplex.server.web.page.depot.file.DepotFilePage;
import com.gitplex.server.web.util.DateUtils;
-import com.gitplex.symbolextractor.ExtractException;
-import com.gitplex.symbolextractor.Range;
-import com.gitplex.symbolextractor.Symbol;
-import com.gitplex.symbolextractor.SymbolExtractor;
-import com.gitplex.symbolextractor.SymbolExtractorRegistry;
+import com.gitplex.jsymbol.ExtractException;
+import com.gitplex.jsymbol.Range;
+import com.gitplex.jsymbol.Symbol;
+import com.gitplex.jsymbol.SymbolExtractor;
+import com.gitplex.jsymbol.SymbolExtractorRegistry;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
index 83cfcf9247..db2ad9140c 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -74,7 +74,7 @@ import com.gitplex.server.web.page.depot.file.RequestCompareInfo;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;
import com.gitplex.server.web.util.DateUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.google.common.base.Preconditions;
@SuppressWarnings("serial")
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
index 650b56e112..8c64ed9942 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -87,7 +87,7 @@ import com.gitplex.server.web.component.diff.blob.BlobDiffPanel;
import com.gitplex.server.web.component.diff.blob.SourceAware;
import com.gitplex.server.web.component.diff.diffstat.DiffStatBar;
import com.gitplex.server.web.util.SuggestionUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
index 492cf3093c..82c58a8e53 100644
--- a/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
+++ b/server.web/src/main/java/com/gitplex/server/web/component/refmatch/RefMatchBehavior.java
@@ -16,7 +16,7 @@ import com.gitplex.commons.antlr.grammar.ElementSpec;
import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
import com.gitplex.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
import com.gitplex.server.core.util.includeexclude.IncludeExcludeParser;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.gitplex.server.core.entity.Depot;
@SuppressWarnings("serial")
diff --git a/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
index 816af65758..e9262eb972 100644
--- a/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
+++ b/server.web/src/main/java/com/gitplex/server/web/editable/filechoice/FileChoiceEditor.java
@@ -21,7 +21,7 @@ import com.gitplex.commons.wicket.editable.PropertyDescriptor;
import com.gitplex.commons.wicket.editable.PropertyEditor;
import com.gitplex.server.core.annotation.FileChoice;
import com.gitplex.server.web.util.SuggestionUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
@SuppressWarnings("serial")
public class FileChoiceEditor extends PropertyEditor<String> {
diff --git a/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
index 2b58948a45..c01ee1f11e 100644
--- a/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/commit/QueryAssistBehavior.java
@@ -23,7 +23,7 @@ import com.gitplex.server.core.entity.Depot;
import com.gitplex.server.core.manager.CommitInfoManager;
import com.gitplex.server.web.Constants;
import com.gitplex.server.web.util.SuggestionUtils;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
import com.gitplex.server.web.page.depot.commit.CommitQueryParser;
@SuppressWarnings("serial")
diff --git a/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
index 8d58e78262..d487d3a666 100644
--- a/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
+++ b/server.web/src/main/java/com/gitplex/server/web/page/depot/file/DepotFilePage.java
@@ -89,8 +89,8 @@ import com.gitplex.server.web.page.depot.pullrequest.requestdetail.integrationpr
import com.gitplex.server.web.websocket.CodeCommentChangedRegion;
import com.gitplex.server.web.websocket.CommitIndexedRegion;
import com.gitplex.server.web.websocket.PullRequestChangedRegion;
-import com.gitplex.symbolextractor.TokenPosition;
-import com.gitplex.symbolextractor.util.NoAntiCacheImage;
+import com.gitplex.jsymbol.TokenPosition;
+import com.gitplex.jsymbol.util.NoAntiCacheImage;
import com.google.common.base.Objects;
@SuppressWarnings("serial")
diff --git a/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java b/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
index bffe301783..f272caa2f9 100644
--- a/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
+++ b/server.web/src/main/java/com/gitplex/server/web/util/SuggestionUtils.java
@@ -20,7 +20,7 @@ import com.gitplex.commons.util.match.WildcardUtils;
import com.gitplex.server.core.GitPlex;
import com.gitplex.server.core.entity.Depot;
import com.gitplex.server.core.manager.CommitInfoManager;
-import com.gitplex.symbolextractor.Range;
+import com.gitplex.jsymbol.Range;
public class SuggestionUtils {