summaryrefslogtreecommitdiffstats
path: root/pkg
diff options
context:
space:
mode:
authormjarkk <mkopenga@gmail.com>2021-07-22 19:45:43 +0200
committermjarkk <mkopenga@gmail.com>2021-07-22 19:45:43 +0200
commit713fae3e32a0482314a9489d3169ca62af2417de (patch)
treeeab0691d59061147fb1cac03a3779da5f343a7f3 /pkg
parent148bf2c070ab6f9a7e559851ed4d05496e651552 (diff)
format code
Diffstat (limited to 'pkg')
-rw-r--r--pkg/gui/custom_commands.go2
-rw-r--r--pkg/gui/dummies.go12
-rw-r--r--pkg/gui/gui_test.go32
3 files changed, 23 insertions, 23 deletions
diff --git a/pkg/gui/custom_commands.go b/pkg/gui/custom_commands.go
index 7ae1da8c0..752587e69 100644
--- a/pkg/gui/custom_commands.go
+++ b/pkg/gui/custom_commands.go
@@ -139,7 +139,7 @@ func (gui *Gui) GenerateMenuCandidates(commandOutput string, filter string, form
for groupIdx, group := range reg.SubexpNames() {
// Record matched group with group ids
matchName := "group_" + strconv.Itoa(groupIdx)
- tmplData[matchName] = out[0][groupIdx]
+ tmplData[matchName] = out[0][groupIdx]
// Record last named group non-empty matches as group matches
if group != "" {
tmplData[group] = out[0][groupIdx]
diff --git a/pkg/gui/dummies.go b/pkg/gui/dummies.go
index 97a03d784..d8a7cba29 100644
--- a/pkg/gui/dummies.go
+++ b/pkg/gui/dummies.go
@@ -1,21 +1,21 @@
package gui
import (
- "github.com/jesseduffield/lazygit/pkg/config"
- "github.com/jesseduffield/lazygit/pkg/utils"
- "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
"github.com/jesseduffield/lazygit/pkg/commands"
+ "github.com/jesseduffield/lazygit/pkg/commands/oscommands"
+ "github.com/jesseduffield/lazygit/pkg/config"
"github.com/jesseduffield/lazygit/pkg/i18n"
"github.com/jesseduffield/lazygit/pkg/updates"
+ "github.com/jesseduffield/lazygit/pkg/utils"
)
// NewDummyGui creates a new dummy GUI for testing
func NewDummyUpdater() *updates.Updater {
- DummyUpdater, _ := updates.NewUpdater(utils.NewDummyLog(), config.NewDummyAppConfig(), oscommands.NewDummyOSCommand(), i18n.NewTranslationSet(utils.NewDummyLog()))
- return DummyUpdater
+ DummyUpdater, _ := updates.NewUpdater(utils.NewDummyLog(), config.NewDummyAppConfig(), oscommands.NewDummyOSCommand(), i18n.NewTranslationSet(utils.NewDummyLog()))
+ return DummyUpdater
}
func NewDummyGui() *Gui {
- DummyGui, _ := NewGui(utils.NewDummyLog(), commands.NewDummyGitCommand(), oscommands.NewDummyOSCommand(), i18n.NewTranslationSet(utils.NewDummyLog()), config.NewDummyAppConfig(), NewDummyUpdater(), "", false)
+ DummyGui, _ := NewGui(utils.NewDummyLog(), commands.NewDummyGitCommand(), oscommands.NewDummyOSCommand(), i18n.NewTranslationSet(utils.NewDummyLog()), config.NewDummyAppConfig(), NewDummyUpdater(), "", false)
return DummyGui
}
diff --git a/pkg/gui/gui_test.go b/pkg/gui/gui_test.go
index 8fcf0d4de..ec1279608 100644
--- a/pkg/gui/gui_test.go
+++ b/pkg/gui/gui_test.go
@@ -86,39 +86,39 @@ func TestGuiGenerateMenuCandidates(t *testing.T) {
testName string
cmdOut string
filter string
- format string
+ format string
test func([]string, error)
}
scenarios := []scenario{
{
"Extract remote branch name",
- "upstream/pr-1",
- "upstream/(?P<branch>.*)",
- "{{ .branch }}",
+ "upstream/pr-1",
+ "upstream/(?P<branch>.*)",
+ "{{ .branch }}",
func(actual []string, err error) {
- assert.NoError(t, err)
- assert.EqualValues(t, "pr-1", actual[0])
+ assert.NoError(t, err)
+ assert.EqualValues(t, "pr-1", actual[0])
},
},
{
"Multiple named groups",
- "upstream/pr-1",
- "(?P<remote>[a-z]*)/(?P<branch>.*)",
- "{{ .branch }}|{{ .remote }}",
+ "upstream/pr-1",
+ "(?P<remote>[a-z]*)/(?P<branch>.*)",
+ "{{ .branch }}|{{ .remote }}",
func(actual []string, err error) {
- assert.NoError(t, err)
- assert.EqualValues(t, "pr-1|upstream", actual[0])
+ assert.NoError(t, err)
+ assert.EqualValues(t, "pr-1|upstream", actual[0])
},
},
{
"Multiple named groups with group ids",
- "upstream/pr-1",
- "(?P<remote>[a-z]*)/(?P<branch>.*)",
- "{{ .group_2 }}|{{ .group_1 }}",
+ "upstream/pr-1",
+ "(?P<remote>[a-z]*)/(?P<branch>.*)",
+ "{{ .group_2 }}|{{ .group_1 }}",
func(actual []string, err error) {
- assert.NoError(t, err)
- assert.EqualValues(t, "pr-1|upstream", actual[0])
+ assert.NoError(t, err)
+ assert.EqualValues(t, "pr-1|upstream", actual[0])
},
},
}