527e5bd1 - gitea

Authored by: silverwind
Authored at: 2022-06-10 15:45:28 +0200
Committed by: GitHub
Committed at: 2022-06-10 21:45:28 +0800
Signature: View
-----BEGIN PGP SIGNATURE----- wsBcBAABCAAQBQJio0r4CRBK7hj4Ov3rIwAAxmYIAJ5nIl930SHfrpqtHtMybGv1 +zgyziH2KTY0OtpWsNhwTrb9U3Q5hvRwyuC7qp0G37r0qLw+mJaRVfBOgxOYvbor mgMimfvd23LjwxJF3U1Zu/aF6nGby0PZJOcHdFexVO46GSD4jblER8U6O2AyDBPg 8UaPwwx2MFaJ28LcIdFXELjeyvf+cBF21K7hMIpzUafR8Nkfm16LaQnfo7YRTNBE YD19ruiMuakRrcgKvkBX86nnEGcEHZRCf2HmmJYU+x7LNmJ7IUkMVSzxg6Hma/TM HVX1sOzgioH2JTS/ZkzMcKWNnkv3mjdGXLjwf6Bnmbx+YYI2qI9npKv/os8/BIQ= =zU/2 -----END PGP SIGNATURE-----
Object name: 527e5bd1b29c1087d4b5375beac519d0b74294eb
Parent: 4d8e9f3b

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>

Changes

4 changed files (+105/-61)

modules/highlight/highlight.go
- @@ -203,6 +203,8 @@ func File(numLines int, fileName, language string, code []byte) []string {
 content = "\n" } else if content == `` { content += "\n" + } else if content == `` { + content += "\n" } content = strings.TrimSuffix(content, ``) content = strings.TrimPrefix(content, ``)
modules/highlight/highlight_test.go
- @@ -5,11 +5,13 @@
 package highlight import ( - "reflect" + "strings" "testing" "code.gitea.io/gitea/modules/setting" + "code.gitea.io/gitea/modules/util" + "github.com/stretchr/testify/assert" "gopkg.in/ini.v1" )
- @@ -20,83 +22,83 @@ func TestFile(t *testing.T) {
 numLines int fileName string code string - want []string + want string }{ { name: ".drone.yml", numLines: 12, fileName: ".drone.yml", - code: `kind: pipeline - name: default + code: util.Dedent(` + kind: pipeline + name: default - steps: - - name: test - image: golang:1.13 - environment: - GOPROXY: https://goproxy.cn - commands: - - go get -u - - go build -v - - go test -v -race -coverprofile=coverage.txt -covermode=atomic - `, - want: []string{ - `kind: pipeline`, - `name: default`, - ``, - `steps:`, - `- name: test`, - ` image: golang:1.13`, - ` environment:`, - ` GOPROXY: https://goproxy.cn`, - ` commands:`, - ` - go get -u`, - ` - go build -v`, - ` - go test -v -race -coverprofile=coverage.txt -covermode=atomic - `, - ` - `, - }, + steps: + - name: test + image: golang:1.13 + environment: + GOPROXY: https://goproxy.cn + commands: + - go get -u + - go build -v + - go test -v -race -coverprofile=coverage.txt -covermode=atomic + `), + want: util.Dedent(` + kind: pipeline + name: default + + steps: + - name: test + image: golang:1.13 + environment: + GOPROXY: https://goproxy.cn + commands: + - go get -u + - go build -v + - go test -v -race -coverprofile=coverage.txt -covermode=atomic + `), }, { name: ".drone.yml - trailing space", numLines: 13, fileName: ".drone.yml", - code: `kind: pipeline - name: default ` + ` + code: strings.Replace(util.Dedent(` + kind: pipeline + name: default - steps: - - name: test - image: golang:1.13 - environment: - GOPROXY: https://goproxy.cn - commands: - - go get -u - - go build -v - - go test -v -race -coverprofile=coverage.txt -covermode=atomic - `, - want: []string{ - `kind: pipeline`, - `name: default `, - ``, - `steps:`, - `- name: test`, - ` image: golang:1.13`, - ` environment:`, - ` GOPROXY: https://goproxy.cn`, - ` commands:`, - ` - go get -u`, - ` - go build -v`, - ` - go test -v -race -coverprofile=coverage.txt -covermode=atomic`, - ` `, - }, + steps: + - name: test + image: golang:1.13 + environment: + GOPROXY: https://goproxy.cn + commands: + - go get -u + - go build -v + - go test -v -race -coverprofile=coverage.txt -covermode=atomic + `)+"\n", "name: default", "name: default ", 1), + want: util.Dedent(` + kind: pipeline + name: default + + steps: + - name: test + image: golang:1.13 + environment: + GOPROXY: https://goproxy.cn + commands: + - go get -u + - go build -v + - go test -v -race -coverprofile=coverage.txt -covermode=atomic + + + + `), }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { - if got := File(tt.numLines, tt.fileName, "", []byte(tt.code)); !reflect.DeepEqual(got, tt.want) { - t.Errorf("File() = %v, want %v", got, tt.want) - } + got := strings.Join(File(tt.numLines, tt.fileName, "", []byte(tt.code)), "\n") + assert.Equal(t, tt.want, got) }) } }
modules/util/util.go
- @@ -9,6 +9,7 @@ import (
  "crypto/rand" "errors" "math/big" + "regexp" "strconv" "strings"
- @@ -191,3 +192,35 @@ var titleCaser = cases.Title(language.English)
  func ToTitleCase(s string) string { return titleCaser.String(s) } + + var ( + whitespaceOnly = regexp.MustCompile("(?m)^[ \t]+$") + leadingWhitespace = regexp.MustCompile("(?m)(^[ \t]*)(?:[^ \t\n])") + ) + + // Dedent removes common indentation of a multi-line string along with whitespace around it + // Based on https://github.com/lithammer/dedent + func Dedent(s string) string { + var margin string + + s = whitespaceOnly.ReplaceAllString(s, "") + indents := leadingWhitespace.FindAllStringSubmatch(s, -1) + + for i, indent := range indents { + if i == 0 { + margin = indent[1] + } else if strings.HasPrefix(indent[1], margin) { + continue + } else if strings.HasPrefix(margin, indent[1]) { + margin = indent[1] + } else { + margin = "" + break + } + } + + if margin != "" { + s = regexp.MustCompile("(?m)^"+margin).ReplaceAllString(s, "") + } + return strings.TrimSpace(s) + }
modules/util/util_test.go
- @@ -225,3 +225,10 @@ func TestToTitleCase(t *testing.T) {
  assert.Equal(t, ToTitleCase(`foo bar baz`), `Foo Bar Baz`) assert.Equal(t, ToTitleCase(`FOO BAR BAZ`), `Foo Bar Baz`) } + + func TestDedent(t *testing.T) { + assert.Equal(t, Dedent(` + foo + bar + `), "foo\n\tbar") + }