Revert operator indentation in an argument list

belka-ew · WebFreak001 · commit dba8c87ebc8c · 2023-02-06T10:17:09.000+01:00
diff --git a/src/dfmt/formatter.d b/src/dfmt/formatter.d
@@ -1625,7 +1625,7 @@ private:
             const commaLine = tokens[index].line;
 
             writeToken();
-            if (indents.topIs(tok!"."))
+            if (indents.topIsWrap && !indents.topIs(tok!","))
             {
                 indents.pop;
             }
@@ -1647,7 +1647,7 @@ private:
         {
             pushWrapIndent();
             writeToken();
-            if (indents.topIs(tok!"."))
+            if (indents.topIsWrap && !indents.topIs(tok!","))
             {
                 indents.pop;
             }
diff --git a/tests/allman/argument_chain_indent.d.ref b/tests/allman/argument_chain_indent.d.ref
@@ -8,6 +8,16 @@ class C
                     .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
+
+            g(map && map && map && map && map && map && map && map && map && map && map
+                    && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            h(map || map || map || map || map || map || map || map || map || map || map
+                    || map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            i(map + map + map + map + map + map + map + map + map + map + map + map + map
+                    + map + map + map + map + map, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
         }
     }
 }
diff --git a/tests/allman/argument_chain_keep_breaks.d.ref b/tests/allman/argument_chain_keep_breaks.d.ref
@@ -10,6 +10,22 @@ class C
                     .to!string,
                 __FILE__,
                 __LINE__);
+
+            g(
+                map &&
+                    map,
+                __FILE__,
+                __LINE__);
+            h(
+                map ||
+                    map,
+                __FILE__,
+                __LINE__);
+            i(
+                map
+                    + map,
+                __FILE__,
+                __LINE__);
         }
     }
 }
diff --git a/tests/argument_chain_indent.d b/tests/argument_chain_indent.d
@@ -23,6 +23,38 @@ class C
                     __FILE__,
                     __FILE__,
                     __LINE__);
+
+            g(
+                map && map && map && map && map && map && map && map && map && map && map && map,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __LINE__);
+            h(
+                map || map || map || map || map || map || map || map || map || map || map || map,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __LINE__);
+            i(
+                map + map + map + map + map + map + map + map + map + map + map + map + map + map + map + map + map
+                    + map,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __FILE__,
+                    __LINE__);
         }
     }
 }
diff --git a/tests/argument_chain_keep_breaks.d b/tests/argument_chain_keep_breaks.d
@@ -10,6 +10,22 @@ class C
                     .to!string,
                 __FILE__,
                 __LINE__);
+
+            g(
+                map &&
+                    map,
+                    __FILE__,
+                    __LINE__);
+            h(
+                map ||
+                    map,
+                    __FILE__,
+                    __LINE__);
+            i(
+                map
+                    + map,
+                    __FILE__,
+                    __LINE__);
         }
     }
 }
diff --git a/tests/knr/argument_chain_indent.d.ref b/tests/knr/argument_chain_indent.d.ref
@@ -6,6 +6,16 @@ class C {
                     .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
+
+            g(map && map && map && map && map && map && map && map && map && map && map
+                    && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            h(map || map || map || map || map || map || map || map || map || map || map
+                    || map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            i(map + map + map + map + map + map + map + map + map + map + map + map + map
+                    + map + map + map + map + map, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
         }
     }
 }
diff --git a/tests/knr/argument_chain_keep_breaks.d.ref b/tests/knr/argument_chain_keep_breaks.d.ref
@@ -8,6 +8,22 @@ class C {
                     .to!string,
                 __FILE__,
                 __LINE__);
+
+            g(
+                map &&
+                    map,
+                __FILE__,
+                __LINE__);
+            h(
+                map ||
+                    map,
+                __FILE__,
+                __LINE__);
+            i(
+                map
+                    + map,
+                __FILE__,
+                __LINE__);
         }
     }
 }
diff --git a/tests/otbs/argument_chain_indent.d.ref b/tests/otbs/argument_chain_indent.d.ref
@@ -5,6 +5,16 @@ class C {
                     .map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
                 __FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
+
+            g(map && map && map && map && map && map && map && map && map && map && map
+                    && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            h(map || map || map || map || map || map || map || map || map || map || map
+                    || map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __LINE__);
+            i(map + map + map + map + map + map + map + map + map + map + map + map + map
+                    + map + map + map + map + map, __FILE__, __FILE__, __FILE__,
+                __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);
         }
     }
 }
diff --git a/tests/otbs/argument_chain_keep_breaks.d.ref b/tests/otbs/argument_chain_keep_breaks.d.ref
@@ -7,6 +7,22 @@ class C {
                     .to!string,
                 __FILE__,
                 __LINE__);
+
+            g(
+                map &&
+                    map,
+                __FILE__,
+                __LINE__);
+            h(
+                map ||
+                    map,
+                __FILE__,
+                __LINE__);
+            i(
+                map
+                    + map,
+                __FILE__,
+                __LINE__);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1625,7 +1625,7 @@ private:`
`1625`	`1625`	`const commaLine = tokens[index].line;`
`1626`	`1626`
`1627`	`1627`	`writeToken();`
`1628`		`- if (indents.topIs(tok!"."))`
	`1628`	`+ if (indents.topIsWrap && !indents.topIs(tok!","))`
`1629`	`1629`	`{`
`1630`	`1630`	`indents.pop;`
`1631`	`1631`	`}`
`@@ -1647,7 +1647,7 @@ private:`
`1647`	`1647`	`{`
`1648`	`1648`	`pushWrapIndent();`
`1649`	`1649`	`writeToken();`
`1650`		`- if (indents.topIs(tok!"."))`
	`1650`	`+ if (indents.topIsWrap && !indents.topIs(tok!","))`
`1651`	`1651`	`{`
`1652`	`1652`	`indents.pop;`
`1653`	`1653`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,16 @@ class C`
`8`	`8`	`.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`9`	`9`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`10`	`10`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
	`11`	`+`
	`12`	`+ g(map && map && map && map && map && map && map && map && map && map && map`
	`13`	`+ && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`14`	`+ __FILE__, __FILE__, __LINE__);`
	`15`	`+ h(map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map`
	`16`	`+ \|\| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`17`	`+ __FILE__, __FILE__, __LINE__);`
	`18`	`+ i(map + map + map + map + map + map + map + map + map + map + map + map + map`
	`19`	`+ + map + map + map + map + map, __FILE__, __FILE__, __FILE__,`
	`20`	`+ __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
`11`	`21`	`}`
`12`	`22`	`}`
`13`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,16 @@ class C {`
`6`	`6`	`.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`7`	`7`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`8`	`8`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
	`9`	`+`
	`10`	`+ g(map && map && map && map && map && map && map && map && map && map && map`
	`11`	`+ && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`12`	`+ __FILE__, __FILE__, __LINE__);`
	`13`	`+ h(map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map`
	`14`	`+ \|\| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`15`	`+ __FILE__, __FILE__, __LINE__);`
	`16`	`+ i(map + map + map + map + map + map + map + map + map + map + map + map + map`
	`17`	`+ + map + map + map + map + map, __FILE__, __FILE__, __FILE__,`
	`18`	`+ __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
`9`	`19`	`}`
`10`	`20`	`}`
`11`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,16 @@ class C {`
`5`	`5`	`.map.map.map.map.map.map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`6`	`6`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
`7`	`7`	`__FILE__, __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
	`8`	`+`
	`9`	`+ g(map && map && map && map && map && map && map && map && map && map && map`
	`10`	`+ && map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`11`	`+ __FILE__, __FILE__, __LINE__);`
	`12`	`+ h(map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map \|\| map`
	`13`	`+ \|\| map, __FILE__, __FILE__, __FILE__, __FILE__, __FILE__,`
	`14`	`+ __FILE__, __FILE__, __LINE__);`
	`15`	`+ i(map + map + map + map + map + map + map + map + map + map + map + map + map`
	`16`	`+ + map + map + map + map + map, __FILE__, __FILE__, __FILE__,`
	`17`	`+ __FILE__, __FILE__, __FILE__, __FILE__, __LINE__);`
`8`	`18`	`}`
`9`	`19`	`}`
`10`	`20`	`}`