simplify code per comments

go-gitea · Feb 14, 2025 · e87e418 · e87e418
1 parent dcb58f0
commit e87e418
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 29 deletions.
diff --git a/modules/indexer/code/bleve/bleve.go b/modules/indexer/code/bleve/bleve.go
@@ -267,7 +267,8 @@ func (b *Indexer) Search(ctx context.Context, opts *internal.SearchOptions) (int
 	pathQuery.FieldVal = "Filename"
 	pathQuery.SetBoost(10)
 
-	if opts.IsKeywordLiteral {
+	if strings.HasPrefix(opts.Keyword, "\"") && strings.HasSuffix(opts.Keyword, "\"") {
+		opts.Keyword = strings.Trim(opts.Keyword, "\"")
 		q := bleve.NewMatchPhraseQuery(opts.Keyword)
 		q.FieldVal = "Content"
 		contentQuery = q

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

diff --git a/routers/common/codesearch.go b/routers/common/codesearch.go
@@ -4,17 +4,14 @@
 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
-	IsLiteral bool
+	Keyword  string
+	Language string
+	IsFuzzy  bool
 },
 ) {
 	ret.Language = ctx.FormTrim("l")
@@ -38,10 +35,5 @@ 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,11 +72,10 @@ 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,
-			IsKeywordLiteral: prepareSearch.IsLiteral,
-			Language:         prepareSearch.Language,
+			RepoIDs:        repoIDs,
+			Keyword:        prepareSearch.Keyword,
+			IsKeywordFuzzy: prepareSearch.IsFuzzy,
+			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,11 +48,10 @@ 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,
-			IsKeywordLiteral: prepareSearch.IsLiteral,
-			Language:         prepareSearch.Language,
+			RepoIDs:        []int64{ctx.Repo.Repository.ID},
+			Keyword:        prepareSearch.Keyword,
+			IsKeywordFuzzy: prepareSearch.IsFuzzy,
+			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,11 +68,10 @@ 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,
-			IsKeywordLiteral: prepareSearch.IsLiteral,
-			Language:         prepareSearch.Language,
+			RepoIDs:        repoIDs,
+			Keyword:        prepareSearch.Keyword,
+			IsKeywordFuzzy: prepareSearch.IsFuzzy,
+			Language:       prepareSearch.Language,
 			Paginator: &db.ListOptions{
 				Page:     page,
 				PageSize: setting.UI.RepoSearchPagingNum,