The Unified and Autonomous Development Platform
midwork
robin shinec9f47648af48
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.javaindex 274f7b5aa1..e6baf85cb8 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@@ -173,6 +173,7 @@ public class DefaultIndexManager implements IndexManager {&& (treeWalk.getTreeCount() == 1 || !treeWalk.idEqual(0, 1))) {ObjectId blobId = treeWalk.getObjectId(0);String blobPath = treeWalk.getPathString();+ String blobName = treeWalk.getNameString();BooleanQuery query = new BooleanQuery();query.add(BLOB_HASH.query(blobId.name()), Occur.MUST);@@ -207,7 +208,7 @@ public class DefaultIndexManager implements IndexManager {checked++;}- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobPath);+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);String currentBlobIndexVersion = getCurrentBlobIndexVersion(extractor);String blobIndexVersion = blobIndexVersionRef.get();if (blobIndexVersion != null) {@@ -267,7 +268,7 @@ public class DefaultIndexManager implements IndexManager {if (extractor != null) {try {- List<Symbol> symbols = extractor.extract(content, blobPath);+ List<Symbol> symbols = extractor.extract(content);for (Symbol symbol: symbols) {String fieldValue = symbol.getName();if (fieldValue != null && symbol.isSearchable()) {diff --git a/server.search/src/main/java/com/gitplex/server/search/query/SourceContext.java b/server.search/src/main/java/com/gitplex/server/search/query/SourceContext.javadeleted file mode 100644index fcb5806f94..0000000000--- a/server.search/src/main/java/com/gitplex/server/search/query/SourceContext.java+++ /dev/null@@ -1,64 +0,0 @@-package com.gitplex.server.search.query;--import java.util.HashSet;-import java.util.List;-import java.util.Set;--import com.gitplex.commons.git.Blob;-import com.gitplex.jsymbol.Symbol;-import com.gitplex.jsyntax.Token;-import com.gitplex.jsyntax.Tokenizer;-import com.gitplex.jsyntax.TokenizerRegistry;-import com.google.common.base.CharMatcher;-import com.google.common.base.Preconditions;-import com.google.common.base.Splitter;--public class SourceContext {-- private static final CharMatcher NAMESPACE_SEPARATOR = new CharMatcher() {-- @Override- public boolean matches(char c) {- return !Character.isJavaIdentifierPart(c);- }-- };-- private final Set<String> identifiers;-- public SourceContext(Blob blob) {- Tokenizer tokenizer = TokenizerRegistry.getTokenizer(blob.getIdent().path);- if (tokenizer != null) {- identifiers = new HashSet<>();- List<String> lines = Preconditions.checkNotNull(blob.getText()).getLines();- for (List<Token> tokenizedLine: tokenizer.tokenize(lines)) {- for (Token token: tokenizedLine) {- if (token.isNotCommentOrString() && !token.isKeyword() && !token.isAtom())- identifiers.add(token.getText());- }- }- } else {- identifiers = null;- }- }-- public boolean maybeUsing(Symbol symbol) {- if (identifiers != null) {- Set<String> parentNames = new HashSet<>();- Symbol parent = symbol.getParent();- while (parent != null) {- if (parent.getName() != null) {- parentNames.addAll(Splitter- .on(NAMESPACE_SEPARATOR)- .omitEmptyStrings()- .splitToList(parent.getName()));- }- parent = parent.getParent();- }- return identifiers.containsAll(parentNames);- } else {- return true;- }- }--}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.javaindex 9956ce1d55..1215aaf1cc 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@@ -42,11 +42,9 @@ public class SymbolQuery extends BlobQuery {private final String fileNames;- private final SourceContext sourceContext;-private SymbolQuery(String term, @Nullable String excludeTerm, @Nullable String excludeBlobPath,@Nullable Boolean primary, @Nullable Boolean local, boolean caseSensitive, @Nullable String directory,- @Nullable String fileNames, @Nullable SourceContext sourceContext, int count) {+ @Nullable String fileNames, int count) {super(directory, count);this.term = term;@@ -56,7 +54,6 @@ public class SymbolQuery extends BlobQuery {this.local = local;this.caseSensitive = caseSensitive;this.fileNames = fileNames;- this.sourceContext = sourceContext;}@Override@@ -95,8 +92,7 @@ public class SymbolQuery extends BlobQuery {}if (WildcardUtils.matchString(normalizedTerm, normalizedSymbolName)&& (normalizedExcludeTerm == null || !normalizedSymbolName.equals(normalizedExcludeTerm))- && (excludeBlobPath == null || !excludeBlobPath.equals(blobPath))- && (sourceContext == null || sourceContext.maybeUsing(symbol))) {+ && (excludeBlobPath == null || !excludeBlobPath.equals(blobPath))) {Range matchRange = WildcardUtils.rangeOfMatch(normalizedTerm, normalizedSymbolName);hits.add(new SymbolHit(blobPath, symbol, matchRange));}@@ -157,8 +153,6 @@ public class SymbolQuery extends BlobQuery {private String fileNames;- private SourceContext sourceContext;-public Builder term(String term) {this.term = term;return this;@@ -204,16 +198,11 @@ public class SymbolQuery extends BlobQuery {return this;}- public Builder sourceContext(SourceContext sourceContext) {- this.sourceContext = sourceContext;- return this;- }-public SymbolQuery build() {Preconditions.checkArgument(term!=null, "Query term should be specified");Preconditions.checkArgument(count!=0, "Query count should be specified");return new SymbolQuery(term, excludeTerm, excludeBlobPath, primary, local,- caseSensitive, directory, fileNames, sourceContext, count);+ caseSensitive, directory, fileNames, count);}}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.javaindex 12b1e0a982..fc2d6cf98b 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@@ -137,10 +137,11 @@ public class SourceViewPanel extends BlobViewPanel {Blob blob = context.getDepot().getBlob(context.getBlobIdent());Preconditions.checkArgument(blob.getText() != null);- SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(context.getBlobIdent().path);+ String blobName = context.getBlobIdent().getName();+ SymbolExtractor<Symbol> extractor = SymbolExtractorRegistry.getExtractor(blobName);if (extractor != null) {try {- symbols.addAll(extractor.extract(null, blob.getText().getContent()));+ symbols.addAll(extractor.extract(blob.getText().getContent()));} catch (ExtractException e) {logger.debug("Error extracting symbols from blob: " + context.getBlobIdent(), e);}diff --git a/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.javaindex 6c030fd492..638ec934f7 100644--- a/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java+++ b/server.web/src/main/java/com/gitplex/server/web/component/symboltooltip/SymbolTooltipPanel.java@@ -44,7 +44,6 @@ import com.gitplex.server.search.hit.QueryHit;import com.gitplex.server.search.hit.SymbolHit;import com.gitplex.server.search.query.BlobQuery;import com.gitplex.server.search.query.PathQuery;-import com.gitplex.server.search.query.SourceContext;import com.gitplex.server.search.query.SymbolQuery;import com.gitplex.server.search.query.TextQuery;import com.gitplex.server.web.component.depotfile.blobsearch.result.SearchResultPanel;@@ -229,7 +228,6 @@ public abstract class SymbolTooltipPanel extends Panel {if (symbolHits.size() < QUERY_ENTRIES) {// then find in other files for public symbols- SourceContext sourceContext = new SourceContext(blob);try {SearchManager searchManager = GitPlex.getInstance(SearchManager.class);ObjectId commit = depotModel.getObject().getRevCommit(revision);@@ -240,7 +238,6 @@ public abstract class SymbolTooltipPanel extends Panel {.primary(true).local(false).caseSensitive(true)- .sourceContext(sourceContext).count(QUERY_ENTRIES).build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));@@ -251,7 +248,6 @@ public abstract class SymbolTooltipPanel extends Panel {.primary(false).local(false).caseSensitive(true)- .sourceContext(sourceContext).count(QUERY_ENTRIES - symbolHits.size()).build();symbolHits.addAll(searchManager.search(depotModel.getObject(), commit, query));