Merge pull request #3704 from dmaluka/gofmt-cleanup

gofmt cleanup

cmd/micro/micro.go

@@ -18,6 +18,7 @@ import (
 
 	"github.com/go-errors/errors"
 	isatty "github.com/mattn/go-isatty"
+	"github.com/micro-editor/tcell/v2"
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
@@ -26,7 +27,6 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var (

cmd/micro/micro_test.go

@@ -7,12 +7,12 @@ import (
 	"testing"
 
 	"github.com/go-errors/errors"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/stretchr/testify/assert"
 	"github.com/zyedidia/micro/v2/internal/action"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var tempDir string

internal/action/actions.go

@@ -11,6 +11,7 @@ import (
 	"time"
 
 	shellquote "github.com/kballard/go-shellquote"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
@@ -18,7 +19,6 @@ import (
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // ScrollUp is not an action

internal/action/actions_other.go

@@ -1,4 +1,4 @@
-// +build plan9 nacl windows
+//go:build plan9 || nacl || windows
 
 package action
 

internal/action/actions_posix.go

@@ -1,4 +1,4 @@
-// +build linux darwin dragonfly solaris openbsd netbsd freebsd
+//go:build linux || darwin || dragonfly || solaris || openbsd || netbsd || freebsd
 
 package action
 

internal/action/bindings.go

@@ -12,10 +12,10 @@ import (
 	"unicode"
 
 	"github.com/micro-editor/json5"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 var Binder = map[string]func(e Event, action string){

internal/action/bufpane.go

@@ -6,6 +6,7 @@ import (
 
 	luar "layeh.com/gopher-luar"
 
+	"github.com/micro-editor/tcell/v2"
 	lua "github.com/yuin/gopher-lua"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
@@ -13,7 +14,6 @@ import (
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type BufAction interface{}

internal/action/infopane.go

@@ -3,12 +3,12 @@ package action
 import (
 	"bytes"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/info"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type InfoKeyAction func(*InfoPane)

internal/action/rawpane.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"reflect"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/display"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type RawPane struct {

internal/action/tab.go

@@ -3,13 +3,13 @@ package action
 import (
 	luar "layeh.com/gopher-luar"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/views"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // The TabList is a list of tabs and a window to display the tab bar

internal/action/terminal_supported.go

@@ -1,4 +1,4 @@
-// +build linux darwin dragonfly openbsd_amd64 freebsd
+//go:build linux || darwin || dragonfly || openbsd_amd64 || freebsd
 
 package action
 

internal/action/terminal_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux,!darwin,!freebsd,!dragonfly,!openbsd_amd64
+//go:build !linux && !darwin && !freebsd && !dragonfly && !openbsd_amd64
 
 package action
 

internal/action/termpane.go

@@ -4,13 +4,13 @@ import (
 	"errors"
 	"runtime"
 
+	"github.com/micro-editor/tcell/v2"
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/clipboard"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/display"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
 )
 
 type TermKeyAction func(*TermPane)

internal/buffer/message.go

@@ -1,8 +1,8 @@
 package buffer
 
 import (
-	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/v2/internal/config"
 )
 
 type MsgType int

internal/clipboard/terminal.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"time"
 
-	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/zyedidia/micro/v2/internal/screen"
 )
 
 type terminalClipboard struct{}

internal/config/colorscheme_test.go

@@ -3,8 +3,8 @@ package config
 import (
 	"testing"
 
-	"github.com/stretchr/testify/assert"
 	"github.com/micro-editor/tcell/v2"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestSimpleStringToStyle(t *testing.T) {

internal/config/plugin_installer.go

@@ -13,8 +13,8 @@ import (
 	"sync"
 
 	"github.com/blang/semver"
-	lua "github.com/yuin/gopher-lua"
 	"github.com/micro-editor/json5"
+	lua "github.com/yuin/gopher-lua"
 	ulua "github.com/zyedidia/micro/v2/internal/lua"
 	"github.com/zyedidia/micro/v2/internal/util"
 )

internal/config/settings.go

@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/zyedidia/glob"
 	"github.com/micro-editor/json5"
+	"github.com/zyedidia/glob"
 	"github.com/zyedidia/micro/v2/internal/util"
 	"golang.org/x/text/encoding/htmlindex"
 )

internal/display/bufwindow.go

@@ -4,11 +4,11 @@ import (
 	"strconv"
 
 	runewidth "github.com/mattn/go-runewidth"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // The BufWindow provides a way of displaying a certain section of a buffer.

internal/display/infowindow.go

@@ -2,12 +2,12 @@ package display
 
 import (
 	runewidth "github.com/mattn/go-runewidth"
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/info"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 type InfoWindow struct {

internal/display/termwindow.go

@@ -1,13 +1,13 @@
 package display
 
 import (
+	"github.com/micro-editor/tcell/v2"
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/screen"
 	"github.com/zyedidia/micro/v2/internal/shell"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
-	"github.com/micro-editor/terminal"
 )
 
 type TermWindow struct {

internal/screen/screen.go

@@ -6,9 +6,9 @@ import (
 	"os"
 	"sync"
 
+	"github.com/micro-editor/tcell/v2"
 	"github.com/zyedidia/micro/v2/internal/config"
 	"github.com/zyedidia/micro/v2/internal/util"
-	"github.com/micro-editor/tcell/v2"
 )
 
 // Screen is the tcell screen we use to draw to the terminal

internal/shell/terminal.go

@@ -5,9 +5,9 @@ import (
 	"os/exec"
 	"strconv"
 
+	"github.com/micro-editor/terminal"
 	"github.com/zyedidia/micro/v2/internal/buffer"
 	"github.com/zyedidia/micro/v2/internal/screen"
-	"github.com/micro-editor/terminal"
 )
 
 type TermType int

pkg/highlight/highlighter.go

@@ -162,7 +162,7 @@ func (h *Highlighter) highlightRegion(highlights LineMatch, start int, canMatchE
 				if curRegion.group == curRegion.limitGroup || p.group == curRegion.limitGroup {
 					matches := findAllIndex(p.regex, line)
 					for _, m := range matches {
-						if ((endLoc == nil) || (m[0] < endLoc[0])) {
+						if (endLoc == nil) || (m[0] < endLoc[0]) {
 							for i := m[0]; i < m[1]; i++ {
 								fullHighlights[i] = p.group
 							}

runtime/syntax/syntax_converter.go

@@ -1,4 +1,4 @@
-//+build ignore
+//go:build ignore
 
 package main
 

tools/build-date.go

@@ -1,4 +1,4 @@
-//+build ignore
+//go:build ignore
 
 package main
 

tools/build-version.go

@@ -1,4 +1,4 @@
-//+build ignore
+//go:build ignore
 
 package main
 

tools/info-plist.go

@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 package main
 

tools/remove-nightly-assets.go

@@ -1,4 +1,4 @@
-//+build ignore
+//go:build ignore
 
 package main
 

tools/testgen.go

@@ -1,4 +1,4 @@
-//+build ignore
+//go:build ignore
 
 package main