Reorder :)

Author: metal3d

cmd/goreorder/main.go

@@ -36,6 +36,13 @@ var (
 	defaultOutpout io.Writer = os.Stdout
 )
 
+func main() {
+	if err := buildMainCommand().Execute(); err != nil {
+		fmt.Println(fmt.Errorf("%v", err))
+		os.Exit(1)
+	}
+}
+
 type ReorderConfig struct {
 	FormatToolName string   `yaml:"format"`
 	Write          bool     `yaml:"write"`
@@ -45,13 +52,6 @@ type ReorderConfig struct {
 	DefOrder       []string `yaml:"order"`
 }
 
-func main() {
-	if err := buildMainCommand().Execute(); err != nil {
-		fmt.Println(fmt.Errorf("%v", err))
-		os.Exit(1)
-	}
-}
-
 func processFile(fileOrDirectoryName string, input []byte, config *ReorderConfig) {
 	if strings.HasSuffix(fileOrDirectoryName, "_test.go") {
 		log.Println("Skipping test file: " + fileOrDirectoryName)

log/main.go

@@ -12,6 +12,11 @@ var (
 	logger *l.Logger
 )
 
+func init() {
+	// set the log output to stderr
+	logger = l.New(os.Stderr, "", l.LstdFlags)
+}
+
 func GetLogger() *l.Logger {
 	return logger
 }
@@ -26,8 +31,3 @@ func SetVerbose(v bool) {
 		logger.SetOutput(writer)
 	}
 }
-
-func init() {
-	// set the log output to stderr
-	logger = l.New(os.Stderr, "", l.LstdFlags)
-}

ordering/main.go

@@ -90,19 +90,16 @@ func processConst(
 	return source
 }
 
-func processFunctions(
+func processExtractedFunction(
 	info *ParsedInfo,
 	functionNames, originalContent, source []string,
 	removedLines, lineNumberWhereInject *int,
 	sign string,
-	extactinit, extactmain bool,
+	funcname string,
 ) []string {
 	for _, name := range functionNames {
 
-		if name == "init" && extactinit {
-			continue
-		}
-		if name == "main" && extactmain {
+		if funcname != name {
 			continue
 		}
 
@@ -119,16 +116,19 @@ func processFunctions(
 	return source
 }
 
-func processExtractedFunction(
+func processFunctions(
 	info *ParsedInfo,
 	functionNames, originalContent, source []string,
 	removedLines, lineNumberWhereInject *int,
 	sign string,
-	funcname string,
+	extactinit, extactmain bool,
 ) []string {
 	for _, name := range functionNames {
 
-		if funcname != name {
+		if name == "init" && extactinit {
+			continue
+		}
+		if name == "main" && extactmain {
 			continue
 		}