Support CRLF when splitting code lines for display (#1862)

* Support CRLF when splitting code lines for display * refactor, fix mixed match * fmt * split on both LF and CRLF, use raw literals in regexes * simplify
go-gitea · Jun 10, 2017 · f2fcd9d · f2fcd9d
1 parent 446a41d
commit f2fcd9d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/public/css/index.css b/public/css/index.css
@@ -1435,7 +1435,7 @@ footer .ui.language .menu {
 .repository.file.list #file-content .code-view .lines-code ol li,
 .repository.file.list #file-content .code-view .lines-num .hljs li,
 .repository.file.list #file-content .code-view .lines-code .hljs li {
-  display: inline-block;
+  display: block;
   width: 100%;
 }
 .repository.file.list #file-content .code-view .lines-num pre li.active,

diff --git a/public/less/_repository.less b/public/less/_repository.less
@@ -296,7 +296,7 @@
 						margin: 0;
 						padding: 0 !important;
 						li {
-							display: inline-block;
+							display: block;
 							width: 100%;
 							&.active {
 								background: #ffffdd;

diff --git a/routers/repo/view.go b/routers/repo/view.go
@@ -212,7 +212,11 @@ func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink st
 			var output bytes.Buffer
 			lines := strings.Split(fileContent, "\n")
 			for index, line := range lines {
-				output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, gotemplate.HTMLEscapeString(line)) + "\n")
+				line = gotemplate.HTMLEscapeString(line)
+				if index != len(lines)-1 {
+					line += "\n"
+				}
+				output.WriteString(fmt.Sprintf(`<li class="L%d" rel="L%d">%s</li>`, index+1, index+1, line))
 			}
 			ctx.Data["FileContent"] = gotemplate.HTML(output.String())