Fix sorting imports

simo7 · simo7 · commit d28439391ebd · 2024-10-24T10:56:42.000+02:00
diff --git a/internal/imports.go b/internal/imports.go
@@ -212,7 +212,10 @@ func buildImportBlock2(pkgs map[string]importSpec) []importFromSpec {
 		})
 	}
 	sort.Slice(pkgImports, func(i, j int) bool {
-		return pkgImports[i].Module < pkgImports[j].Module || pkgImports[i].Names[0] < pkgImports[j].Names[0]
+		if pkgImports[i].Module != pkgImports[j].Module {
+			return pkgImports[i].Module < pkgImports[j].Module
+		}
+		return pkgImports[i].Names[0] < pkgImports[j].Names[0]
 	})
 	return pkgImports
 }

Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,10 @@ func buildImportBlock2(pkgs map[string]importSpec) []importFromSpec {`
`212`	`212`	`})`
`213`	`213`	`}`
`214`	`214`	`sort.Slice(pkgImports, func(i, j int) bool {`
`215`		`- return pkgImports[i].Module < pkgImports[j].Module \|\| pkgImports[i].Names[0] < pkgImports[j].Names[0]`
	`215`	`+ if pkgImports[i].Module != pkgImports[j].Module {`
	`216`	`+ return pkgImports[i].Module < pkgImports[j].Module`
	`217`	`+ }`
	`218`	`+ return pkgImports[i].Names[0] < pkgImports[j].Names[0]`
`216`	`219`	`})`
`217`	`220`	`return pkgImports`
`218`	`221`	`}`