Merge branch 'dceIntegrationTests' of github.com:Workiva/gopherjs into dce4Instances

grantnelson-wf · grantnelson-wf · commit a0ea4da8ee3c · 2024-10-02T13:53:25.000-06:00
diff --git a/compiler/internal/dce/dce_test.go b/compiler/internal/dce/dce_test.go
@@ -1209,7 +1209,7 @@ func depCount(t *testing.T, decl *testDecl, want int) {
 func equal[T comparable](t *testing.T, got, want T) {
 	t.Helper()
 	if got != want {
-		t.Errorf("Unexpected value was gotten:\t\nexp: %#v\t\ngot: %#v", want, got)
+		t.Errorf("Unexpected value was gotten:\n\texp: %#v\n\tgot: %#v", want, got)
 	}
 }
 
diff --git a/compiler/internal/dce/info.go b/compiler/internal/dce/info.go
@@ -22,7 +22,7 @@ type Info struct {
 	objectFilter string
 
 	// methodFilter is the secondary DCE name for a declaration.
-	// This usually will be empty if objectFilter is empty.
+	// This will be empty if objectFilter is empty.
 	// This will be set to a qualified method name if the objectFilter
 	// can not determine if the declaration is alive on it's own.
 	// See ./README.md for more information.
@@ -42,14 +42,14 @@ func (d *Info) String() string {
 	if d.unnamed() {
 		tags += `[unnamed] `
 	}
-	fullName := ``
+	names := []string{}
 	if len(d.objectFilter) > 0 {
-		fullName += d.objectFilter + ` `
+		names = append(names, d.objectFilter+` `)
 	}
 	if len(d.methodFilter) > 0 {
-		fullName += `& ` + d.methodFilter + ` `
+		names = append(names, d.methodFilter+` `)
 	}
-	return tags + fullName + `-> [` + strings.Join(d.getDeps(), `, `) + `]`
+	return tags + strings.Join(names, `& `) + `-> [` + strings.Join(d.getDeps(), `, `) + `]`
 }
 
 // unnamed returns true if SetName has not been called for this declaration.

Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,7 @@ func depCount(t testing.T, decl testDecl, want int) {`
`1209`	`1209`	`func equal[T comparable](t *testing.T, got, want T) {`
`1210`	`1210`	`t.Helper()`
`1211`	`1211`	`if got != want {`
`1212`		`- t.Errorf("Unexpected value was gotten:\t\nexp: %#v\t\ngot: %#v", want, got)`
	`1212`	`+ t.Errorf("Unexpected value was gotten:\n\texp: %#v\n\tgot: %#v", want, got)`
`1213`	`1213`	`}`
`1214`	`1214`	`}`
`1215`	`1215`