Other: Improved 'for' loop formatting.

The bulk of the 'for' expression will now always start on the next line.

Author: DeanEdisGG

ShaderShrinker/Shrinker.Parser/OutputFormatter.cs

@@ -363,13 +363,26 @@ o.Parent is not VariableDeclarationSyntaxNode && // ...not defined in within a d
                     break;
 
                 case ForSyntaxNode o:
+                    var indent = sb.GetColumn();
                     sb.Append("for ");
                     AppendCode(sb, o.LoopSetup);
-                    sb.Append(' ');
 
                     var loopCode = new StringBuilder();
                     AppendCode(loopCode, o.LoopCode);
-                    sb.AppendLine(loopCode.ToString().AllowBraceRemoval());
+                    var braceSection = loopCode.ToString().AllowBraceRemoval();
+
+                    if (braceSection.StartsWith("{"))
+                    {
+                        sb.Append(' ');
+                    }
+                    else
+                    {
+                        sb.AppendLine();
+                        sb.Append(new string(' ', indent));
+                        sb.Append('\t');
+                    }
+
+                    sb.AppendLine(braceSection);
 
                     if (o.Next != null)
                         sb.AppendLine();

ShaderShrinker/UnitTests/OutputFormatterTests.cs

@@ -29,7 +29,7 @@ public void CheckFormattingSingleLineForStatement()
             Assert.That(() => parser.Parse(), Throws.Nothing);
 
             var newCode = parser.RootNode.ToCode().Trim();
-            Assert.That(newCode, Is.EqualTo("for (i = 0; i < 2; i++) continue;"));
+            Assert.That(newCode, Is.EqualTo("for (i = 0; i < 2; i++)\n\tcontinue;"));
         }
 
         [Test]

ShaderShrinker/UnitTests/TestFiles/SimplifiedReference/PowerStone.glsl

@@ -204,7 +204,10 @@ void mainImage(out vec4 fragColor, vec2 fc) {
 	col = scene(ro, rayDir(ro, vec3(0, 2, 0), uv));
 #ifdef AA
 	if (fwidth(col.r) > .03) {
-		for (float dx = Z0; dx <= 1.; dx++) { for (float dy = Z0; dy <= 1.; dy++) col += scene(ro, rayDir(ro, vec3(0, 2, 0), uv + (vec2(dx, dy) - .5) / iResolution.xy)); }
+		for (float dx = Z0; dx <= 1.; dx++) {
+			for (float dy = Z0; dy <= 1.; dy++)
+				col += scene(ro, rayDir(ro, vec3(0, 2, 0), uv + (vec2(dx, dy) - .5) / iResolution.xy));
+		}
 
 		col /= 5.;
 	}

ShaderShrinker/UnitTests/TestFiles/SimplifiedReference/Start.glsl

@@ -141,7 +141,10 @@ void mainImage(out vec4 fragColor, vec2 fc) {
 	col = scene(ro, rayDir(ro, vec3(0, 2, 0), uv));
 #ifdef AA
 	if (fwidth(col.r) > .01) {
-		for (float dx = Z0; dx <= 1.; dx++) { for (float dy = Z0; dy <= 1.; dy++) col += scene(ro, rayDir(ro, vec3(0, 2, 0), uv + (vec2(dx, dy) - .5) / iResolution.xy)); }
+		for (float dx = Z0; dx <= 1.; dx++) {
+			for (float dy = Z0; dy <= 1.; dy++)
+				col += scene(ro, rayDir(ro, vec3(0, 2, 0), uv + (vec2(dx, dy) - .5) / iResolution.xy));
+		}
 
 		col /= 5.;
 	}