Merge pull request #25 from incu6us/feature/ISSUE-23

#23 Place local packages separately from project(main code base)

.goreleaser.yml

@@ -50,6 +50,7 @@ changelog:
       - "^test:"
 
 release:
+  prerelease: auto
   github:
     owner: incu6us
     name: goimports-reviser

reviser/reviser.go

@@ -119,7 +119,7 @@ func groupImports(
 
 		var isLocalPackageFound bool
 		for _, localPackagePrefix := range localPackagePrefixes {
-			if strings.HasPrefix(pkgWithoutAlias, localPackagePrefix) {
+			if strings.HasPrefix(pkgWithoutAlias, localPackagePrefix) && !strings.HasPrefix(pkgWithoutAlias, projectName) {
 				projectLocalPkgs = append(projectLocalPkgs, imprt)
 				isLocalPackageFound = true
 				break

reviser/reviser_test.go

@@ -743,7 +743,6 @@ import (
 	"github.com/incu6us/goimports-reviser/pkg"
 	"goimports-reviser/pkg"
 )
-
 // nolint:gomnd
 func main(){
   _ = fmt.Println("test")
@@ -762,6 +761,95 @@ import (
 	"goimports-reviser/pkg"
 )
 
+// nolint:gomnd
+func main() {
+	_ = fmt.Println("test")
+}
+`,
+			wantChange: true,
+			wantErr:    false,
+		},
+		{
+			name: "group local packages separately from project files",
+			args: args{
+				projectName:      "github.com/incu6us/goimports-reviser/code/thispkg",
+				localPkgPrefixes: "github.com/incu6us/goimports-reviser/code",
+				filePath:         "./testdata/example.go",
+				fileContent: `package testdata
+
+import (
+	"fmt"
+	"github.com/3rdparty/pkg"
+	"github.com/incu6us/goimports-reviser/code/foopkg"
+	"github.com/incu6us/goimports-reviser/code/otherpkg"
+	"github.com/incu6us/goimports-reviser/code/thispkg/stuff"
+	"github.com/incu6us/goimports-reviser/code/thispkg/morestuff"
+)
+
+// nolint:gomnd
+func main(){
+  _ = fmt.Println("test")
+}
+`,
+			},
+			want: `package testdata
+
+import (
+	"fmt"
+
+	"github.com/3rdparty/pkg"
+
+	"github.com/incu6us/goimports-reviser/code/foopkg"
+	"github.com/incu6us/goimports-reviser/code/otherpkg"
+
+	"github.com/incu6us/goimports-reviser/code/thispkg/morestuff"
+	"github.com/incu6us/goimports-reviser/code/thispkg/stuff"
+)
+
+// nolint:gomnd
+func main() {
+	_ = fmt.Println("test")
+}
+`,
+			wantChange: true,
+			wantErr:    false,
+		},
+		{
+			name: "check without local packages",
+			args: args{
+				projectName:      "github.com/incu6us/goimports-reviser/code/thispkg",
+				localPkgPrefixes: "",
+				filePath:         "./testdata/example.go",
+				fileContent: `package testdata
+
+import (
+	"fmt"
+	"github.com/3rdparty/pkg"
+	"github.com/incu6us/goimports-reviser/code/foopkg"
+	"github.com/incu6us/goimports-reviser/code/otherpkg"
+	"github.com/incu6us/goimports-reviser/code/thispkg/stuff"
+	"github.com/incu6us/goimports-reviser/code/thispkg/morestuff"
+)
+
+// nolint:gomnd
+func main(){
+  _ = fmt.Println("test")
+}
+`,
+			},
+			want: `package testdata
+
+import (
+	"fmt"
+
+	"github.com/3rdparty/pkg"
+	"github.com/incu6us/goimports-reviser/code/foopkg"
+	"github.com/incu6us/goimports-reviser/code/otherpkg"
+
+	"github.com/incu6us/goimports-reviser/code/thispkg/morestuff"
+	"github.com/incu6us/goimports-reviser/code/thispkg/stuff"
+)
+
 // nolint:gomnd
 func main() {
 	_ = fmt.Println("test")