Fix pre-existing whitespace issues in go test files

owen-mc · owen-mc · commit 893534e67949 · 2026-06-10T07:12:08.000+02:00
diff --git a/go/ql/test/query-tests/InconsistentCode/WhitespaceContradictsPrecedence/main.go b/go/ql/test/query-tests/InconsistentCode/WhitespaceContradictsPrecedence/main.go
@@ -21,7 +21,7 @@ func ok3(x int) int {
 func ok4(x int, y int, z int) int {
 	return x + y + z;
 }
-	
+
 func ok5(x int, y int, z int) int {
 	return x + y+z;
 }
diff --git a/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected b/go/ql/test/query-tests/Security/CWE-089/StringBreak.expected
@@ -1,26 +1,26 @@
 #select
-| StringBreak.go:14:47:14:57 | versionJSON | StringBreak.go:10:2:10:40 | ... := ...[0] | StringBreak.go:14:47:14:57 | versionJSON | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreak.go:10:2:10:40 | ... := ...[0] | JSON value |
-| StringBreakMismatched.go:17:26:17:32 | escaped | StringBreakMismatched.go:12:2:12:40 | ... := ...[0] | StringBreakMismatched.go:17:26:17:32 | escaped | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:12:2:12:40 | ... := ...[0] | JSON value |
-| StringBreakMismatched.go:29:27:29:33 | escaped | StringBreakMismatched.go:24:2:24:40 | ... := ...[0] | StringBreakMismatched.go:29:27:29:33 | escaped | If this $@ contains a double quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:24:2:24:40 | ... := ...[0] | JSON value |
+| StringBreak.go:15:47:15:57 | versionJSON | StringBreak.go:11:2:11:40 | ... := ...[0] | StringBreak.go:15:47:15:57 | versionJSON | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreak.go:11:2:11:40 | ... := ...[0] | JSON value |
+| StringBreakMismatched.go:18:26:18:32 | escaped | StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | StringBreakMismatched.go:18:26:18:32 | escaped | If this $@ contains a single quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | JSON value |
+| StringBreakMismatched.go:30:27:30:33 | escaped | StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | StringBreakMismatched.go:30:27:30:33 | escaped | If this $@ contains a double quote, it could break out of the enclosing quotes. | StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | JSON value |
 edges
-| StringBreak.go:10:2:10:40 | ... := ...[0] | StringBreak.go:14:47:14:57 | versionJSON | provenance |  |
-| StringBreakMismatched.go:12:2:12:40 | ... := ...[0] | StringBreakMismatched.go:13:29:13:47 | type conversion | provenance |  |
-| StringBreakMismatched.go:13:13:13:62 | call to Replace | StringBreakMismatched.go:17:26:17:32 | escaped | provenance |  |
-| StringBreakMismatched.go:13:29:13:47 | type conversion | StringBreakMismatched.go:13:13:13:62 | call to Replace | provenance | MaD:1 |
-| StringBreakMismatched.go:24:2:24:40 | ... := ...[0] | StringBreakMismatched.go:25:29:25:47 | type conversion | provenance |  |
-| StringBreakMismatched.go:25:13:25:61 | call to Replace | StringBreakMismatched.go:29:27:29:33 | escaped | provenance |  |
-| StringBreakMismatched.go:25:29:25:47 | type conversion | StringBreakMismatched.go:25:13:25:61 | call to Replace | provenance | MaD:1 |
+| StringBreak.go:11:2:11:40 | ... := ...[0] | StringBreak.go:15:47:15:57 | versionJSON | provenance |  |
+| StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | StringBreakMismatched.go:14:29:14:47 | type conversion | provenance |  |
+| StringBreakMismatched.go:14:13:14:62 | call to Replace | StringBreakMismatched.go:18:26:18:32 | escaped | provenance |  |
+| StringBreakMismatched.go:14:29:14:47 | type conversion | StringBreakMismatched.go:14:13:14:62 | call to Replace | provenance | MaD:1 |
+| StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | StringBreakMismatched.go:26:29:26:47 | type conversion | provenance |  |
+| StringBreakMismatched.go:26:13:26:61 | call to Replace | StringBreakMismatched.go:30:27:30:33 | escaped | provenance |  |
+| StringBreakMismatched.go:26:29:26:47 | type conversion | StringBreakMismatched.go:26:13:26:61 | call to Replace | provenance | MaD:1 |
 models
 | 1 | Summary: strings; ; false; Replace; ; ; Argument[0]; ReturnValue; taint; manual |
 nodes
-| StringBreak.go:10:2:10:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| StringBreak.go:14:47:14:57 | versionJSON | semmle.label | versionJSON |
-| StringBreakMismatched.go:12:2:12:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| StringBreakMismatched.go:13:13:13:62 | call to Replace | semmle.label | call to Replace |
-| StringBreakMismatched.go:13:29:13:47 | type conversion | semmle.label | type conversion |
-| StringBreakMismatched.go:17:26:17:32 | escaped | semmle.label | escaped |
-| StringBreakMismatched.go:24:2:24:40 | ... := ...[0] | semmle.label | ... := ...[0] |
-| StringBreakMismatched.go:25:13:25:61 | call to Replace | semmle.label | call to Replace |
-| StringBreakMismatched.go:25:29:25:47 | type conversion | semmle.label | type conversion |
-| StringBreakMismatched.go:29:27:29:33 | escaped | semmle.label | escaped |
+| StringBreak.go:11:2:11:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreak.go:15:47:15:57 | versionJSON | semmle.label | versionJSON |
+| StringBreakMismatched.go:13:2:13:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreakMismatched.go:14:13:14:62 | call to Replace | semmle.label | call to Replace |
+| StringBreakMismatched.go:14:29:14:47 | type conversion | semmle.label | type conversion |
+| StringBreakMismatched.go:18:26:18:32 | escaped | semmle.label | escaped |
+| StringBreakMismatched.go:25:2:25:40 | ... := ...[0] | semmle.label | ... := ...[0] |
+| StringBreakMismatched.go:26:13:26:61 | call to Replace | semmle.label | call to Replace |
+| StringBreakMismatched.go:26:29:26:47 | type conversion | semmle.label | type conversion |
+| StringBreakMismatched.go:30:27:30:33 | escaped | semmle.label | escaped |
 subpaths
diff --git a/go/ql/test/query-tests/Security/CWE-089/StringBreak.go b/go/ql/test/query-tests/Security/CWE-089/StringBreak.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"fmt"
+
 	sq "github.com/Masterminds/squirrel"
 )
 
diff --git a/go/ql/test/query-tests/Security/CWE-089/StringBreakMismatched.go b/go/ql/test/query-tests/Security/CWE-089/StringBreakMismatched.go
@@ -2,8 +2,9 @@ package main
 
 import (
 	"encoding/json"
-	sq "github.com/Masterminds/squirrel"
 	"strings"
+
+	sq "github.com/Masterminds/squirrel"
 )
 
 // Bad because quote characters are removed before concatenation,

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func ok3(x int) int {`
`21`	`21`	`func ok4(x int, y int, z int) int {`
`22`	`22`	`return x + y + z;`
`23`	`23`	`}`
`24`		`-`
	`24`	`+`
`25`	`25`	`func ok5(x int, y int, z int) int {`
`26`	`26`	`return x + y+z;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@ package main`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`	`5`	`"fmt"`
	`6`	`+`
`6`	`7`	`sq "github.com/Masterminds/squirrel"`
`7`	`8`	`)`
`8`	`9`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,9 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"encoding/json"`
`5`		`- sq "github.com/Masterminds/squirrel"`
`6`	`5`	`"strings"`
	`6`	`+`
	`7`	`+ sq "github.com/Masterminds/squirrel"`
`7`	`8`	`)`
`8`	`9`
`9`	`10`	`// Bad because quote characters are removed before concatenation,`