Other: Shrinker.Avalonia - Slight tweak to diffing algorithm.

deanthecoder · deanthecoder · commit c9171b7c5a34 · 2023-10-09T18:07:41.000+01:00
diff --git a/ShaderShrinker/Shrinker.Avalonia/DiffCreator.cs b/ShaderShrinker/Shrinker.Avalonia/DiffCreator.cs
@@ -71,7 +71,7 @@ private static IEnumerable<CombinedDiff> AssignLineNumbers(IReadOnlyCollection<C
         return diffs;
     }
 
-    private static void MergeSimilarLines(List<CombinedDiff> diffs)
+    private static void MergeSimilarLines(IList<CombinedDiff> diffs)
     {
         for (var i = 0; i < diffs.Count - 1; i++)
         {
@@ -105,5 +105,5 @@ private static bool CompareIgnoringWhitespace(string rightText, string leftText)
         RemoveWhiteSpace(rightText).StartsWith(RemoveWhiteSpace(leftText));
 
     private static string RemoveWhiteSpace(string s) =>
-        s.Replace(" ", string.Empty).Replace("\t", string.Empty);
+        s.Replace(" ", string.Empty).Replace("\t", string.Empty).Trim('{', '}');
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ private static IEnumerable<CombinedDiff> AssignLineNumbers(IReadOnlyCollection<C`
`71`	`71`	`return diffs;`
`72`	`72`	`}`
`73`	`73`
`74`		`- private static void MergeSimilarLines(List<CombinedDiff> diffs)`
	`74`	`+ private static void MergeSimilarLines(IList<CombinedDiff> diffs)`
`75`	`75`	`{`
`76`	`76`	`for (var i = 0; i < diffs.Count - 1; i++)`
`77`	`77`	`{`
`@@ -105,5 +105,5 @@ private static bool CompareIgnoringWhitespace(string rightText, string leftText)`
`105`	`105`	`RemoveWhiteSpace(rightText).StartsWith(RemoveWhiteSpace(leftText));`
`106`	`106`
`107`	`107`	`private static string RemoveWhiteSpace(string s) =>`
`108`		`- s.Replace(" ", string.Empty).Replace("\t", string.Empty);`
	`108`	`+ s.Replace(" ", string.Empty).Replace("\t", string.Empty).Trim('{', '}');`
`109`	`109`	`}`