From d9ce5348b60ea542ea6de6a3673a90281a58232e Mon Sep 17 00:00:00 2001
From: Cody Oss <codyoss@google.com>
Date: Tue, 23 Feb 2021 15:13:01 -0700
Subject: [PATCH] refactor go:generate lines so they are consistently placed

---
 gomock/matchers_test.go                                     | 4 ++--
 .../tests/aux_imports_embedded_interface/bugreport.go       | 4 ++--
 mockgen/internal/tests/copyright_file/input.go              | 4 ++--
 .../internal/tests/custom_package_name/greeter/greeter.go   | 4 ++--
 mockgen/internal/tests/dot_imports/input.go                 | 3 ++-
 mockgen/internal/tests/empty_interface/input.go             | 3 ++-
 .../tests/generated_identifier_conflict/bugreport.go        | 4 ++--
 .../internal/tests/import_embedded_interface/bugreport.go   | 4 ++--
 mockgen/internal/tests/import_embedded_interface/net.go     | 5 +++--
 mockgen/internal/tests/import_source/definition/source.go   | 3 ++-
 mockgen/internal/tests/internal_pkg/generate.go             | 3 ++-
 mockgen/internal/tests/missing_import/source/source.go      | 4 ++--
 mockgen/internal/tests/overlapping_methods/overlap.go       | 1 +
 mockgen/internal/tests/self_package/types.go                | 3 ++-
 mockgen/internal/tests/unexported_method/bugreport.go       | 4 ++--
 sample/concurrent/concurrent.go                             | 4 ++--
 sample/user.go                                              | 6 +++---
 17 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/gomock/matchers_test.go b/gomock/matchers_test.go
index 35bd2409..91ec5a44 100644
--- a/gomock/matchers_test.go
+++ b/gomock/matchers_test.go
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//go:generate mockgen -destination internal/mock_gomock/mock_matcher.go github.com/golang/mock/gomock Matcher
-
 package gomock_test
 
+//go:generate mockgen -destination internal/mock_gomock/mock_matcher.go github.com/golang/mock/gomock Matcher
+
 import (
 	"context"
 	"errors"
diff --git a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go
index 7ae2ac4d..288ab5d9 100644
--- a/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go
+++ b/mockgen/internal/tests/aux_imports_embedded_interface/bugreport.go
@@ -1,7 +1,7 @@
-//go:generate mockgen -aux_files faux=faux/faux.go -destination bugreport_mock.go -package bugreport -source=bugreport.go Example
-
 package bugreport
 
+//go:generate mockgen -aux_files faux=faux/faux.go -destination bugreport_mock.go -package bugreport -source=bugreport.go Example
+
 import (
 	"log"
 
diff --git a/mockgen/internal/tests/copyright_file/input.go b/mockgen/internal/tests/copyright_file/input.go
index bfd139a6..a2eb3920 100644
--- a/mockgen/internal/tests/copyright_file/input.go
+++ b/mockgen/internal/tests/copyright_file/input.go
@@ -1,5 +1,5 @@
-//go:generate mockgen -package empty_interface -destination mock.go -source input.go -copyright_file=mock_copyright_header
-
 package empty_interface
 
+//go:generate mockgen -package empty_interface -destination mock.go -source input.go -copyright_file=mock_copyright_header
+
 type Empty interface{}
diff --git a/mockgen/internal/tests/custom_package_name/greeter/greeter.go b/mockgen/internal/tests/custom_package_name/greeter/greeter.go
index 8f07d51c..fd2eee0b 100644
--- a/mockgen/internal/tests/custom_package_name/greeter/greeter.go
+++ b/mockgen/internal/tests/custom_package_name/greeter/greeter.go
@@ -1,7 +1,7 @@
-//go:generate mockgen -source greeter.go -destination greeter_mock_test.go -package greeter
-
 package greeter
 
+//go:generate mockgen -source greeter.go -destination greeter_mock_test.go -package greeter
+
 import (
 	// stdlib import
 	"fmt"
diff --git a/mockgen/internal/tests/dot_imports/input.go b/mockgen/internal/tests/dot_imports/input.go
index 51b6de2c..0e4bdb6d 100644
--- a/mockgen/internal/tests/dot_imports/input.go
+++ b/mockgen/internal/tests/dot_imports/input.go
@@ -1,6 +1,7 @@
-//go:generate mockgen -package dot_imports -destination mock.go -source input.go
 package dot_imports
 
+//go:generate mockgen -package dot_imports -destination mock.go -source input.go
+
 import (
 	"bytes"
 	. "context"
diff --git a/mockgen/internal/tests/empty_interface/input.go b/mockgen/internal/tests/empty_interface/input.go
index bbcb3fc8..220865bc 100644
--- a/mockgen/internal/tests/empty_interface/input.go
+++ b/mockgen/internal/tests/empty_interface/input.go
@@ -1,4 +1,5 @@
-//go:generate mockgen -package empty_interface -destination mock.go -source input.go
 package empty_interface
 
+//go:generate mockgen -package empty_interface -destination mock.go -source input.go
+
 type Empty interface{}
diff --git a/mockgen/internal/tests/generated_identifier_conflict/bugreport.go b/mockgen/internal/tests/generated_identifier_conflict/bugreport.go
index 77af43de..7c95ae73 100644
--- a/mockgen/internal/tests/generated_identifier_conflict/bugreport.go
+++ b/mockgen/internal/tests/generated_identifier_conflict/bugreport.go
@@ -1,7 +1,7 @@
-//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go
-
 package bugreport
 
+//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go
+
 type Example interface {
 	// _m and _mr were used by the buggy code: the '_' prefix was there hoping
 	// that no one will use method argument names starting with '_' reducing
diff --git a/mockgen/internal/tests/import_embedded_interface/bugreport.go b/mockgen/internal/tests/import_embedded_interface/bugreport.go
index b77331df..1b998906 100644
--- a/mockgen/internal/tests/import_embedded_interface/bugreport.go
+++ b/mockgen/internal/tests/import_embedded_interface/bugreport.go
@@ -11,11 +11,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
-//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go
 
 package bugreport
 
+//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go
+
 import (
 	"log"
 
diff --git a/mockgen/internal/tests/import_embedded_interface/net.go b/mockgen/internal/tests/import_embedded_interface/net.go
index 38fbd039..fde4d1d3 100644
--- a/mockgen/internal/tests/import_embedded_interface/net.go
+++ b/mockgen/internal/tests/import_embedded_interface/net.go
@@ -10,10 +10,11 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
-//go:generate mockgen -destination net_mock.go -package bugreport -source=net.go
+
 package bugreport
 
+//go:generate mockgen -destination net_mock.go -package bugreport -source=net.go
+
 import "net/http"
 
 type Net interface {
diff --git a/mockgen/internal/tests/import_source/definition/source.go b/mockgen/internal/tests/import_source/definition/source.go
index 493134de..cc6e5138 100644
--- a/mockgen/internal/tests/import_source/definition/source.go
+++ b/mockgen/internal/tests/import_source/definition/source.go
@@ -1,6 +1,7 @@
+package source
+
 //go:generate mockgen -destination ../source_mock.go -source=source.go
 //go:generate mockgen -package source -destination source_mock.go -source=source.go
-package source
 
 type X struct{}
 
diff --git a/mockgen/internal/tests/internal_pkg/generate.go b/mockgen/internal/tests/internal_pkg/generate.go
index 717516c1..4e0a0cca 100644
--- a/mockgen/internal/tests/internal_pkg/generate.go
+++ b/mockgen/internal/tests/internal_pkg/generate.go
@@ -1,3 +1,4 @@
+package test
+
 //go:generate mockgen -destination subdir/internal/pkg/reflect_output/mock.go github.com/golang/mock/mockgen/internal/tests/internal_pkg/subdir/internal/pkg Intf
 //go:generate mockgen -source subdir/internal/pkg/input.go -destination subdir/internal/pkg/source_output/mock.go
-package test
diff --git a/mockgen/internal/tests/missing_import/source/source.go b/mockgen/internal/tests/missing_import/source/source.go
index 015576d2..09e4d682 100644
--- a/mockgen/internal/tests/missing_import/source/source.go
+++ b/mockgen/internal/tests/missing_import/source/source.go
@@ -1,8 +1,8 @@
-//go:generate mockgen -package source -destination=../output/source_mock.go -source=source.go
-
 // Package source makes sure output imports its. See #505.
 package source
 
+//go:generate mockgen -package source -destination=../output/source_mock.go -source=source.go
+
 type Foo struct{}
 
 type Bar interface {
diff --git a/mockgen/internal/tests/overlapping_methods/overlap.go b/mockgen/internal/tests/overlapping_methods/overlap.go
index 2baf4ffe..0cabc277 100644
--- a/mockgen/internal/tests/overlapping_methods/overlap.go
+++ b/mockgen/internal/tests/overlapping_methods/overlap.go
@@ -3,6 +3,7 @@
 package overlap
 
 //go:generate mockgen -package overlap -destination mock.go -source overlap.go -aux_files github.com/golang/mock/mockgen/internal/tests/overlapping_methods=interfaces.go
+
 type ReadWriteCloser interface {
 	ReadCloser
 	WriteCloser
diff --git a/mockgen/internal/tests/self_package/types.go b/mockgen/internal/tests/self_package/types.go
index af1a87f2..e1083ca5 100644
--- a/mockgen/internal/tests/self_package/types.go
+++ b/mockgen/internal/tests/self_package/types.go
@@ -1,6 +1,7 @@
-//go:generate mockgen -package core -self_package github.com/golang/mock/mockgen/internal/tests/self_package -destination mock.go github.com/golang/mock/mockgen/internal/tests/self_package Methods
 package core
 
+//go:generate mockgen -package core -self_package github.com/golang/mock/mockgen/internal/tests/self_package -destination mock.go github.com/golang/mock/mockgen/internal/tests/self_package Methods
+
 type Info struct {
 	name string
 }
diff --git a/mockgen/internal/tests/unexported_method/bugreport.go b/mockgen/internal/tests/unexported_method/bugreport.go
index 91d5baf7..3da7f1a3 100644
--- a/mockgen/internal/tests/unexported_method/bugreport.go
+++ b/mockgen/internal/tests/unexported_method/bugreport.go
@@ -1,7 +1,7 @@
-//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go Example
-
 package bugreport
 
+//go:generate mockgen -destination bugreport_mock.go -package bugreport -source=bugreport.go Example
+
 import "fmt"
 
 // Example is an interface with a non exported method
diff --git a/sample/concurrent/concurrent.go b/sample/concurrent/concurrent.go
index 346cee42..1fb943a4 100644
--- a/sample/concurrent/concurrent.go
+++ b/sample/concurrent/concurrent.go
@@ -1,8 +1,8 @@
-//go:generate mockgen -destination mock/concurrent_mock.go github.com/golang/mock/sample/concurrent Math
-
 // Package concurrent demonstrates how to use gomock with goroutines.
 package concurrent
 
+//go:generate mockgen -destination mock/concurrent_mock.go github.com/golang/mock/sample/concurrent Math
+
 type Math interface {
 	Sum(a, b int) int
 }
diff --git a/sample/user.go b/sample/user.go
index 0e4a8142..58e08068 100644
--- a/sample/user.go
+++ b/sample/user.go
@@ -1,8 +1,8 @@
-//go:generate mockgen -destination mock_user/mock_user.go github.com/golang/mock/sample Index,Embed,Embedded
-
-// An example package with an interface.
+// Package user is an example package with an interface.
 package user
 
+//go:generate mockgen -destination mock_user/mock_user.go github.com/golang/mock/sample Index,Embed,Embedded
+
 // Random bunch of imports to test mockgen.
 import "io"
 import (