Pass of gofmt

Signed-off-by: Cristian Maglie <[email protected]>

Author: cmaglie

src/arduino.cc/builder/builder.go

@@ -30,15 +30,16 @@
 package builder
 
 import (
+	"os"
+	"reflect"
+	"strconv"
+	"time"
+
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/phases"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
-	"os"
-	"reflect"
-	"strconv"
-	"time"
 )
 
 var MAIN_FILE_VALID_EXTENSIONS = map[string]bool{".ino": true, ".pde": true}
@@ -123,7 +124,7 @@ func (s *Builder) Run(ctx *types.Context) error {
 	mainErr := runCommands(ctx, commands, true)
 
 	commands = []types.Command{
-		&PrintUsedAndNotUsedLibraries{ SketchError: mainErr != nil },
+		&PrintUsedAndNotUsedLibraries{SketchError: mainErr != nil},
 
 		&PrintUsedLibrariesIfVerbose{},
 	}

src/arduino.cc/builder/phases/sketch_builder.go

@@ -31,12 +31,12 @@ package phases
 
 import (
 	"arduino.cc/builder/builder_utils"
+	"arduino.cc/builder/constants"
 	"arduino.cc/builder/i18n"
 	"arduino.cc/builder/types"
 	"arduino.cc/builder/utils"
-	"arduino.cc/builder/constants"
-	"path/filepath"
 	"os"
+	"path/filepath"
 )
 
 type SketchBuilder struct{}

src/arduino.cc/builder/sketch_loader.go

@@ -30,15 +30,16 @@
 package builder
 
 import (
-	"arduino.cc/builder/constants"
-	"arduino.cc/builder/i18n"
-	"arduino.cc/builder/types"
-	"arduino.cc/builder/utils"
 	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
 	"strings"
+
+	"arduino.cc/builder/constants"
+	"arduino.cc/builder/i18n"
+	"arduino.cc/builder/types"
+	"arduino.cc/builder/utils"
 )
 
 type SketchLoader struct{}
@@ -91,7 +92,7 @@ func collectAllSketchFiles(from string) ([]string, error) {
 	// Source files in the root are compiled, non-recursively. This
 	// is the only place where .ino files can be present.
 	rootExtensions := func(ext string) bool { return MAIN_FILE_VALID_EXTENSIONS[ext] || ADDITIONAL_FILE_VALID_EXTENSIONS[ext] }
-	err := utils.FindFilesInFolder(&filePaths, from, rootExtensions, /* recurse */ false)
+	err := utils.FindFilesInFolder(&filePaths, from, rootExtensions, false /* recurse */)
 	if err != nil {
 		return nil, i18n.WrapError(err)
 	}
@@ -101,7 +102,7 @@ func collectAllSketchFiles(from string) ([]string, error) {
 	srcPath := filepath.Join(from, constants.SKETCH_FOLDER_SRC)
 	if info, err := os.Stat(srcPath); err == nil && info.IsDir() {
 		srcExtensions := func(ext string) bool { return ADDITIONAL_FILE_VALID_EXTENSIONS[ext] }
-		err = utils.FindFilesInFolder(&filePaths, srcPath, srcExtensions, /* recurse */ true)
+		err = utils.FindFilesInFolder(&filePaths, srcPath, srcExtensions, true /* recurse */)
 	}
 	return filePaths, i18n.WrapError(err)
 }

src/arduino.cc/builder/test/prototypes_adder_test.go

@@ -82,7 +82,7 @@ func TestPrototypesAdderBridgeExample(t *testing.T) {
 		NoError(t, err)
 	}
 
-	require.Equal(t, "#include <Arduino.h>\n#line 1 " + quotedSketchLocation + "\n", ctx.IncludeSection)
+	require.Equal(t, "#include <Arduino.h>\n#line 1 "+quotedSketchLocation+"\n", ctx.IncludeSection)
 	require.Equal(t, "#line 33 "+quotedSketchLocation+"\nvoid setup();\n#line 46 "+quotedSketchLocation+"\nvoid loop();\n#line 62 "+quotedSketchLocation+"\nvoid process(BridgeClient client);\n#line 82 "+quotedSketchLocation+"\nvoid digitalCommand(BridgeClient client);\n#line 109 "+quotedSketchLocation+"\nvoid analogCommand(BridgeClient client);\n#line 149 "+quotedSketchLocation+"\nvoid modeCommand(BridgeClient client);\n#line 33 "+quotedSketchLocation+"\n", ctx.PrototypesSection)
 }
 

src/arduino.cc/builder/test/time_test.go

@@ -30,10 +30,11 @@
 package test
 
 import (
-	"arduino.cc/builder/utils"
-	"github.com/stretchr/testify/require"
 	"testing"
 	"time"
+
+	"arduino.cc/builder/utils"
+	"github.com/stretchr/testify/require"
 )
 
 func TestTime(t *testing.T) {

src/arduino.cc/builder/test/utils_test.go

@@ -89,8 +89,8 @@ func TestMapTrimSpace(t *testing.T) {
 }
 
 func TestQuoteCppString(t *testing.T) {
-	cases := map[string]string {
-		`foo`: `"foo"`,
+	cases := map[string]string{
+		`foo`:     `"foo"`,
 		`foo\bar`: `"foo\\bar"`,
 		`foo "is" quoted and \\bar"" escaped\`: `"foo \"is\" quoted and \\\\bar\"\" escaped\\"`,
 		// ASCII 0x20 - 0x7e, excluding `
@@ -123,7 +123,7 @@ func TestParseCppString(t *testing.T) {
 	require.Equal(t, `foo "is" quoted and \\bar"" escaped\`, str)
 	require.Equal(t, ` and "then" some`, rest)
 
-	str, rest, ok = utils.ParseCppString(`" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~"`,)
+	str, rest, ok = utils.ParseCppString(`" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_abcdefghijklmnopqrstuvwxyz{|}~"`)
 	require.Equal(t, true, ok)
 	require.Equal(t, ` !"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_abcdefghijklmnopqrstuvwxyz{|}~`, str)
 	require.Equal(t, ``, rest)

src/arduino.cc/builder/types/types.go

@@ -32,9 +32,9 @@ package types
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/props"
+	"os"
 	"path/filepath"
 	"strconv"
-	"os"
 )
 
 type SketchFile struct {
@@ -174,8 +174,8 @@ type SourceFolder struct {
 }
 
 type LibraryResolutionResult struct {
-	Library               *Library
-	NotUsedLibraries      []*Library
+	Library          *Library
+	NotUsedLibraries []*Library
 }
 
 type CTag struct {

src/arduino.cc/builder/utils/utils.go

@@ -440,21 +440,21 @@ func ParseCppString(line string) (string, string, bool) {
 			return "", line, false
 		}
 
-		switch (line[i]) {
-			// Backslash, next character is used unmodified
-			case '\\':
-				i++
-				if i >= len(line) {
-					return "", line, false
-				}
-				res += string(line[i])
-				break
-			// Quote, end of string
-			case '"':
-				return res, line[i+1:], true
-			default:
-				res += string(line[i])
-				break
+		switch line[i] {
+		// Backslash, next character is used unmodified
+		case '\\':
+			i++
+			if i >= len(line) {
+				return "", line, false
+			}
+			res += string(line[i])
+			break
+		// Quote, end of string
+		case '"':
+			return res, line[i+1:], true
+		default:
+			res += string(line[i])
+			break
 		}
 
 		i++