fix

go-gitea · Feb 19, 2024 · afaa60e · afaa60e
1 parent 5e72526
commit afaa60e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 30 deletions.
diff --git a/modules/indexer/code/search.go b/modules/indexer/code/search.go
@@ -16,14 +16,13 @@ import (
 
 // Result a search result to display
 type Result struct {
-	RepoID         int64
-	Filename       string
-	CommitID       string
-	UpdatedUnix    timeutil.TimeStamp
-	Language       string
-	Color          string
-	LineNumbers    []int
-	FormattedLines template.HTML
+	RepoID      int64
+	Filename    string
+	CommitID    string
+	UpdatedUnix timeutil.TimeStamp
+	Language    string
+	Color       string
+	Lines       map[int]template.HTML
 }
 
 type SearchResultLanguages = internal.SearchResultLanguages
@@ -67,12 +66,11 @@ func writeStrings(buf *bytes.Buffer, strs ...string) error {
 func searchResult(result *internal.SearchResult, startIndex, endIndex int) (*Result, error) {
 	startLineNum := 1 + strings.Count(result.Content[:startIndex], "\n")
 
-	var formattedLinesBuffer bytes.Buffer
-
 	contentLines := strings.SplitAfter(result.Content[startIndex:endIndex], "\n")
-	lineNumbers := make([]int, len(contentLines))
+	lines := make(map[int]template.HTML, len(contentLines))
 	index := startIndex
 	for i, line := range contentLines {
+		var formattedLinesBuffer bytes.Buffer
 		var err error
 		if index < result.EndIndex &&
 			result.StartIndex < index+len(line) &&
@@ -93,21 +91,18 @@ func searchResult(result *internal.SearchResult, startIndex, endIndex int) (*Res
 			return nil, err
 		}
 
-		lineNumbers[i] = startLineNum + i
+		lines[startLineNum+i], _ = highlight.Code(result.Filename, "", formattedLinesBuffer.String())
 		index += len(line)
 	}
 
-	highlighted, _ := highlight.Code(result.Filename, "", formattedLinesBuffer.String())
-
 	return &Result{
-		RepoID:         result.RepoID,
-		Filename:       result.Filename,
-		CommitID:       result.CommitID,
-		UpdatedUnix:    result.UpdatedUnix,
-		Language:       result.Language,
-		Color:          result.Color,
-		LineNumbers:    lineNumbers,
-		FormattedLines: highlighted,
+		RepoID:      result.RepoID,
+		Filename:    result.Filename,
+		CommitID:    result.CommitID,
+		UpdatedUnix: result.UpdatedUnix,
+		Language:    result.Language,
+		Color:       result.Color,
+		Lines:       lines,
 	}, nil
 }
 

diff --git a/templates/code/searchresults.tmpl b/templates/code/searchresults.tmpl
@@ -25,14 +25,14 @@
 				<div class="file-body file-code code-view">
 					<table>
 						<tbody>
+							{{range $k, $line := .Lines}}
 							<tr>
 								<td class="lines-num">
-									{{range .LineNumbers}}
-										<a href="{{$repo.Link}}/src/commit/{{$result.CommitID | PathEscape}}/{{$result.Filename | PathEscapeSegments}}#L{{.}}"><span>{{.}}</span></a>
-									{{end}}
+									<a href="{{$repo.Link}}/src/commit/{{$result.CommitID | PathEscape}}/{{$result.Filename | PathEscapeSegments}}#L{{$k}}"><span>{{$k}}</span></a>
 								</td>
-								<td class="lines-code chroma"><code class="code-inner">{{.FormattedLines}}</code></td>
+								<td class="lines-code chroma"><code class="code-inner">{{$line}}</code></td>
 							</tr>
+							{{end}}
 						</tbody>
 					</table>
 				</div>

diff --git a/templates/repo/search.tmpl b/templates/repo/search.tmpl
@@ -47,14 +47,14 @@
 								<div class="file-body file-code code-view">
 									<table>
 										<tbody>
+											{{range $k, $line := .Lines}}
 											<tr>
 												<td class="lines-num">
-													{{range .LineNumbers}}
-														<a href="{{$.SourcePath}}/src/commit/{{PathEscape $result.CommitID}}/{{PathEscapeSegments $result.Filename}}#L{{.}}"><span>{{.}}</span></a>
-													{{end}}
+													<a href="{{$.SourcePath}}/src/commit/{{PathEscape $result.CommitID}}/{{PathEscapeSegments $result.Filename}}#L{{$k}}"><span>{{$k}}</span></a>
 												</td>
-												<td class="lines-code chroma"><code class="code-inner">{{.FormattedLines}}</code></td>
+												<td class="lines-code chroma"><code class="code-inner">{{$line}}</code></td>
 											</tr>
+											{{end}}
 										</tbody>
 									</table>
 								</div>