Remove final newline from rendered code

go-gitea · May 20, 2022 · 96238e9 · 96238e9
1 parent fd7d83a
commit 96238e9
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 9 deletions.
diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go
@@ -190,10 +190,6 @@ func File(numLines int, fileName, language string, code []byte) []string {
 	}
 
 	htmlw.Flush()
-	finalNewLine := false
-	if len(code) > 0 {
-		finalNewLine = code[len(code)-1] == '\n'
-	}
 
 	m := make([]string, 0, numLines)
 	for _, v := range strings.SplitN(htmlbuf.String(), "\n", numLines) {
@@ -208,9 +204,6 @@ func File(numLines int, fileName, language string, code []byte) []string {
 		content = strings.TrimPrefix(content, `</span>`)
 		m = append(m, content)
 	}
-	if finalNewLine {
-		m = append(m, "<span class=\"w\">\n</span>")
-	}
 
 	return m
 }

diff --git a/modules/highlight/highlight_test.go b/modules/highlight/highlight_test.go
@@ -53,8 +53,6 @@ steps:
 				`</span></span><span class="line"><span class="cl"><span class="w">	</span>- <span class="l">go build -v</span>`,
 				`</span></span><span class="line"><span class="cl"><span class="w">	</span>- <span class="l">go test -v -race -coverprofile=coverage.txt -covermode=atomic</span><span class="w">
 </span></span></span>`,
-				`<span class="w">
-</span>`,
 			},
 		},
 		{