From 3cd90d78cd0f5a8538f264ac9ae223b665696e32 Mon Sep 17 00:00:00 2001 From: Qi Xiao Date: Wed, 1 Apr 2020 00:11:16 +0100 Subject: [PATCH] [cleanup] pkg: Format files with "gofmt -s". --- pkg/edit/complete/complete_test.go | 6 +++--- pkg/ui/text_test.go | 34 +++++++++++++++--------------- pkg/ui/text_util.go | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkg/edit/complete/complete_test.go b/pkg/edit/complete/complete_test.go index 15ae91267..e9e1ba6b2 100644 --- a/pkg/edit/complete/complete_test.go +++ b/pkg/edit/complete/complete_test.go @@ -76,9 +76,9 @@ func TestComplete(t *testing.T) { externals: []string{"ls", "make"}, specials: []string{"if", "for"}, variables: map[string][]string{ - "": []string{"foo", "bar", "fn~", "ns:"}, - "ns1:": []string{"lorem"}, - "ns2:": []string{"ipsum"}, + "": {"foo", "bar", "fn~", "ns:"}, + "ns1:": {"lorem"}, + "ns2:": {"ipsum"}, }, namespaces: []string{"ns1:", "ns2:"}, }, diff --git a/pkg/ui/text_test.go b/pkg/ui/text_test.go index eae2e2da5..f5273f570 100644 --- a/pkg/ui/text_test.go +++ b/pkg/ui/text_test.go @@ -46,14 +46,14 @@ var partitionTests = tt.Table{ {red("lorem"), blue("f")}, {blue("oobar")}}), Args(text2, 11).Rets([]Text{text2, nil}), - Args(text1, 1, 2).Rets([]Text{Text{red("l")}, Text{red("o")}, Text{red("rem")}}), + Args(text1, 1, 2).Rets([]Text{{red("l")}, {red("o")}, {red("rem")}}), Args(text1, 1, 2, 3, 4).Rets([]Text{ - Text{red("l")}, Text{red("o")}, Text{red("r")}, Text{red("e")}, Text{red("m")}}), + {red("l")}, {red("o")}, {red("r")}, {red("e")}, {red("m")}}), Args(text2, 2, 4, 6).Rets([]Text{ - Text{red("lo")}, Text{red("re")}, - Text{red("m"), blue("f")}, Text{blue("oobar")}}), + {red("lo")}, {red("re")}, + {red("m"), blue("f")}, {blue("oobar")}}), Args(text2, 6, 8).Rets([]Text{ - Text{red("lorem"), blue("f")}, Text{blue("oo")}, Text{blue("bar")}}), + {red("lorem"), blue("f")}, {blue("oo")}, {blue("bar")}}), } func TestPartition(t *testing.T) { @@ -82,31 +82,31 @@ func TestCountLines(t *testing.T) { func TestSplitByRune(t *testing.T) { tt.Test(t, tt.Fn("Text.SplitByRune", Text.SplitByRune), tt.Table{ Args(Text{}, '\n').Rets([]Text(nil)), - Args(Text{red("lorem")}, '\n').Rets([]Text{Text{red("lorem")}}), + Args(Text{red("lorem")}, '\n').Rets([]Text{{red("lorem")}}), Args(Text{red("lorem"), blue("ipsum"), red("dolar")}, '\n').Rets( []Text{ - Text{red("lorem"), blue("ipsum"), red("dolar")}, + {red("lorem"), blue("ipsum"), red("dolar")}, }), Args(Text{red("lo\nrem")}, '\n').Rets([]Text{ - Text{red("lo")}, Text{red("rem")}, + {red("lo")}, {red("rem")}, }), Args(Text{red("lo\nrem"), blue("ipsum")}, '\n').Rets( []Text{ - Text{red("lo")}, - Text{red("rem"), blue("ipsum")}, + {red("lo")}, + {red("rem"), blue("ipsum")}, }), Args(Text{red("lo\nrem"), blue("ip\nsum")}, '\n').Rets( []Text{ - Text{red("lo")}, - Text{red("rem"), blue("ip")}, - Text{blue("sum")}, + {red("lo")}, + {red("rem"), blue("ip")}, + {blue("sum")}, }), Args(Text{red("lo\nrem"), blue("ip\ns\num"), red("dolar")}, '\n').Rets( []Text{ - Text{red("lo")}, - Text{red("rem"), blue("ip")}, - Text{blue("s")}, - Text{blue("um"), red("dolar")}, + {red("lo")}, + {red("rem"), blue("ip")}, + {blue("s")}, + {blue("um"), red("dolar")}, }), }) } diff --git a/pkg/ui/text_util.go b/pkg/ui/text_util.go index bdc5b05f7..1ff94713d 100644 --- a/pkg/ui/text_util.go +++ b/pkg/ui/text_util.go @@ -92,7 +92,7 @@ func toRuns(s string) []run { func bytesForFirstNRunes(s string, n int) int { k := 0 - for i, _ := range s { + for i := range s { if k == n { return i }