Add support to ignore line endings in function definitions (#43)

- Updated DiffPlex - Added setting checkbox to ignore line endings
microsoft · Jan 11, 2025 · d8001b1 · d8001b1
1 parent 7f09c7a
commit d8001b1
Show file tree

Hide file tree

Showing 9 changed files with 420 additions and 378 deletions.
diff --git a/SyncKusto/App.config b/SyncKusto/App.config
@@ -1,42 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-      <section name="SyncKusto.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-    </sectionGroup>
-  </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
-  </startup>
-  <userSettings>
-    <SyncKusto.Properties.Settings>
-      <setting name="PreviousFilePath" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="KustoClusterForTempDatabases" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="AADAuthority" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="TemporaryKustoDatabase" serializeAs="String">
-        <value />
-      </setting>
-      <setting name="KustoObjectDropWarning" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="TableFieldsOnNewLine" serializeAs="String">
-        <value>False</value>
-      </setting>
-      <setting name="CreateMergeEnabled" serializeAs="String">
-        <value>False</value>
-      </setting>
-      <setting name="UseLegacyCslExtension" serializeAs="String">
-        <value>True</value>
-      </setting>
-      <setting name="CertificateLocation" serializeAs="String">
-        <value>CurrentUser</value>
-      </setting>
-    </SyncKusto.Properties.Settings>
-  </userSettings>
-</configuration>
+    <configSections>
+        <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+            <section name="SyncKusto.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+        </sectionGroup>
+    </configSections>
+    <startup>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+    <userSettings>
+        <SyncKusto.Properties.Settings>
+            <setting name="PreviousFilePath" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="KustoClusterForTempDatabases" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="AADAuthority" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="TemporaryKustoDatabase" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="KustoObjectDropWarning" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="TableFieldsOnNewLine" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="CreateMergeEnabled" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="UseLegacyCslExtension" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="CertificateLocation" serializeAs="String">
+                <value>CurrentUser</value>
+            </setting>
+            <setting name="RecentClusters" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="RecentDatabases" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="RecentAppIds" serializeAs="String">
+                <value />
+            </setting>
+            <setting name="IgnoreLineEndings" serializeAs="String">
+                <value>False</value>
+            </setting>
+        </SyncKusto.Properties.Settings>
+    </userSettings>
+</configuration>
diff --git a/SyncKusto/Kusto/QueryEngine.cs b/SyncKusto/Kusto/QueryEngine.cs
@@ -3,13 +3,15 @@
 
 using System;
 using System.Data;
+using System.Diagnostics;
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Kusto.Data;
 using Kusto.Data.Common;
 using Kusto.Data.Net.Client;
 using Newtonsoft.Json;
+using SyncKusto.Properties;
 using SyncKusto.Utilities;
 
 namespace SyncKusto.Kusto
@@ -105,7 +107,12 @@ public DatabaseSchema GetDatabaseSchema()
             }
             foreach (var function in result.Functions.Values)
             {
-                if (function.Folder == null)
+	            if (SettingsWrapper.IgnoreLineEndings ?? false)
+	            {
+		            function.Body = function.Body.Replace("\r\n", "\n").Replace("\r", "\n");
+	            }
+
+	            if (function.Folder == null)
                 {
                     function.Folder = "";
                 }
@@ -318,4 +325,4 @@ public static string NormalizeClusterName(string cluster)
             }
         }
     }
-}
+}
diff --git a/SyncKusto/MainForm.cs b/SyncKusto/MainForm.cs
@@ -281,7 +281,7 @@ private void tvComparison_NodeMouseClick(object sender, TreeNodeMouseClickEventA
             }
 
             var diffBuilder = new InlineDiffBuilder(new Differ());
-            DiffPlex.DiffBuilder.Model.DiffPaneModel diff = diffBuilder.BuildDiffModel(targetText, sourceText);
+            DiffPlex.DiffBuilder.Model.DiffPaneModel diff = diffBuilder.BuildDiffModel(targetText, sourceText, SettingsWrapper.IgnoreLineEndings ?? false);
             rtbSourceText.Clear();
 
             int longestLine = 98;
@@ -515,4 +515,4 @@ private bool IsTempClusterDefined()
             return !string.IsNullOrWhiteSpace(SettingsWrapper.KustoClusterForTempDatabases);
         }
     }
-}
+}
diff --git a/SyncKusto/Properties/Settings.Designer.cs b/SyncKusto/Properties/Settings.Designer.cs
diff --git a/SyncKusto/Properties/Settings.settings b/SyncKusto/Properties/Settings.settings
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="SyncKusto.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
@@ -38,5 +38,9 @@
     <Setting Name="RecentAppIds" Type="System.Collections.Specialized.StringCollection" Scope="User">
       <Value Profile="(Default)" />
     </Setting>
+    <Setting Name="IgnoreLineEndings" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
-</SettingsFile>
+</SettingsFile>
+