5 files changed, 37 insertions, 45 deletions

diff --git a/modules/indexer/issues/bleve.go b/modules/indexer/issues/bleve.go
index db12874e84..d986a0e55e 100644
--- a/modules/indexer/issues/bleve.go
+++ b/modules/indexer/issues/bleve.go
@@ -156,9 +156,7 @@ func createIssueIndexer(path string, latestVersion int) (bleve.Index, error) {
 	return index, nil
 }
 
-var (
-	_ Indexer = &BleveIndexer{}
-)
+var _ Indexer = &BleveIndexer{}
 
 // BleveIndexer implements Indexer interface
 type BleveIndexer struct {
@@ -256,7 +254,7 @@ func (b *BleveIndexer) Search(keyword string, repoIDs []int64, limit, start int)
 		return nil, err
 	}
 
-	var ret = SearchResult{
+	ret := SearchResult{
 		Hits: make([]Match, 0, len(result.Hits)),
 	}
 	for _, hit := range result.Hits {
diff --git a/modules/indexer/issues/bleve_test.go b/modules/indexer/issues/bleve_test.go
index 036b318d85..df036fb573 100644
--- a/modules/indexer/issues/bleve_test.go
+++ b/modules/indexer/issues/bleve_test.go
@@ -53,43 +53,41 @@ func TestBleveIndexAndSearch(t *testing.T) {
 	})
 	assert.NoError(t, err)
 
-	var (
-		keywords = []struct {
-			Keyword string
-			IDs     []int64
-		}{
-			{
-				Keyword: "search",
-				IDs:     []int64{1},
-			},
-			{
-				Keyword: "test1",
-				IDs:     []int64{1},
-			},
-			{
-				Keyword: "test2",
-				IDs:     []int64{1},
-			},
-			{
-				Keyword: "support",
-				IDs:     []int64{1, 2},
-			},
-			{
-				Keyword: "chinese",
-				IDs:     []int64{1, 2},
-			},
-			{
-				Keyword: "help",
-				IDs:     []int64{},
-			},
-		}
-	)
+	keywords := []struct {
+		Keyword string
+		IDs     []int64
+	}{
+		{
+			Keyword: "search",
+			IDs:     []int64{1},
+		},
+		{
+			Keyword: "test1",
+			IDs:     []int64{1},
+		},
+		{
+			Keyword: "test2",
+			IDs:     []int64{1},
+		},
+		{
+			Keyword: "support",
+			IDs:     []int64{1, 2},
+		},
+		{
+			Keyword: "chinese",
+			IDs:     []int64{1, 2},
+		},
+		{
+			Keyword: "help",
+			IDs:     []int64{},
+		},
+	}
 
 	for _, kw := range keywords {
 		res, err := indexer.Search(kw.Keyword, []int64{2}, 10, 0)
 		assert.NoError(t, err)
 
-		var ids = make([]int64, 0, len(res.Hits))
+		ids := make([]int64, 0, len(res.Hits))
 		for _, hit := range res.Hits {
 			ids = append(ids, hit.ID)
 		}
diff --git a/modules/indexer/issues/db.go b/modules/indexer/issues/db.go
index d0cca4fd18..f02cbddce8 100644
--- a/modules/indexer/issues/db.go
+++ b/modules/indexer/issues/db.go
@@ -7,8 +7,7 @@ package issues
 import "code.gitea.io/gitea/models"
 
 // DBIndexer implements Indexer interface to use database's like search
-type DBIndexer struct {
-}
+type DBIndexer struct{}
 
 // Init dummy function
 func (db *DBIndexer) Init() (bool, error) {
@@ -35,7 +34,7 @@ func (db *DBIndexer) Search(kw string, repoIDs []int64, limit, start int) (*Sear
 	if err != nil {
 		return nil, err
 	}
-	var result = SearchResult{
+	result := SearchResult{
 		Total: total,
 		Hits:  make([]Match, 0, limit),
 	}
diff --git a/modules/indexer/issues/elastic_search.go b/modules/indexer/issues/elastic_search.go
index 3af64ed30e..187b69b749 100644
--- a/modules/indexer/issues/elastic_search.go
+++ b/modules/indexer/issues/elastic_search.go
@@ -16,9 +16,7 @@ import (
 	"github.com/olivere/elastic/v7"
 )
 
-var (
-	_ Indexer = &ElasticSearchIndexer{}
-)
+var _ Indexer = &ElasticSearchIndexer{}
 
 // ElasticSearchIndexer implements Indexer interface
 type ElasticSearchIndexer struct {
@@ -102,7 +100,7 @@ func (b *ElasticSearchIndexer) Init() (bool, error) {
 	}
 
 	if !exists {
-		var mapping = defaultMapping
+		mapping := defaultMapping
 
 		createIndex, err := b.client.CreateIndex(b.indexerName).BodyString(mapping).Do(ctx)
 		if err != nil {
@@ -195,7 +193,7 @@ func (b *ElasticSearchIndexer) Search(keyword string, repoIDs []int64, limit, st
 	query := elastic.NewBoolQuery()
 	query = query.Must(kwQuery)
 	if len(repoIDs) > 0 {
-		var repoStrs = make([]interface{}, 0, len(repoIDs))
+		repoStrs := make([]interface{}, 0, len(repoIDs))
 		for _, repoID := range repoIDs {
 			repoStrs = append(repoStrs, repoID)
 		}
diff --git a/modules/indexer/issues/indexer_test.go b/modules/indexer/issues/indexer_test.go
index ba35e37fd8..ee6ebcdd18 100644
--- a/modules/indexer/issues/indexer_test.go
+++ b/modules/indexer/issues/indexer_test.go
@@ -71,7 +71,6 @@ func TestBleveSearchIssues(t *testing.T) {
 	ids, err = SearchIssuesByKeyword([]int64{1}, "good")
 	assert.NoError(t, err)
 	assert.EqualValues(t, []int64{1}, ids)
-
 }
 
 func TestDBSearchIssues(t *testing.T) {