From 92a5cabc2491740c485ff352c7e6fa056c1835e8 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Fri, 17 Apr 2026 23:26:16 +0200
Subject: [PATCH 01/11] Query Editor SQL Formater with parameters options -
 init working

---
 .../Controls/QuerySessionControl.axaml        |  10 ++
 .../Controls/QuerySessionControl.axaml.cs     |  25 ++++
 .../Dialogs/FormatOptionsWindow.axaml         |  41 ++++++
 .../Dialogs/FormatOptionsWindow.axaml.cs      | 114 ++++++++++++++++
 src/PlanViewer.App/PlanViewer.App.csproj      |   1 +
 .../Services/SqlFormatSettingsService.cs      | 129 ++++++++++++++++++
 .../Services/SqlFormattingService.cs          |  71 ++++++++++
 7 files changed, 391 insertions(+)
 create mode 100644 src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
 create mode 100644 src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
 create mode 100644 src/PlanViewer.App/Services/SqlFormatSettingsService.cs
 create mode 100644 src/PlanViewer.App/Services/SqlFormattingService.cs

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
index 9d44cc6..fcafef1 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
@@ -69,6 +69,16 @@
                             Height="28" Padding="10,0" FontSize="12" IsEnabled="False"
                             Theme="{StaticResource AppButton}"
                             ToolTip.Tip="Execute the repro script and capture actual plan with runtime stats"/>
+                    <TextBlock Text="|" VerticalAlignment="Center"
+                               Foreground="{DynamicResource ForegroundBrush}" Margin="4,0"/>
+                    <Button x:Name="FormatButton" Content="&#x1F4DD; Format" Click="Format_Click"
+                            Height="28" Padding="10,0" FontSize="12"
+                            Theme="{StaticResource AppButton}"
+                            ToolTip.Tip="Format the SQL query (Ctrl+K, Ctrl+D)"/>
+                    <Button x:Name="FormatOptionsButton" Content="&#x2699; Format Options" Click="FormatOptions_Click"
+                            Height="28" Padding="10,0" FontSize="12"
+                            Theme="{StaticResource AppButton}"
+                            ToolTip.Tip="Configure SQL formatting options"/>
                 </StackPanel>
                 <TextBlock x:Name="StatusText" DockPanel.Dock="Right"
                            HorizontalAlignment="Right" VerticalAlignment="Center"
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 3c5ac67..b91f570 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2005,4 +2005,29 @@ private Window GetParentWindow()
         var parent = this.VisualRoot;
         return parent as Window ?? throw new InvalidOperationException("No parent window");
     }
+
+    private void Format_Click(object? sender, RoutedEventArgs e)
+    {
+        var sql = QueryEditor.Text;
+        if (string.IsNullOrWhiteSpace(sql))
+            return;
+
+        var settings = SqlFormatSettingsService.Load();
+        var (formatted, errors) = SqlFormattingService.Format(sql, settings);
+
+        if (errors != null && errors.Count > 0)
+        {
+            SetStatus($"Format: {errors.Count} parse error(s) — {errors[0].Message}");
+            return;
+        }
+
+        QueryEditor.Text = formatted;
+        SetStatus("Formatted");
+    }
+
+    private void FormatOptions_Click(object? sender, RoutedEventArgs e)
+    {
+        var dialog = new Dialogs.FormatOptionsWindow();
+        dialog.ShowDialog(GetParentWindow());
+    }
 }
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
new file mode 100644
index 0000000..d64a34e
--- /dev/null
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
@@ -0,0 +1,41 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:dialogs="using:PlanViewer.App.Dialogs"
+        x:Class="PlanViewer.App.Dialogs.FormatOptionsWindow"
+        Title="SQL Format Options"
+        Width="620" Height="550"
+        MinWidth="500" MinHeight="400"
+        Background="#1A1D23"
+        Foreground="#E4E6EB"
+        WindowStartupLocation="CenterOwner">
+    <Grid RowDefinitions="*,Auto" Margin="12">
+        <DataGrid x:Name="OptionsGrid" Grid.Row="0"
+                  x:DataType="dialogs:FormatOptionRow"
+                  AutoGenerateColumns="False"
+                  CanUserReorderColumns="False"
+                  CanUserSortColumns="False"
+                  HeadersVisibility="Column"
+                  GridLinesVisibility="Horizontal"
+                  IsReadOnly="False"
+                  Background="#1A1D23"
+                  Foreground="#E4E6EB"
+                  Margin="0,0,0,12">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Parameter" Binding="{Binding Name}" IsReadOnly="True" Width="2*"/>
+                <DataGridTextColumn Header="Current Value" Binding="{Binding CurrentValue}" Width="*"/>
+                <DataGridTextColumn Header="Default Value" Binding="{Binding DefaultValue}" IsReadOnly="True" Width="*"/>
+            </DataGrid.Columns>
+        </DataGrid>
+        <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
+            <Button x:Name="RevertButton" Content="Revert to Default" Click="Revert_Click"
+                    Height="32" Padding="16,0" FontSize="12"
+                    Theme="{StaticResource AppButton}"/>
+            <Button x:Name="SaveButton" Content="Save" Click="Save_Click"
+                    Height="32" Padding="16,0" FontSize="12"
+                    Theme="{StaticResource AppButton}"/>
+            <Button x:Name="CloseButton" Content="Close" Click="Close_Click"
+                    Height="32" Padding="16,0" FontSize="12"
+                    Theme="{StaticResource AppButton}"/>
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
new file mode 100644
index 0000000..63da0a0
--- /dev/null
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Reflection;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using PlanViewer.App.Services;
+
+namespace PlanViewer.App.Dialogs;
+
+public partial class FormatOptionsWindow : Window
+{
+    private readonly ObservableCollection<FormatOptionRow> _rows = new();
+    private readonly SqlFormatSettings _defaults = new();
+
+    public FormatOptionsWindow()
+    {
+        InitializeComponent();
+        LoadSettings();
+    }
+
+    private void LoadSettings()
+    {
+        var current = SqlFormatSettingsService.Load();
+        _rows.Clear();
+
+        foreach (var prop in typeof(SqlFormatSettings).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+        {
+            var currentVal = prop.GetValue(current);
+            var defaultVal = prop.GetValue(_defaults);
+
+            _rows.Add(new FormatOptionRow
+            {
+                Name = prop.Name,
+                CurrentValue = currentVal?.ToString() ?? "",
+                DefaultValue = defaultVal?.ToString() ?? "",
+                PropertyInfo = prop
+            });
+        }
+
+        OptionsGrid.ItemsSource = _rows;
+    }
+
+    private void Save_Click(object? sender, RoutedEventArgs e)
+    {
+        var settings = new SqlFormatSettings();
+
+        foreach (var row in _rows)
+        {
+            try
+            {
+                var prop = row.PropertyInfo;
+                object? value;
+
+                if (prop.PropertyType == typeof(bool))
+                    value = bool.Parse(row.CurrentValue);
+                else if (prop.PropertyType == typeof(int))
+                    value = int.Parse(row.CurrentValue);
+                else
+                    value = row.CurrentValue;
+
+                prop.SetValue(settings, value);
+            }
+            catch
+            {
+                // Skip invalid values — keep default
+            }
+        }
+
+        SqlFormatSettingsService.Save(settings);
+    }
+
+    private void Revert_Click(object? sender, RoutedEventArgs e)
+    {
+        foreach (var row in _rows)
+        {
+            row.CurrentValue = row.DefaultValue;
+        }
+
+        // Refresh the grid
+        OptionsGrid.ItemsSource = null;
+        OptionsGrid.ItemsSource = _rows;
+    }
+
+    private void Close_Click(object? sender, RoutedEventArgs e)
+    {
+        Close();
+    }
+}
+
+public class FormatOptionRow : INotifyPropertyChanged
+{
+    private string _currentValue = "";
+
+    public string Name { get; set; } = "";
+
+    public string CurrentValue
+    {
+        get => _currentValue;
+        set
+        {
+            _currentValue = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentValue)));
+        }
+    }
+
+    public string DefaultValue { get; set; } = "";
+
+    internal PropertyInfo PropertyInfo { get; set; } = null!;
+
+    public event PropertyChangedEventHandler? PropertyChanged;
+}
diff --git a/src/PlanViewer.App/PlanViewer.App.csproj b/src/PlanViewer.App/PlanViewer.App.csproj
index 51b3a7a..da69d71 100644
--- a/src/PlanViewer.App/PlanViewer.App.csproj
+++ b/src/PlanViewer.App/PlanViewer.App.csproj
@@ -32,6 +32,7 @@
     <PackageReference Include="ModelContextProtocol" Version="0.7.0-preview.1" />
     <PackageReference Include="ModelContextProtocol.AspNetCore" Version="0.7.0-preview.1" />
     <PackageReference Include="TextMateSharp.Grammars" Version="2.0.3" />
+    <PackageReference Include="Microsoft.SqlServer.TransactSql.ScriptDom" Version="170.191.0" />
     <PackageReference Include="Velopack" Version="0.0.1298" />
 
     <!-- Pin SkiaSharp native assets to match SkiaSharp 3.119.0.
diff --git a/src/PlanViewer.App/Services/SqlFormatSettingsService.cs b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
new file mode 100644
index 0000000..ab8bd9b
--- /dev/null
+++ b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
@@ -0,0 +1,129 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+
+namespace PlanViewer.App.Services;
+
+/// <summary>
+/// Formatting options that map to <see cref="SqlScriptGeneratorOptions"/> properties.
+/// Persisted as a JSON file in the app's local data directory.
+/// </summary>
+public sealed class SqlFormatSettings
+{
+    public bool AlignClauseBodies { get; set; } = true;
+    public bool AlignColumnDefinitionFields { get; set; } = true;
+    public bool AlignSetClauseItem { get; set; } = true;
+    public bool AsKeywordOnOwnLine { get; set; } = true;
+    public bool IncludeSemicolons { get; set; } = false;
+    public bool IndentSetClause { get; set; } = false;
+    public bool IndentViewBody { get; set; } = false;
+    public int IndentationSize { get; set; } = 4;
+    public string KeywordCasing { get; set; } = "Uppercase";
+    public bool MultilineInsertSourcesList { get; set; } = true;
+    public bool MultilineInsertTargetsList { get; set; } = true;
+    public bool MultilineSelectElementsList { get; set; } = true;
+    public bool MultilineSetClauseItems { get; set; } = true;
+    public bool MultilineViewColumnsList { get; set; } = true;
+    public bool MultilineWherePredicatesList { get; set; } = true;
+    public bool NewLineBeforeCloseParenthesisInMultilineList { get; set; } = true;
+    public bool NewLineBeforeFromClause { get; set; } = true;
+    public bool NewLineBeforeGroupByClause { get; set; } = true;
+    public bool NewLineBeforeHavingClause { get; set; } = true;
+    public bool NewLineBeforeJoinClause { get; set; } = true;
+    public bool NewLineBeforeOffsetClause { get; set; } = true;
+    public bool NewLineBeforeOpenParenthesisInMultilineList { get; set; } = false;
+    public bool NewLineBeforeOrderByClause { get; set; } = true;
+    public bool NewLineBeforeOutputClause { get; set; } = true;
+    public bool NewLineBeforeWhereClause { get; set; } = true;
+    public bool NewLineBeforeWindowClause { get; set; } = true;
+    public int SqlVersion { get; set; } = 170;
+
+    /// <summary>
+    /// Applies these settings to a <see cref="SqlScriptGeneratorOptions"/> instance.
+    /// </summary>
+    public SqlScriptGeneratorOptions ToGeneratorOptions()
+    {
+        var opts = new SqlScriptGeneratorOptions
+        {
+            AlignClauseBodies = AlignClauseBodies,
+            AlignColumnDefinitionFields = AlignColumnDefinitionFields,
+            AlignSetClauseItem = AlignSetClauseItem,
+            AsKeywordOnOwnLine = AsKeywordOnOwnLine,
+            IncludeSemicolons = IncludeSemicolons,
+            IndentSetClause = IndentSetClause,
+            IndentViewBody = IndentViewBody,
+            IndentationSize = IndentationSize,
+            KeywordCasing = Enum.TryParse<Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing>(KeywordCasing, true, out var kc) ? kc : Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing.Uppercase,
+            MultilineInsertSourcesList = MultilineInsertSourcesList,
+            MultilineInsertTargetsList = MultilineInsertTargetsList,
+            MultilineSelectElementsList = MultilineSelectElementsList,
+            MultilineSetClauseItems = MultilineSetClauseItems,
+            MultilineViewColumnsList = MultilineViewColumnsList,
+            MultilineWherePredicatesList = MultilineWherePredicatesList,
+            NewLineBeforeCloseParenthesisInMultilineList = NewLineBeforeCloseParenthesisInMultilineList,
+            NewLineBeforeFromClause = NewLineBeforeFromClause,
+            NewLineBeforeGroupByClause = NewLineBeforeGroupByClause,
+            NewLineBeforeHavingClause = NewLineBeforeHavingClause,
+            NewLineBeforeJoinClause = NewLineBeforeJoinClause,
+            NewLineBeforeOffsetClause = NewLineBeforeOffsetClause,
+            NewLineBeforeOpenParenthesisInMultilineList = NewLineBeforeOpenParenthesisInMultilineList,
+            NewLineBeforeOrderByClause = NewLineBeforeOrderByClause,
+            NewLineBeforeOutputClause = NewLineBeforeOutputClause,
+            NewLineBeforeWhereClause = NewLineBeforeWhereClause,
+            NewLineBeforeWindowClause = NewLineBeforeWindowClause,
+        };
+
+        return opts;
+    }
+}
+
+/// <summary>
+/// Loads and saves <see cref="SqlFormatSettings"/> to a local JSON file.
+/// </summary>
+internal static class SqlFormatSettingsService
+{
+    private static readonly string SettingsDir = Path.Combine(
+        Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
+        "PerformanceStudio");
+
+    private static readonly string SettingsPath = Path.Combine(SettingsDir, "perfstudio_format_settings.json");
+
+    private static readonly JsonSerializerOptions JsonOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+    };
+
+    public static SqlFormatSettings Load()
+    {
+        try
+        {
+            if (!File.Exists(SettingsPath))
+                return new SqlFormatSettings();
+
+            var json = File.ReadAllText(SettingsPath);
+            return JsonSerializer.Deserialize<SqlFormatSettings>(json, JsonOptions) ?? new SqlFormatSettings();
+        }
+        catch
+        {
+            return new SqlFormatSettings();
+        }
+    }
+
+    public static void Save(SqlFormatSettings settings)
+    {
+        try
+        {
+            Directory.CreateDirectory(SettingsDir);
+            var json = JsonSerializer.Serialize(settings, JsonOptions);
+            File.WriteAllText(SettingsPath, json);
+        }
+        catch
+        {
+            // Best-effort
+        }
+    }
+}
diff --git a/src/PlanViewer.App/Services/SqlFormattingService.cs b/src/PlanViewer.App/Services/SqlFormattingService.cs
new file mode 100644
index 0000000..ae8be70
--- /dev/null
+++ b/src/PlanViewer.App/Services/SqlFormattingService.cs
@@ -0,0 +1,71 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+
+namespace PlanViewer.App.Services;
+
+/// <summary>
+/// Formats T-SQL text using Microsoft.SqlServer.TransactSql.ScriptDom.
+/// Inspired by https://github.com/madskristensen/SqlFormatter (MIT license).
+/// </summary>
+internal static class SqlFormattingService
+{
+    /// <summary>
+    /// Formats the given T-SQL text. Returns the formatted text, or the original text
+    /// with an error message if parsing fails.
+    /// </summary>
+    public static (string formattedText, IList<ParseError>? errors) Format(string sql, SqlFormatSettings? settings = null)
+    {
+        settings ??= new SqlFormatSettings();
+
+        var parser = GetParser(settings.SqlVersion);
+
+        using var reader = new StringReader(sql);
+        var fragment = parser.Parse(reader, out var errors);
+
+        if (errors != null && errors.Count > 0)
+            return (sql, errors);
+
+        var generator = GetGenerator(settings);
+        generator.GenerateScript(fragment, out var formatted);
+
+        return (formatted, null);
+    }
+
+    private static TSqlParser GetParser(int version)
+    {
+        return version switch
+        {
+            80 => new TSql80Parser(true),
+            90 => new TSql90Parser(true),
+            100 => new TSql100Parser(true),
+            110 => new TSql110Parser(true),
+            120 => new TSql120Parser(true),
+            130 => new TSql130Parser(true),
+            140 => new TSql140Parser(true),
+            150 => new TSql150Parser(true),
+            160 => new TSql160Parser(true),
+            _ => new TSql170Parser(true),
+        };
+    }
+
+    private static SqlScriptGenerator GetGenerator(SqlFormatSettings settings)
+    {
+        var options = settings.ToGeneratorOptions();
+
+        return settings.SqlVersion switch
+        {
+            80 => new Sql80ScriptGenerator(options),
+            90 => new Sql90ScriptGenerator(options),
+            100 => new Sql100ScriptGenerator(options),
+            110 => new Sql110ScriptGenerator(options),
+            120 => new Sql120ScriptGenerator(options),
+            130 => new Sql130ScriptGenerator(options),
+            140 => new Sql140ScriptGenerator(options),
+            150 => new Sql150ScriptGenerator(options),
+            160 => new Sql160ScriptGenerator(options),
+            _ => new Sql170ScriptGenerator(options),
+        };
+    }
+}

From c2bc0d615970e27f69f8c7519b800b1c8464dc31 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 00:05:56 +0200
Subject: [PATCH 02/11] improve parameter format option grid ux

---
 .../Dialogs/FormatOptionsWindow.axaml         | 88 ++++++++++++++++++-
 .../Dialogs/FormatOptionsWindow.axaml.cs      | 42 ++++++++-
 2 files changed, 124 insertions(+), 6 deletions(-)

diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
index d64a34e..0dfcdf0 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
@@ -3,11 +3,33 @@
         xmlns:dialogs="using:PlanViewer.App.Dialogs"
         x:Class="PlanViewer.App.Dialogs.FormatOptionsWindow"
         Title="SQL Format Options"
-        Width="620" Height="550"
-        MinWidth="500" MinHeight="400"
+        Width="650" Height="580"
+        MinWidth="520" MinHeight="400"
         Background="#1A1D23"
         Foreground="#E4E6EB"
         WindowStartupLocation="CenterOwner">
+
+    <Window.Styles>
+        <Style Selector="ToggleSwitch">
+            <Setter Property="OnContent" Value=""/>
+            <Setter Property="OffContent" Value=""/>
+            <Setter Property="MinWidth" Value="0"/>
+            <Setter Property="MinHeight" Value="0"/>
+            <Setter Property="Padding" Value="0"/>
+            <Setter Property="Margin" Value="0"/>
+            <Setter Property="VerticalAlignment" Value="Center"/>
+            <Setter Property="RenderTransformOrigin" Value="0%,50%"/>
+            <Setter Property="RenderTransform" Value="scale(0.75)"/>
+        </Style>
+        <Style Selector="ToggleSwitch:checked /template/ Border#SwitchKnobBounds">
+            <Setter Property="Background" Value="#00D4FF"/>
+            <Setter Property="BorderBrush" Value="#00D4FF"/>
+        </Style>
+        <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
+            <Setter Property="BorderBrush" Value="#00D4FF"/>
+        </Style>
+    </Window.Styles>
+
     <Grid RowDefinitions="*,Auto" Margin="12">
         <DataGrid x:Name="OptionsGrid" Grid.Row="0"
                   x:DataType="dialogs:FormatOptionRow"
@@ -22,8 +44,66 @@
                   Margin="0,0,0,12">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Parameter" Binding="{Binding Name}" IsReadOnly="True" Width="2*"/>
-                <DataGridTextColumn Header="Current Value" Binding="{Binding CurrentValue}" Width="*"/>
-                <DataGridTextColumn Header="Default Value" Binding="{Binding DefaultValue}" IsReadOnly="True" Width="*"/>
+                <DataGridTemplateColumn Header="Current Value" Width="*">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate x:DataType="dialogs:FormatOptionRow">
+                            <Panel>
+                                <ToggleSwitch IsChecked="{Binding BoolValue}"
+                                              IsVisible="{Binding IsBool}"
+                                              VerticalAlignment="Center"
+                                              Margin="4,0"/>
+                                <ComboBox ItemsSource="{Binding ChoiceOptions}"
+                                          SelectedItem="{Binding CurrentValue}"
+                                          IsVisible="{Binding IsChoice}"
+                                          VerticalAlignment="Center"
+                                          MinHeight="0" Height="26" FontSize="12"
+                                          Margin="4,0"/>
+                                <TextBlock Text="{Binding CurrentValue}"
+                                           IsVisible="{Binding IsText}"
+                                           VerticalAlignment="Center"
+                                           Margin="8,0"/>
+                            </Panel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                    <DataGridTemplateColumn.CellEditingTemplate>
+                        <DataTemplate x:DataType="dialogs:FormatOptionRow">
+                            <Panel>
+                                <ToggleSwitch IsChecked="{Binding BoolValue}"
+                                              IsVisible="{Binding IsBool}"
+                                              VerticalAlignment="Center"
+                                              Margin="4,0"/>
+                                <ComboBox ItemsSource="{Binding ChoiceOptions}"
+                                          SelectedItem="{Binding CurrentValue}"
+                                          IsVisible="{Binding IsChoice}"
+                                          VerticalAlignment="Center"
+                                          MinHeight="0" Height="26" FontSize="12"
+                                          Margin="4,0"/>
+                                <TextBox Text="{Binding CurrentValue}"
+                                         IsVisible="{Binding IsText}"
+                                         VerticalAlignment="Center"
+                                         Margin="4,0"/>
+                            </Panel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellEditingTemplate>
+                </DataGridTemplateColumn>
+                <DataGridTemplateColumn Header="Default Value" IsReadOnly="True" Width="*">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate x:DataType="dialogs:FormatOptionRow">
+                            <Panel>
+                                <ToggleSwitch IsChecked="{Binding DefaultBoolValue}"
+                                              IsVisible="{Binding IsBool}"
+                                              IsEnabled="False"
+                                              VerticalAlignment="Center"
+                                              Margin="4,0"/>
+                                <TextBlock Text="{Binding DefaultValue}"
+                                           IsVisible="{Binding !IsBool}"
+                                           VerticalAlignment="Center"
+                                           Margin="8,0"/>
+                                <!-- Choice defaults shown as text -->
+                            </Panel>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
         <StackPanel Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index 63da0a0..380ffb3 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -30,12 +30,21 @@ private void LoadSettings()
         {
             var currentVal = prop.GetValue(current);
             var defaultVal = prop.GetValue(_defaults);
+            var isBool = prop.PropertyType == typeof(bool);
+
+            string[]? choiceOptions = null;
+            if (prop.Name == "KeywordCasing")
+                choiceOptions = ["Uppercase", "Lowercase", "PascalCase"];
 
             _rows.Add(new FormatOptionRow
             {
                 Name = prop.Name,
                 CurrentValue = currentVal?.ToString() ?? "",
                 DefaultValue = defaultVal?.ToString() ?? "",
+                IsBool = isBool,
+                BoolValue = isBool && currentVal is true,
+                DefaultBoolValue = isBool && defaultVal is true,
+                ChoiceOptions = choiceOptions,
                 PropertyInfo = prop
             });
         }
@@ -55,7 +64,7 @@ private void Save_Click(object? sender, RoutedEventArgs e)
                 object? value;
 
                 if (prop.PropertyType == typeof(bool))
-                    value = bool.Parse(row.CurrentValue);
+                    value = row.BoolValue;
                 else if (prop.PropertyType == typeof(int))
                     value = int.Parse(row.CurrentValue);
                 else
@@ -70,6 +79,7 @@ private void Save_Click(object? sender, RoutedEventArgs e)
         }
 
         SqlFormatSettingsService.Save(settings);
+        Close();
     }
 
     private void Revert_Click(object? sender, RoutedEventArgs e)
@@ -77,9 +87,10 @@ private void Revert_Click(object? sender, RoutedEventArgs e)
         foreach (var row in _rows)
         {
             row.CurrentValue = row.DefaultValue;
+            if (row.IsBool)
+                row.BoolValue = row.DefaultBoolValue;
         }
 
-        // Refresh the grid
         OptionsGrid.ItemsSource = null;
         OptionsGrid.ItemsSource = _rows;
     }
@@ -93,9 +104,36 @@ private void Close_Click(object? sender, RoutedEventArgs e)
 public class FormatOptionRow : INotifyPropertyChanged
 {
     private string _currentValue = "";
+    private bool _boolValue;
 
     public string Name { get; set; } = "";
 
+    public bool IsBool { get; set; }
+
+    public bool BoolValue
+    {
+        get => _boolValue;
+        set
+        {
+            _boolValue = value;
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(BoolValue)));
+            // Keep CurrentValue in sync for serialization
+            if (IsBool)
+            {
+                _currentValue = value.ToString();
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(CurrentValue)));
+            }
+        }
+    }
+
+    public bool DefaultBoolValue { get; set; }
+
+    public string[]? ChoiceOptions { get; set; }
+
+    public bool IsChoice => ChoiceOptions != null;
+
+    public bool IsText => !IsBool && !IsChoice;
+
     public string CurrentValue
     {
         get => _currentValue;

From a2cb944fdd137338f47633ceee89b8ca55219214 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 00:08:32 +0200
Subject: [PATCH 03/11] undo possible after format

---
 .../Controls/QuerySessionControl.axaml.cs              | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index b91f570..ed149ff 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2021,7 +2021,15 @@ private void Format_Click(object? sender, RoutedEventArgs e)
             return;
         }
 
-        QueryEditor.Text = formatted;
+        QueryEditor.Document.BeginUpdate();
+        try
+        {
+            QueryEditor.Document.Replace(0, QueryEditor.Document.TextLength, formatted);
+        }
+        finally
+        {
+            QueryEditor.Document.EndUpdate();
+        }
         SetStatus("Formatted");
     }
 

From 944e299a2699f0bfea8619d917a314e1efdd3a82 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 08:59:29 +0200
Subject: [PATCH 04/11] Dynamic brushes instead of hard coded color

---
 src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
index 0dfcdf0..e2bf547 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
@@ -5,8 +5,8 @@
         Title="SQL Format Options"
         Width="650" Height="580"
         MinWidth="520" MinHeight="400"
-        Background="#1A1D23"
-        Foreground="#E4E6EB"
+        Background="{DynamicResource BackgroundBrush}"
+        Foreground="{DynamicResource ForegroundBrush}"
         WindowStartupLocation="CenterOwner">
 
     <Window.Styles>

From 2452a42f102d16674576b7597ea66f98d48ca4fc Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 09:03:38 +0200
Subject: [PATCH 05/11] remove unused using lib

---
 src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index 380ffb3..2f58932 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Interactivity;

From 87991b122e142de264e71b2c8ab849b8351b5271 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 09:14:46 +0200
Subject: [PATCH 06/11] Fix Reviewer remarks phase 1

---
 .../Controls/QuerySessionControl.axaml         |  2 +-
 .../Controls/QuerySessionControl.axaml.cs      |  7 +++++--
 .../Dialogs/FormatOptionsWindow.axaml.cs       | 18 ++++++++++++------
 .../Services/SqlFormatSettingsService.cs       | 17 +++++++++--------
 .../Services/SqlFormattingService.cs           |  7 ++++---
 5 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
index fcafef1..46fa6bf 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml
@@ -74,7 +74,7 @@
                     <Button x:Name="FormatButton" Content="&#x1F4DD; Format" Click="Format_Click"
                             Height="28" Padding="10,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
-                            ToolTip.Tip="Format the SQL query (Ctrl+K, Ctrl+D)"/>
+                            ToolTip.Tip="Format the SQL query"/>
                     <Button x:Name="FormatOptionsButton" Content="&#x2699; Format Options" Click="FormatOptions_Click"
                             Height="28" Padding="10,0" FontSize="12"
                             Theme="{StaticResource AppButton}"
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index ed149ff..f7c1743 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2017,10 +2017,11 @@ private void Format_Click(object? sender, RoutedEventArgs e)
 
         if (errors != null && errors.Count > 0)
         {
-            SetStatus($"Format: {errors.Count} parse error(s) — {errors[0].Message}");
-            return;
+            SetStatus($"Format: {errors.Count} parse warning(s) — {errors[0].Message}");
         }
 
+        var caretOffset = QueryEditor.CaretOffset;
+
         QueryEditor.Document.BeginUpdate();
         try
         {
@@ -2030,6 +2031,8 @@ private void Format_Click(object? sender, RoutedEventArgs e)
         {
             QueryEditor.Document.EndUpdate();
         }
+
+        QueryEditor.CaretOffset = Math.Min(caretOffset, QueryEditor.Document.TextLength);
         SetStatus("Formatted");
     }
 
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index 2f58932..e7e1dc0 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -1,5 +1,7 @@
+using System;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -63,15 +65,22 @@ private void Save_Click(object? sender, RoutedEventArgs e)
                 if (prop.PropertyType == typeof(bool))
                     value = row.BoolValue;
                 else if (prop.PropertyType == typeof(int))
-                    value = int.Parse(row.CurrentValue);
+                {
+                    if (!int.TryParse(row.CurrentValue, out var intVal))
+                    {
+                        Debug.WriteLine($"FormatOptions: invalid int value '{row.CurrentValue}' for {row.Name}, using default");
+                        continue;
+                    }
+                    value = intVal;
+                }
                 else
                     value = row.CurrentValue;
 
                 prop.SetValue(settings, value);
             }
-            catch
+            catch (Exception ex)
             {
-                // Skip invalid values — keep default
+                Debug.WriteLine($"FormatOptions: failed to set {row.Name}: {ex.Message}");
             }
         }
 
@@ -87,9 +96,6 @@ private void Revert_Click(object? sender, RoutedEventArgs e)
             if (row.IsBool)
                 row.BoolValue = row.DefaultBoolValue;
         }
-
-        OptionsGrid.ItemsSource = null;
-        OptionsGrid.ItemsSource = _rows;
     }
 
     private void Close_Click(object? sender, RoutedEventArgs e)
diff --git a/src/PlanViewer.App/Services/SqlFormatSettingsService.cs b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
index ab8bd9b..f3bc4cb 100644
--- a/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
+++ b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
@@ -1,8 +1,7 @@
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Text.Json;
-using System.Text.Json.Serialization;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace PlanViewer.App.Services;
@@ -56,7 +55,9 @@ public SqlScriptGeneratorOptions ToGeneratorOptions()
             IndentSetClause = IndentSetClause,
             IndentViewBody = IndentViewBody,
             IndentationSize = IndentationSize,
-            KeywordCasing = Enum.TryParse<Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing>(KeywordCasing, true, out var kc) ? kc : Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing.Uppercase,
+            KeywordCasing = Enum.TryParse<Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing>(KeywordCasing, true, out var kc)
+                            && Enum.IsDefined(kc)
+                            ? kc : Microsoft.SqlServer.TransactSql.ScriptDom.KeywordCasing.Uppercase,
             MultilineInsertSourcesList = MultilineInsertSourcesList,
             MultilineInsertTargetsList = MultilineInsertTargetsList,
             MultilineSelectElementsList = MultilineSelectElementsList,
@@ -93,8 +94,7 @@ internal static class SqlFormatSettingsService
 
     private static readonly JsonSerializerOptions JsonOptions = new()
     {
-        WriteIndented = true,
-        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+        WriteIndented = true
     };
 
     public static SqlFormatSettings Load()
@@ -107,8 +107,9 @@ public static SqlFormatSettings Load()
             var json = File.ReadAllText(SettingsPath);
             return JsonSerializer.Deserialize<SqlFormatSettings>(json, JsonOptions) ?? new SqlFormatSettings();
         }
-        catch
+        catch (Exception ex)
         {
+            Debug.WriteLine($"SqlFormatSettings: failed to load settings: {ex.Message}");
             return new SqlFormatSettings();
         }
     }
@@ -121,9 +122,9 @@ public static void Save(SqlFormatSettings settings)
             var json = JsonSerializer.Serialize(settings, JsonOptions);
             File.WriteAllText(SettingsPath, json);
         }
-        catch
+        catch (Exception ex)
         {
-            // Best-effort
+            Debug.WriteLine($"SqlFormatSettings: failed to save settings: {ex.Message}");
         }
     }
 }
diff --git a/src/PlanViewer.App/Services/SqlFormattingService.cs b/src/PlanViewer.App/Services/SqlFormattingService.cs
index ae8be70..71e3011 100644
--- a/src/PlanViewer.App/Services/SqlFormattingService.cs
+++ b/src/PlanViewer.App/Services/SqlFormattingService.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using Microsoft.SqlServer.TransactSql.ScriptDom;
 
 namespace PlanViewer.App.Services;
@@ -24,13 +23,15 @@ public static (string formattedText, IList<ParseError>? errors) Format(string sq
         using var reader = new StringReader(sql);
         var fragment = parser.Parse(reader, out var errors);
 
-        if (errors != null && errors.Count > 0)
+        if (fragment == null)
             return (sql, errors);
 
         var generator = GetGenerator(settings);
         generator.GenerateScript(fragment, out var formatted);
 
-        return (formatted, null);
+        // Return any non-fatal parse errors alongside the formatted output
+        var hasErrors = errors != null && errors.Count > 0;
+        return (formatted, hasErrors ? errors : null);
     }
 
     private static TSqlParser GetParser(int version)

From 00e514cc8c39aaefb9dc2a0a73e11ec98395fbc9 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 09:25:19 +0200
Subject: [PATCH 07/11] Fix Second-opinion addendum

---
 THIRD-PARTY-NOTICES.md                        | 35 ++++++++++++++++
 .../Controls/QuerySessionControl.axaml.cs     | 42 ++++++++++++-------
 .../Dialogs/FormatOptionsWindow.axaml.cs      | 38 +++++++++++++++--
 3 files changed, 96 insertions(+), 19 deletions(-)
 create mode 100644 THIRD-PARTY-NOTICES.md

diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md
new file mode 100644
index 0000000..e50879f
--- /dev/null
+++ b/THIRD-PARTY-NOTICES.md
@@ -0,0 +1,35 @@
+# Third-Party Notices
+
+This project incorporates material from the projects listed below.
+
+---
+
+## SqlFormatter
+
+- **Source:** https://github.com/madskristensen/SqlFormatter
+- **License:** MIT (Apache-2.0 per repository; individual files carry MIT terms)
+- **Copyright:** Copyright (c) Mads Kristensen
+
+The `SqlFormattingService` in this project was inspired by and partially derived
+from the SqlFormatter extension for Visual Studio by Mads Kristensen. It uses
+`Microsoft.SqlServer.TransactSql.ScriptDom` for T-SQL parsing and formatting.
+
+### MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index f7c1743..7117cab 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2006,34 +2006,46 @@ private Window GetParentWindow()
         return parent as Window ?? throw new InvalidOperationException("No parent window");
     }
 
-    private void Format_Click(object? sender, RoutedEventArgs e)
+    private async void Format_Click(object? sender, RoutedEventArgs e)
     {
         var sql = QueryEditor.Text;
         if (string.IsNullOrWhiteSpace(sql))
             return;
 
-        var settings = SqlFormatSettingsService.Load();
-        var (formatted, errors) = SqlFormattingService.Format(sql, settings);
+        FormatButton.IsEnabled = false;
+        SetStatus("Formatting...");
 
-        if (errors != null && errors.Count > 0)
+        try
         {
-            SetStatus($"Format: {errors.Count} parse warning(s) — {errors[0].Message}");
-        }
+            var settings = SqlFormatSettingsService.Load();
+            var (formatted, errors) = await Task.Run(() => SqlFormattingService.Format(sql, settings));
 
-        var caretOffset = QueryEditor.CaretOffset;
+            if (errors != null && errors.Count > 0)
+            {
+                SetStatus($"Format: {errors.Count} parse warning(s) — {errors[0].Message}");
+            }
 
-        QueryEditor.Document.BeginUpdate();
-        try
-        {
-            QueryEditor.Document.Replace(0, QueryEditor.Document.TextLength, formatted);
+            var caretOffset = QueryEditor.CaretOffset;
+
+            QueryEditor.Document.BeginUpdate();
+            try
+            {
+                QueryEditor.Document.Replace(0, QueryEditor.Document.TextLength, formatted);
+            }
+            finally
+            {
+                QueryEditor.Document.EndUpdate();
+            }
+
+            QueryEditor.CaretOffset = Math.Min(caretOffset, QueryEditor.Document.TextLength);
+
+            if (errors == null || errors.Count == 0)
+                SetStatus("Formatted");
         }
         finally
         {
-            QueryEditor.Document.EndUpdate();
+            FormatButton.IsEnabled = true;
         }
-
-        QueryEditor.CaretOffset = Math.Min(caretOffset, QueryEditor.Document.TextLength);
-        SetStatus("Formatted");
     }
 
     private void FormatOptions_Click(object? sender, RoutedEventArgs e)
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index e7e1dc0..dcae580 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Linq;
 using System.Reflection;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -20,20 +22,48 @@ public FormatOptionsWindow()
         LoadSettings();
     }
 
+    // Explicit ordering — reflection doesn't guarantee declaration order
+    private static readonly string[] PropertyOrder =
+    [
+        "KeywordCasing", "SqlVersion", "IndentationSize",
+        "AlignClauseBodies", "AlignColumnDefinitionFields", "AlignSetClauseItem",
+        "AsKeywordOnOwnLine", "IncludeSemicolons",
+        "IndentSetClause", "IndentViewBody",
+        "MultilineInsertSourcesList", "MultilineInsertTargetsList",
+        "MultilineSelectElementsList", "MultilineSetClauseItems",
+        "MultilineViewColumnsList", "MultilineWherePredicatesList",
+        "NewLineBeforeCloseParenthesisInMultilineList",
+        "NewLineBeforeFromClause", "NewLineBeforeGroupByClause",
+        "NewLineBeforeHavingClause", "NewLineBeforeJoinClause",
+        "NewLineBeforeOffsetClause", "NewLineBeforeOpenParenthesisInMultilineList",
+        "NewLineBeforeOrderByClause", "NewLineBeforeOutputClause",
+        "NewLineBeforeWhereClause", "NewLineBeforeWindowClause",
+    ];
+
+    private static readonly Dictionary<string, string[]> ChoiceOptionsMap = new()
+    {
+        ["KeywordCasing"] = ["Uppercase", "Lowercase", "PascalCase"],
+        ["SqlVersion"] = ["80", "90", "100", "110", "120", "130", "140", "150", "160", "170"],
+    };
+
     private void LoadSettings()
     {
         var current = SqlFormatSettingsService.Load();
         _rows.Clear();
 
-        foreach (var prop in typeof(SqlFormatSettings).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+        var props = typeof(SqlFormatSettings).GetProperties(BindingFlags.Public | BindingFlags.Instance)
+            .ToDictionary(p => p.Name);
+
+        foreach (var name in PropertyOrder)
         {
+            if (!props.TryGetValue(name, out var prop))
+                continue;
+
             var currentVal = prop.GetValue(current);
             var defaultVal = prop.GetValue(_defaults);
             var isBool = prop.PropertyType == typeof(bool);
 
-            string[]? choiceOptions = null;
-            if (prop.Name == "KeywordCasing")
-                choiceOptions = ["Uppercase", "Lowercase", "PascalCase"];
+            ChoiceOptionsMap.TryGetValue(prop.Name, out var choiceOptions);
 
             _rows.Add(new FormatOptionRow
             {

From 4a05d0d02d956637ac181e9010f17ce5793a1ba5 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 10:12:03 +0200
Subject: [PATCH 08/11] fix query editor content disapear if format have a
 syntax error. Now a popup message appears with the syntax error

---
 .../Controls/QuerySessionControl.axaml.cs     | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 7117cab..041bd31 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2022,7 +2022,41 @@ private async void Format_Click(object? sender, RoutedEventArgs e)
 
             if (errors != null && errors.Count > 0)
             {
-                SetStatus($"Format: {errors.Count} parse warning(s) — {errors[0].Message}");
+                var errorMessages = string.Join("\n", errors.Select(err => $"Line {err.Line}: {err.Message}"));
+                var dialog = new Window
+                {
+                    Title = "SQL Format Error",
+                    Width = 500,
+                    Height = 250,
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                    Icon = GetParentWindow().Icon,
+                    Background = new SolidColorBrush(Color.Parse("#1A1D23")),
+                    Foreground = new SolidColorBrush(Color.Parse("#E4E6EB")),
+                    Content = new StackPanel
+                    {
+                        Margin = new Avalonia.Thickness(20),
+                        Children =
+                        {
+                            new TextBlock
+                            {
+                                Text = $"Could not format: {errors.Count} parse error(s)",
+                                FontWeight = Avalonia.Media.FontWeight.Bold,
+                                FontSize = 14,
+                                Margin = new Avalonia.Thickness(0, 0, 0, 10)
+                            },
+                            new TextBlock
+                            {
+                                Text = errorMessages,
+                                TextWrapping = TextWrapping.Wrap,
+                                FontSize = 12,
+                                Foreground = new SolidColorBrush(Color.Parse("#E4E6EB"))
+                            }
+                        }
+                    }
+                };
+                dialog.ShowDialog(GetParentWindow());
+                SetStatus($"Format failed: {errors.Count} error(s)");
+                return;
             }
 
             var caretOffset = QueryEditor.CaretOffset;
@@ -2038,9 +2072,7 @@ private async void Format_Click(object? sender, RoutedEventArgs e)
             }
 
             QueryEditor.CaretOffset = Math.Min(caretOffset, QueryEditor.Document.TextLength);
-
-            if (errors == null || errors.Count == 0)
-                SetStatus("Formatted");
+            SetStatus("Formatted");
         }
         finally
         {

From ae38892462cdab91bf97532aa7c884778a63fbb9 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Sat, 18 Apr 2026 21:48:22 +0200
Subject: [PATCH 09/11] =?UTF-8?q?1.=20Hardcoded=20colors=20in=20error=20di?=
 =?UTF-8?q?alog=20=E2=86=92=20Now=20uses=20(IBrush)this.FindResource("Back?=
 =?UTF-8?q?groundBrush")!=202.=20Close=20without=20dirty-state=20prompt=20?=
 =?UTF-8?q?:=20fixed=203.=20Tooltip=20Ctrl+K,Ctrl+D=20:=20removed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controls/QuerySessionControl.axaml.cs     |   7 +-
 .../Dialogs/FormatOptionsWindow.axaml.cs      | 110 +++++++++++++++++-
 2 files changed, 112 insertions(+), 5 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index 041bd31..b3a84f0 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2030,8 +2030,8 @@ private async void Format_Click(object? sender, RoutedEventArgs e)
                     Height = 250,
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     Icon = GetParentWindow().Icon,
-                    Background = new SolidColorBrush(Color.Parse("#1A1D23")),
-                    Foreground = new SolidColorBrush(Color.Parse("#E4E6EB")),
+                    Background = (IBrush)this.FindResource("BackgroundBrush")!,
+                    Foreground = (IBrush)this.FindResource("ForegroundBrush")!,
                     Content = new StackPanel
                     {
                         Margin = new Avalonia.Thickness(20),
@@ -2048,8 +2048,7 @@ private async void Format_Click(object? sender, RoutedEventArgs e)
                             {
                                 Text = errorMessages,
                                 TextWrapping = TextWrapping.Wrap,
-                                FontSize = 12,
-                                Foreground = new SolidColorBrush(Color.Parse("#E4E6EB"))
+                                FontSize = 12
                             }
                         }
                     }
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index dcae580..ffd5a27 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -5,8 +5,10 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Reflection;
+using System.Threading.Tasks;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Media;
 using PlanViewer.App.Services;
 
 namespace PlanViewer.App.Dialogs;
@@ -16,6 +18,8 @@ public partial class FormatOptionsWindow : Window
     private readonly ObservableCollection<FormatOptionRow> _rows = new();
     private readonly SqlFormatSettings _defaults = new();
 
+    private bool _isDirty;
+
     public FormatOptionsWindow()
     {
         InitializeComponent();
@@ -79,6 +83,10 @@ private void LoadSettings()
         }
 
         OptionsGrid.ItemsSource = _rows;
+
+        // Track changes for dirty-state prompt
+        foreach (var row in _rows)
+            row.PropertyChanged += (_, _) => _isDirty = true;
     }
 
     private void Save_Click(object? sender, RoutedEventArgs e)
@@ -115,6 +123,7 @@ private void Save_Click(object? sender, RoutedEventArgs e)
         }
 
         SqlFormatSettingsService.Save(settings);
+        _isDirty = false;
         Close();
     }
 
@@ -130,7 +139,106 @@ private void Revert_Click(object? sender, RoutedEventArgs e)
 
     private void Close_Click(object? sender, RoutedEventArgs e)
     {
-        Close();
+        TryClose();
+    }
+
+    protected override void OnClosing(WindowClosingEventArgs e)
+    {
+        if (_isDirty)
+        {
+            e.Cancel = true;
+            TryClose();
+            return;
+        }
+        base.OnClosing(e);
+    }
+
+    private async void TryClose()
+    {
+        if (!_isDirty)
+        {
+            _isDirty = false; // prevent re-entry
+            Close();
+            return;
+        }
+
+        var result = await ShowDiscardDialog();
+        if (result)
+        {
+            _isDirty = false;
+            Close();
+        }
+    }
+
+    private async Task<bool> ShowDiscardDialog()
+    {
+        var tcs = new TaskCompletionSource<bool>();
+
+        var dialog = new Window
+        {
+            Title = "Unsaved Changes",
+            Width = 360,
+            Height = 160,
+            MinWidth = 360,
+            MinHeight = 160,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Background = (IBrush)this.FindResource("BackgroundBrush")!,
+            Foreground = (IBrush)this.FindResource("ForegroundBrush")!,
+            Content = new StackPanel
+            {
+                Margin = new Avalonia.Thickness(20),
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = "You have unsaved changes. Discard them?",
+                        FontSize = 13,
+                        TextWrapping = TextWrapping.Wrap,
+                        Margin = new Avalonia.Thickness(0, 0, 0, 16)
+                    }
+                }
+            }
+        };
+
+        var discardBtn = new Button
+        {
+            Content = "Discard",
+            Height = 32, Width = 90,
+            Padding = new Avalonia.Thickness(16, 0),
+            FontSize = 12,
+            HorizontalContentAlignment = Avalonia.Layout.HorizontalAlignment.Center,
+            VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+
+        var cancelBtn = new Button
+        {
+            Content = "Cancel",
+            Height = 32, Width = 90,
+            Padding = new Avalonia.Thickness(16, 0),
+            FontSize = 12,
+            Margin = new Avalonia.Thickness(8, 0, 0, 0),
+            HorizontalContentAlignment = Avalonia.Layout.HorizontalAlignment.Center,
+            VerticalContentAlignment = Avalonia.Layout.VerticalAlignment.Center,
+            Theme = (Avalonia.Styling.ControlTheme)this.FindResource("AppButton")!
+        };
+
+        var buttonPanel = new StackPanel
+        {
+            Orientation = Avalonia.Layout.Orientation.Horizontal,
+            HorizontalAlignment = Avalonia.Layout.HorizontalAlignment.Right
+        };
+        buttonPanel.Children.Add(discardBtn);
+        buttonPanel.Children.Add(cancelBtn);
+
+        ((StackPanel)dialog.Content!).Children.Add(buttonPanel);
+
+        discardBtn.Click += (_, _) => { tcs.TrySetResult(true); dialog.Close(); };
+        cancelBtn.Click += (_, _) => { tcs.TrySetResult(false); dialog.Close(); };
+        dialog.Closing += (_, _) => tcs.TrySetResult(false);
+
+        await dialog.ShowDialog(this);
+        return await tcs.Task;
     }
 }
 

From 08f8173fd8d7def76d16eabcb4ac45a0076e659f Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Mon, 20 Apr 2026 08:46:27 +0200
Subject: [PATCH 10/11] dynamic brush for formatoptions

---
 src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
index e2bf547..78594a4 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml
@@ -22,11 +22,11 @@
             <Setter Property="RenderTransform" Value="scale(0.75)"/>
         </Style>
         <Style Selector="ToggleSwitch:checked /template/ Border#SwitchKnobBounds">
-            <Setter Property="Background" Value="#00D4FF"/>
-            <Setter Property="BorderBrush" Value="#00D4FF"/>
+            <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
         </Style>
         <Style Selector="ToggleSwitch:checked /template/ Border#OuterBorder">
-            <Setter Property="BorderBrush" Value="#00D4FF"/>
+            <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
         </Style>
     </Window.Styles>
 
@@ -39,8 +39,8 @@
                   HeadersVisibility="Column"
                   GridLinesVisibility="Horizontal"
                   IsReadOnly="False"
-                  Background="#1A1D23"
-                  Foreground="#E4E6EB"
+                  Background="{DynamicResource BackgroundBrush}"
+                  Foreground="{DynamicResource ForegroundBrush}"
                   Margin="0,0,0,12">
             <DataGrid.Columns>
                 <DataGridTextColumn Header="Parameter" Binding="{Binding Name}" IsReadOnly="True" Width="2*"/>

From 3b275cf02375ea1de8e1cd9757c45e028de45e60 Mon Sep 17 00:00:00 2001
From: rferraton <16419423+rferraton@users.noreply.github.com>
Date: Mon, 20 Apr 2026 08:55:16 +0200
Subject: [PATCH 11/11] Build passes. All three callers of Load(out
 string?)/Save(SqlFormatSettings, out string?) now surface errors:

---
 .../Controls/QuerySessionControl.axaml.cs     |  5 ++-
 .../Dialogs/FormatOptionsWindow.axaml.cs      | 37 ++++++++++++++++++-
 .../Services/SqlFormatSettingsService.cs      | 10 ++++-
 3 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
index b3a84f0..de27e6b 100644
--- a/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
+++ b/src/PlanViewer.App/Controls/QuerySessionControl.axaml.cs
@@ -2017,7 +2017,10 @@ private async void Format_Click(object? sender, RoutedEventArgs e)
 
         try
         {
-            var settings = SqlFormatSettingsService.Load();
+            var settings = SqlFormatSettingsService.Load(out var loadError);
+            if (loadError != null)
+                SetStatus("Warning: using default format settings (load failed)");
+
             var (formatted, errors) = await Task.Run(() => SqlFormattingService.Format(sql, settings));
 
             if (errors != null && errors.Count > 0)
diff --git a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
index ffd5a27..0e4e24a 100644
--- a/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
+++ b/src/PlanViewer.App/Dialogs/FormatOptionsWindow.axaml.cs
@@ -52,7 +52,9 @@ public FormatOptionsWindow()
 
     private void LoadSettings()
     {
-        var current = SqlFormatSettingsService.Load();
+        var current = SqlFormatSettingsService.Load(out var loadError);
+        if (loadError != null)
+            ShowErrorPopup("Load Error", loadError);
         _rows.Clear();
 
         var props = typeof(SqlFormatSettings).GetProperties(BindingFlags.Public | BindingFlags.Instance)
@@ -122,7 +124,11 @@ private void Save_Click(object? sender, RoutedEventArgs e)
             }
         }
 
-        SqlFormatSettingsService.Save(settings);
+        if (!SqlFormatSettingsService.Save(settings, out var saveError))
+        {
+            ShowErrorPopup("Save Error", saveError!);
+            return;
+        }
         _isDirty = false;
         Close();
     }
@@ -137,6 +143,33 @@ private void Revert_Click(object? sender, RoutedEventArgs e)
         }
     }
 
+    private void ShowErrorPopup(string title, string message)
+    {
+        var dialog = new Window
+        {
+            Title = title,
+            Width = 480,
+            Height = 220,
+            WindowStartupLocation = WindowStartupLocation.CenterOwner,
+            Background = (IBrush)this.FindResource("BackgroundBrush")!,
+            Foreground = (IBrush)this.FindResource("ForegroundBrush")!,
+            Content = new StackPanel
+            {
+                Margin = new Avalonia.Thickness(20),
+                Children =
+                {
+                    new TextBlock
+                    {
+                        Text = message,
+                        TextWrapping = TextWrapping.Wrap,
+                        FontSize = 13
+                    }
+                }
+            }
+        };
+        dialog.ShowDialog(this);
+    }
+
     private void Close_Click(object? sender, RoutedEventArgs e)
     {
         TryClose();
diff --git a/src/PlanViewer.App/Services/SqlFormatSettingsService.cs b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
index f3bc4cb..23e8cc5 100644
--- a/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
+++ b/src/PlanViewer.App/Services/SqlFormatSettingsService.cs
@@ -97,8 +97,9 @@ internal static class SqlFormatSettingsService
         WriteIndented = true
     };
 
-    public static SqlFormatSettings Load()
+    public static SqlFormatSettings Load(out string? error)
     {
+        error = null;
         try
         {
             if (!File.Exists(SettingsPath))
@@ -110,21 +111,26 @@ public static SqlFormatSettings Load()
         catch (Exception ex)
         {
             Debug.WriteLine($"SqlFormatSettings: failed to load settings: {ex.Message}");
+            error = $"Could not load format settings from:\n{SettingsPath}\n\n{ex.Message}\n\nUsing defaults. Delete or fix the file to clear this error.";
             return new SqlFormatSettings();
         }
     }
 
-    public static void Save(SqlFormatSettings settings)
+    public static bool Save(SqlFormatSettings settings, out string? error)
     {
+        error = null;
         try
         {
             Directory.CreateDirectory(SettingsDir);
             var json = JsonSerializer.Serialize(settings, JsonOptions);
             File.WriteAllText(SettingsPath, json);
+            return true;
         }
         catch (Exception ex)
         {
             Debug.WriteLine($"SqlFormatSettings: failed to save settings: {ex.Message}");
+            error = $"Could not save format settings to:\n{SettingsPath}\n\n{ex.Message}\n\nCheck that the folder is writable and not locked by another process.";
+            return false;
         }
     }
 }