all: Format code with gofumpt

See https://github.com/mvdan/gofumpt
This commit is contained in:
Bjørn Erik Pedersen
2020-12-02 13:23:25 +01:00
parent 32471b57bd
commit d90e37e0c6
442 changed files with 1426 additions and 2254 deletions

View File

@@ -14,15 +14,14 @@
package publisher
import (
"regexp"
"github.com/gohugoio/hugo/helpers"
"golang.org/x/net/html"
"bytes"
"regexp"
"sort"
"strings"
"sync"
"github.com/gohugoio/hugo/helpers"
"golang.org/x/net/html"
)
func newHTMLElementsCollector() *htmlElementsCollector {
@@ -52,7 +51,6 @@ func (h *HTMLElements) Merge(other HTMLElements) {
h.Tags = helpers.UniqueStringsReuse(h.Tags)
h.Classes = helpers.UniqueStringsReuse(h.Classes)
h.IDs = helpers.UniqueStringsReuse(h.IDs)
}
func (h *HTMLElements) Sort() {
@@ -153,7 +151,6 @@ func (c *cssClassCollectorWriter) insertStandinHTMLElement(el string) (string, s
}
newv := strings.Replace(el, tag, "div", 1)
return newv, strings.ToLower(tag)
}
func (c *cssClassCollectorWriter) endCollecting(drop bool) {
@@ -196,7 +193,6 @@ type htmlElementsCollector struct {
}
func (c *htmlElementsCollector) getHTMLElements() HTMLElements {
var (
classes []string
ids []string

View File

@@ -68,9 +68,11 @@ func TestClassCollector(t *testing.T) {
</div>
</body>`, f("body div", "class1 class2 class3", "")},
{"Alpine bind 2", `<div x-bind:class="{ 'bg-black': filter.checked }"
{
"Alpine bind 2", `<div x-bind:class="{ 'bg-black': filter.checked }"
class="inline-block mr-1 mb-2 rounded bg-gray-300 px-2 py-2">FOO</div>`,
f("div", "bg-black bg-gray-300 inline-block mb-2 mr-1 px-2 py-2 rounded", "")},
f("div", "bg-black bg-gray-300 inline-block mb-2 mr-1 px-2 py-2 rounded", ""),
},
{"Alpine bind 3", `<div x-bind:class="{ 'text-gray-800': !checked, 'text-white': checked }"></div>`, f("div", "text-gray-800 text-white", "")},
{"Alpine bind 4", `<div x-bind:class="{ 'text-gray-800': !checked,
@@ -97,7 +99,6 @@ func TestClassCollector(t *testing.T) {
c.Assert(got, qt.DeepEquals, test.expect)
})
}
}
func BenchmarkClassCollectorWriter(b *testing.B) {

View File

@@ -186,5 +186,4 @@ func (p DestinationPublisher) createTransformerChain(f Descriptor) transform.Cha
}
return transformers
}