diff options
| author | silverwind <me@silverwind.io> | 2022-06-10 15:45:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-10 21:45:28 +0800 |
| commit | 527e5bd1b29c1087d4b5375beac519d0b74294eb (patch) | |
| tree | e5f96a202f7e17b3d117032260cb96848c4b11b1 /modules/highlight/highlight.go | |
| parent | 4d8e9f3b849223ede0f11cf7a0a9296d0bce048c (diff) | |
| download | gitea-527e5bd1b29c1087d4b5375beac519d0b74294eb.tar.gz gitea-527e5bd1b29c1087d4b5375beac519d0b74294eb.zip | |
Fix copy/paste of empty lines (#19798)
* Fix copy/paste of empty newlines again
Fixes: https://github.com/go-gitea/gitea/issues/19331
Regressed by: https://github.com/go-gitea/gitea/pull/18270
Needed to do another newline addition to the Chroma output HTML to get
copy/paste work again. The previous replacement conditions are probably
obsolete, but as I'm not 100% sure, I opted to keep them.
Specifically, the Chroma HTML change mentioned in
https://github.com/go-gitea/gitea/pull/18270#issuecomment-1013350246
broke our previous newline replacement for such empty lines.
Also included are a few changes to make the test more pleasant to work
with.
* run go mod tidy
* add util.Dedent
* copy in the code
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'modules/highlight/highlight.go')
| -rw-r--r-- | modules/highlight/highlight.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/highlight/highlight.go b/modules/highlight/highlight.go index 344be78144..a72f26d5f0 100644 --- a/modules/highlight/highlight.go +++ b/modules/highlight/highlight.go @@ -203,6 +203,8 @@ func File(numLines int, fileName, language string, code []byte) []string { content = "\n" } else if content == `</span><span class="w">` { content += "\n</span>" + } else if content == `</span></span><span class="line"><span class="cl">` { + content += "\n" } content = strings.TrimSuffix(content, `<span class="w">`) content = strings.TrimPrefix(content, `</span>`) |