.

Author: SimonCropp

src/Verify.EntityFramework/FormattedScriptGenerator.cs

@@ -0,0 +1,51 @@
+class FormattedScriptGenerator
+{
+    readonly Sql170ScriptGenerator generator = new(
+        new()
+        {
+            SqlVersion = SqlVersion.Sql170,
+            KeywordCasing = KeywordCasing.Lowercase,
+            IndentationSize = 2,
+            AlignClauseBodies = true
+        });
+
+    public string GenerateScript(TSqlFragment fragment)
+    {
+        generator.GenerateScript(fragment, out var script);
+
+        var collector = new OrderByCollector();
+        fragment.Accept(collector);
+
+        foreach (var orderBy in collector.Clauses)
+        {
+            if (orderBy.OrderByElements.Count <= 1)
+            {
+                continue;
+            }
+
+            var elements = new List<string>(orderBy.OrderByElements.Count);
+            foreach (var element in orderBy.OrderByElements)
+            {
+                generator.GenerateScript(element, out var text);
+                elements.Add(text);
+            }
+
+            var singleLine = "order by " + string.Join(", ", elements);
+
+            var pos = script.IndexOf(singleLine, StringComparison.Ordinal);
+            if (pos == -1)
+            {
+                continue;
+            }
+
+            var lineStart = script.LastIndexOf('\n', pos) + 1;
+            var indent = new string(' ', pos - lineStart + "order by ".Length);
+
+            var multiLine = "order by " + string.Join(",\n" + indent, elements);
+
+            script = string.Concat(script.AsSpan(0, pos), multiLine, script.AsSpan(pos + singleLine.Length));
+        }
+
+        return script;
+    }
+}

src/Verify.EntityFramework/OrderByCollector.cs

@@ -0,0 +1,7 @@
+class OrderByCollector : TSqlFragmentVisitor
+{
+    public List<OrderByClause> Clauses { get; } = [];
+
+    public override void Visit(OrderByClause node) =>
+        Clauses.Add(node);
+}

src/Verify.EntityFramework/SqlFormatter.cs

@@ -1,5 +1,7 @@
 static class SqlFormatter
 {
+    static readonly FormattedScriptGenerator generator = new();
+
     public static StringBuilder Format(string input)
     {
         var parser = new TSql170Parser(false);
@@ -23,112 +25,15 @@ Failed to parse sql.
         var visitor = new RemoveSquareBracketVisitor();
         fragment.Accept(visitor);
 
-        var generator = new Sql170ScriptGenerator(
-            new()
-            {
-                SqlVersion = SqlVersion.Sql170,
-                KeywordCasing = KeywordCasing.Lowercase,
-                IndentationSize = 2,
-                AlignClauseBodies = true
-            });
-
-        var builder = new StringBuilder();
-        using (var writer = new StringWriter(builder, CultureInfo.InvariantCulture))
-        {
-            generator.GenerateScript(fragment, writer);
-        }
+        var script = generator.GenerateScript(fragment);
 
+        var builder = new StringBuilder(script);
         builder.TrimEnd();
         if (builder[^1] == ';')
         {
             builder.Length--;
         }
 
-        FormatOrderBy(builder);
-
         return builder;
     }
-
-    static void FormatOrderBy(StringBuilder builder)
-    {
-        var text = builder.ToString();
-        builder.Clear();
-
-        using var lineReader = new StringReader(text);
-        string? line;
-        var first = true;
-
-        while ((line = lineReader.ReadLine()) != null)
-        {
-            if (!first)
-            {
-                builder.Append('\n');
-            }
-
-            first = false;
-
-            var trimmed = line.TrimStart();
-            if (trimmed.StartsWith("order by ") && trimmed.Contains(','))
-            {
-                var leadingSpaces = line.Length - trimmed.Length;
-                var prefix = new string(' ', leadingSpaces) + "order by ";
-                var columns = trimmed["order by ".Length..];
-                var items = SplitRespectingParens(columns);
-
-                if (items.Count > 1)
-                {
-                    var pad = new string(' ', prefix.Length);
-                    for (var j = 0; j < items.Count; j++)
-                    {
-                        if (j > 0)
-                        {
-                            builder.Append('\n');
-                            builder.Append(pad);
-                        }
-                        else
-                        {
-                            builder.Append(prefix);
-                        }
-
-                        builder.Append(items[j].Trim());
-                        if (j < items.Count - 1)
-                        {
-                            builder.Append(',');
-                        }
-                    }
-
-                    continue;
-                }
-            }
-
-            builder.Append(line);
-        }
-    }
-
-    static List<string> SplitRespectingParens(string input)
-    {
-        var items = new List<string>();
-        var depth = 0;
-        var start = 0;
-
-        for (var i = 0; i < input.Length; i++)
-        {
-            switch (input[i])
-            {
-                case '(':
-                    depth++;
-                    break;
-                case ')':
-                    depth--;
-                    break;
-                case ',' when depth == 0:
-                    items.Add(input[start..i]);
-                    start = i + 1;
-                    break;
-            }
-        }
-
-        items.Add(input[start..]);
-        return items;
-    }
-}
+}