chainlint.sed: improve ?!SEMI?! placement accuracy

sunshineco · gitster · commit fbd992b61b3a · 2021-12-13T14:15:29.000-08:00
When chainlint.sed detects commands separated by a semicolon rather than
by `&amp;&amp;`, it places a ?!SEMI?! annotation at the beginning of the line.
However, this is an unusual location for programmers accustomed to error
messages (from compilers, for instance) indicating the exact point of
the problem. Therefore, relocate the ?!SEMI?! annotation to the location
of the semicolon in order to better direct the programmer's attention to
the source of the problem.

Signed-off-by: Eric Sunshine &lt;sunshine@sunshineco.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/chainlint.sed b/t/chainlint.sed
@@ -126,7 +126,7 @@ b
 # "&&" (but not ";" in a string)
 :oneline
 /;/{
-	/"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+	/"[^"]*;[^"]*"/!s/;/; ?!SEMI?!/
 }
 b
 
@@ -230,7 +230,7 @@ s/.*\n//
 # string and not ";;" in one-liner "case...esac")
 /;/{
 	/;;/!{
-		/"[^"]*;[^"]*"/!s/^/?!SEMI?!/
+		/"[^"]*;[^"]*"/!s/;/; ?!SEMI?!/
 	}
 }
 # line ends with pipe "...|" -- valid; not missing "&&"
diff --git a/t/chainlint/negated-one-liner.expect b/t/chainlint/negated-one-liner.expect
@@ -1,5 +1,5 @@
 ! (foo && bar) &&
 ! (foo && bar) >baz &&
 
-?!SEMI?!! (foo; bar) &&
-?!SEMI?!! (foo; bar) >baz
+! (foo; ?!SEMI?! bar) &&
+! (foo; ?!SEMI?! bar) >baz
diff --git a/t/chainlint/one-liner.expect b/t/chainlint/one-liner.expect
@@ -2,8 +2,8 @@
 (foo && bar) |
 (foo && bar) >baz &&
 
-?!SEMI?!(foo; bar) &&
-?!SEMI?!(foo; bar) |
-?!SEMI?!(foo; bar) >baz &&
+(foo; ?!SEMI?! bar) &&
+(foo; ?!SEMI?! bar) |
+(foo; ?!SEMI?! bar) >baz &&
 
 (foo "bar; baz")
diff --git a/t/chainlint/semicolon.expect b/t/chainlint/semicolon.expect
@@ -1,20 +1,20 @@
 (
-?!SEMI?!	cat foo ; echo bar ?!AMP?!
-?!SEMI?!	cat foo ; echo bar
+	cat foo ; ?!SEMI?! echo bar ?!AMP?!
+	cat foo ; ?!SEMI?! echo bar
 >) &&
 (
-?!SEMI?!	cat foo ; echo bar &&
-?!SEMI?!	cat foo ; echo bar
+	cat foo ; ?!SEMI?! echo bar &&
+	cat foo ; ?!SEMI?! echo bar
 >) &&
 (
 	echo "foo; bar" &&
-?!SEMI?!	cat foo; echo bar
+	cat foo; ?!SEMI?! echo bar
 >) &&
 (
-?!SEMI?!	foo;
+	foo; ?!SEMI?!
 >) &&
 (
 cd foo &&
 	for i in a b c; do
-?!SEMI?!		echo;
+		echo; ?!SEMI?!
 >	done)
diff --git a/t/chainlint/subshell-one-liner.expect b/t/chainlint/subshell-one-liner.expect
@@ -2,13 +2,13 @@
 	(foo && bar) &&
 	(foo && bar) |
 	(foo && bar) >baz &&
-?!SEMI?!	(foo; bar) &&
-?!SEMI?!	(foo; bar) |
-?!SEMI?!	(foo; bar) >baz &&
+	(foo; ?!SEMI?! bar) &&
+	(foo; ?!SEMI?! bar) |
+	(foo; ?!SEMI?! bar) >baz &&
 	(foo || exit 1) &&
 	(foo || exit 1) |
 	(foo || exit 1) >baz &&
 	(foo && bar) ?!AMP?!
-?!SEMI?!	(foo && bar; baz) ?!AMP?!
+	(foo && bar; ?!SEMI?! baz) ?!AMP?!
 	foobar
 >)

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ b`
`126`	`126`	`# "&&" (but not ";" in a string)`
`127`	`127`	`:oneline`
`128`	`128`	`/;/{`
`129`		`- /"[^"];[^"]"/!s/^/?!SEMI?!/`
	`129`	`+ /"[^"];[^"]"/!s/;/; ?!SEMI?!/`
`130`	`130`	`}`
`131`	`131`	`b`
`132`	`132`
`@@ -230,7 +230,7 @@ s/.*\n//`
`230`	`230`	`# string and not ";;" in one-liner "case...esac")`
`231`	`231`	`/;/{`
`232`	`232`	`/;;/!{`
`233`		`- /"[^"];[^"]"/!s/^/?!SEMI?!/`
	`233`	`+ /"[^"];[^"]"/!s/;/; ?!SEMI?!/`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`	`# line ends with pipe "...\|" -- valid; not missing "&&"`
Original file line number	Diff line number	Diff line change
`@@ -1,20 +1,20 @@`
`1`	`1`	`(`
`2`		`-?!SEMI?! cat foo ; echo bar ?!AMP?!`
`3`		`-?!SEMI?! cat foo ; echo bar`
	`2`	`+ cat foo ; ?!SEMI?! echo bar ?!AMP?!`
	`3`	`+ cat foo ; ?!SEMI?! echo bar`
`4`	`4`	`>) &&`
`5`	`5`	`(`
`6`		`-?!SEMI?! cat foo ; echo bar &&`
`7`		`-?!SEMI?! cat foo ; echo bar`
	`6`	`+ cat foo ; ?!SEMI?! echo bar &&`
	`7`	`+ cat foo ; ?!SEMI?! echo bar`
`8`	`8`	`>) &&`
`9`	`9`	`(`
`10`	`10`	`echo "foo; bar" &&`
`11`		`-?!SEMI?! cat foo; echo bar`
	`11`	`+ cat foo; ?!SEMI?! echo bar`
`12`	`12`	`>) &&`
`13`	`13`	`(`
`14`		`-?!SEMI?! foo;`
	`14`	`+ foo; ?!SEMI?!`
`15`	`15`	`>) &&`
`16`	`16`	`(`
`17`	`17`	`cd foo &&`
`18`	`18`	`for i in a b c; do`
`19`		`-?!SEMI?! echo;`
	`19`	`+ echo; ?!SEMI?!`
`20`	`20`	`> done)`