enable literal string for code search

Close: #33588
go-gitea · Feb 14, 2025 · dcb58f0 · dcb58f0
1 parent d88b012
commit dcb58f0
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go
@@ -260,17 +260,24 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 	var (
 		indexerQuery query.Query
 		keywordQuery query.Query
+		contentQuery query.Query
 	)
 
 	pathQuery := bleve.NewPrefixQuery(strings.ToLower(opts.Keyword))
 	pathQuery.FieldVal = "Filename"
 	pathQuery.SetBoost(10)
 
-	contentQuery := bleve.NewMatchQuery(opts.Keyword)
-	contentQuery.FieldVal = "Content"
-
-	if opts.IsKeywordFuzzy {
-		contentQuery.Fuzziness = inner_bleve.GuessFuzzinessByKeyword(opts.Keyword)
+	if opts.IsKeywordLiteral {
+		q := bleve.NewMatchPhraseQuery(opts.Keyword)
+		q.FieldVal = "Content"
+		contentQuery = q
+	} else {
+		q := bleve.NewMatchQuery(opts.Keyword)
+		q.FieldVal = "Content"
+		if opts.IsKeywordFuzzy {
+			q.Fuzziness = inner_bleve.GuessFuzzinessByKeyword(opts.Keyword)
+		}
+		contentQuery = q
 	}
 
 	keywordQuery = bleve.NewDisjunctionQuery(contentQuery, pathQuery)

diff --git a/modules/indexer/code/internal/indexer.go b/modules/indexer/code/internal/indexer.go
@@ -25,7 +25,8 @@ type SearchOptions struct {
 	Keyword  string
 	Language string
 
-	IsKeywordFuzzy bool
+	IsKeywordFuzzy   bool
+	IsKeywordLiteral bool
 
 	db.Paginator
 }

diff --git a/routers/common/codesearch.go b/routers/common/codesearch.go
@@ -4,14 +4,17 @@
 package common
 
 import (
+	"strings"
+
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/services/context"
 )
 
 func PrepareCodeSearch(ctx *context.Context) (ret struct {
-	Keyword  string
-	Language string
-	IsFuzzy  bool
+	Keyword   string
+	Language  string
+	IsFuzzy   bool
+	IsLiteral bool
 },
 ) {
 	ret.Language = ctx.FormTrim("l")
@@ -35,5 +38,10 @@ func PrepareCodeSearch(ctx *context.Context) (ret struct {
 	ctx.Data["IsFuzzy"] = isFuzzy
 
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
+
+	if strings.HasPrefix(ret.Keyword, "\"") && strings.HasSuffix(ret.Keyword, "\"") {
+		ret.Keyword = strings.Trim(ret.Keyword, "\"")
+		ret.IsLiteral = true
+	}
 	return ret
 }
diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go
@@ -72,10 +72,11 @@ func Code(ctx *context.Context) {
 
 	if (len(repoIDs) > 0) || isAdmin {
 		total, searchResults, searchResultLanguages, err = code_indexer.PerformSearch(ctx, &code_indexer.SearchOptions{
-			RepoIDs:        repoIDs,
-			Keyword:        prepareSearch.Keyword,
-			IsKeywordFuzzy: prepareSearch.IsFuzzy,
-			Language:       prepareSearch.Language,
+			RepoIDs:          repoIDs,
+			Keyword:          prepareSearch.Keyword,
+			IsKeywordFuzzy:   prepareSearch.IsFuzzy,
+			IsKeywordLiteral: prepareSearch.IsLiteral,
+			Language:         prepareSearch.Language,
 			Paginator: &db.ListOptions{
 				Page:     page,
 				PageSize: setting.UI.RepoSearchPagingNum,

diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go
@@ -48,10 +48,11 @@ func Search(ctx *context.Context) {
 	if setting.Indexer.RepoIndexerEnabled {
 		var err error
 		total, searchResults, searchResultLanguages, err = code_indexer.PerformSearch(ctx, &code_indexer.SearchOptions{
-			RepoIDs:        []int64{ctx.Repo.Repository.ID},
-			Keyword:        prepareSearch.Keyword,
-			IsKeywordFuzzy: prepareSearch.IsFuzzy,
-			Language:       prepareSearch.Language,
+			RepoIDs:          []int64{ctx.Repo.Repository.ID},
+			Keyword:          prepareSearch.Keyword,
+			IsKeywordFuzzy:   prepareSearch.IsFuzzy,
+			IsKeywordLiteral: prepareSearch.IsLiteral,
+			Language:         prepareSearch.Language,
 			Paginator: &db.ListOptions{
 				Page:     page,
 				PageSize: setting.UI.RepoSearchPagingNum,

diff --git a/routers/web/user/code.go b/routers/web/user/code.go
@@ -68,10 +68,11 @@ func CodeSearch(ctx *context.Context) {
 
 	if len(repoIDs) > 0 {
 		total, searchResults, searchResultLanguages, err = code_indexer.PerformSearch(ctx, &code_indexer.SearchOptions{
-			RepoIDs:        repoIDs,
-			Keyword:        prepareSearch.Keyword,
-			IsKeywordFuzzy: prepareSearch.IsFuzzy,
-			Language:       prepareSearch.Language,
+			RepoIDs:          repoIDs,
+			Keyword:          prepareSearch.Keyword,
+			IsKeywordFuzzy:   prepareSearch.IsFuzzy,
+			IsKeywordLiteral: prepareSearch.IsLiteral,
+			Language:         prepareSearch.Language,
 			Paginator: &db.ListOptions{
 				Page:     page,
 				PageSize: setting.UI.RepoSearchPagingNum,