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

@@ -71,7 +71,7 @@ func (cfg Config) ToHTMLOptions() []html.Option {
if cfg.LineAnchors != "" {
lineAnchors = cfg.LineAnchors + "-"
}
var options = []html.Option{
options := []html.Option{
html.TabWidth(cfg.TabWidth),
html.WithLineNumbers(cfg.LineNos),
html.BaseLineNumber(cfg.LineNoStart),
@@ -126,7 +126,6 @@ func ApplyLegacyConfig(cfg config.Provider, conf *Config) error {
}
return nil
}
func parseOptions(in string) (map[string]interface{}, error) {
@@ -199,5 +198,4 @@ func hlLinesToRanges(startLine int, s string) ([][2]int, error) {
ranges = append(ranges, r)
}
return ranges, nil
}

View File

@@ -40,7 +40,6 @@ func TestConfig(t *testing.T) {
c.Assert(cfg.CodeFences, qt.Equals, false)
c.Assert(cfg.LineNos, qt.Equals, true)
c.Assert(cfg.LineNumbersInTable, qt.Equals, false)
})
c.Run("parseOptions", func(c *qt.C) {
@@ -54,6 +53,5 @@ func TestConfig(t *testing.T) {
c.Assert(cfg.LineNumbersInTable, qt.Equals, false)
c.Assert(cfg.LineNoStart, qt.Equals, 32)
c.Assert(cfg.Hl_Lines, qt.Equals, "3-8 10-20")
})
}

View File

@@ -46,7 +46,6 @@ User-Agent: foo
c.Assert(result, qt.Equals, `<div class="highlight"><pre class="chroma"><code class="language-bash" data-lang="bash"><span class="nb">echo</span> <span class="s2">&#34;Hugo Rocks!&#34;</span></code></pre></div>`)
result, _ = h.Highlight(`echo "Hugo Rocks!"`, "unknown", "")
c.Assert(result, qt.Equals, `<pre><code class="language-unknown" data-lang="unknown">echo &#34;Hugo Rocks!&#34;</code></pre>`)
})
c.Run("Highlight lines, default config", func(c *qt.C) {
@@ -147,5 +146,4 @@ User-Agent: foo
c.Assert(result, qt.Contains, "hello")
c.Assert(result, qt.Contains, "}")
})
}