Remove possible sources of non-determinism

language/scala/cache.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/bazelbuild/bazel-gazelle/label"
 	scpb "github.com/stackb/scala-gazelle/build/stack/gazelle/scala/cache"
+	"github.com/stackb/scala-gazelle/pkg/parser"
 	"github.com/stackb/scala-gazelle/pkg/protobuf"
 )
 
@@ -26,6 +27,8 @@ func (sl *scalaLang) readScalaRuleCacheFile() error {
 		return nil
 	}
 
+	parser.SortRules(sl.cache.Rules)
+
 	for _, rule := range sl.cache.Rules {
 		from, err := label.Parse(rule.Label)
 		if err != nil {

pkg/glob/glob.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"io/fs"
 	"log"
+	"sort"
 
 	"github.com/bazelbuild/bazel-gazelle/rule"
 	"github.com/bazelbuild/buildtools/build"
@@ -85,6 +86,8 @@ func Apply(glob rule.GlobValue, fs fs.FS) (srcs []string) {
 		srcs = append(srcs, includes...)
 	}
 
+	sort.Strings(srcs)
+
 	return
 }
 

pkg/parser/memo_parser.go

@@ -91,10 +91,36 @@ func (p *MemoParser) ScalaRules() []*sppb.Rule {
 	for _, rule := range p.rules {
 		rules = append(rules, rule)
 	}
+	SortRules(rules)
+	return rules
+}
+
+func SortRules(rules []*sppb.Rule) {
 	sort.Slice(rules, func(i, j int) bool {
 		a := rules[i]
 		b := rules[j]
 		return a.Label < b.Label
 	})
-	return rules
+	for _, rule := range rules {
+		rule.ParseTimeMillis = 0 // reset for easier diff
+		sortRuleFiles(rule.Files)
+	}
+}
+
+func sortRuleFiles(files []*sppb.File) {
+	sort.Slice(files, func(i, j int) bool {
+		a := files[i]
+		b := files[j]
+		return a.Filename < b.Filename
+	})
+	for _, file := range files {
+		sort.Strings(file.Imports)
+		sort.Strings(file.Packages)
+		sort.Strings(file.Classes)
+		sort.Strings(file.Objects)
+		sort.Strings(file.Traits)
+		sort.Strings(file.Types)
+		sort.Strings(file.Vals)
+		sort.Strings(file.Names)
+	}
 }

pkg/protobuf/BUILD.bazel

@@ -7,6 +7,7 @@ go_library(
     visibility = ["//visibility:public"],
     deps = [
         "@org_golang_google_protobuf//encoding/protojson",
+        "@org_golang_google_protobuf//encoding/prototext",
         "@org_golang_google_protobuf//proto",
         "@org_golang_google_protobuf//reflect/protoreflect",
     ],

pkg/protobuf/io.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 
 	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/encoding/prototext"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 )
@@ -17,13 +18,19 @@ func unmarshalerForFilename(filename string) unmarshaler {
 	if filepath.Ext(filename) == ".json" {
 		return protojson.Unmarshal
 	}
+	if filepath.Ext(filename) == ".pbtext" {
+		return prototext.Unmarshal
+	}
 	return proto.Unmarshal
 }
 
 func marshalerForFilename(filename string) marshaler {
 	if filepath.Ext(filename) == ".json" {
 		return protojson.Marshal
 	}
+	if filepath.Ext(filename) == ".pbtext" {
+		return prototext.Marshal
+	}
 	return proto.Marshal
 }
 
@@ -39,6 +46,9 @@ func ReadFile(filename string, message protoreflect.ProtoMessage) error {
 }
 
 func WriteFile(filename string, message protoreflect.ProtoMessage) error {
+	if filepath.Ext(filename) == ".json" {
+		return WritePrettyJSONFile(filename, message)
+	}
 	data, err := marshalerForFilename(filename)(message)
 	if err != nil {
 		return fmt.Errorf("marshal: %w", err)

pkg/resolver/import_map.go

@@ -43,7 +43,9 @@ func (imports ImportMap) Deps(from label.Label) (deps []label.Label) {
 		label.NoLabel: true,
 		from:          true,
 	}
-	for _, imp := range imports {
+
+	for _, k := range imports.Keys() {
+		imp := imports[k]
 		if imp.Symbol == nil || imp.Error != nil {
 			continue
 		}