Fixed bug which caused invalid line breaks at sections/functions #3

TwentyFourMinutes · Nov 21, 2020 · b3fb55e · b3fb55e
1 parent a325271
commit b3fb55e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 17 deletions.
diff --git a/src/RazorMinifier/RazorMinifier.Core/Minifiers/CSHtmlMinifier.cs b/src/RazorMinifier/RazorMinifier.Core/Minifiers/CSHtmlMinifier.cs
@@ -1,9 +1,9 @@
-using PreMailer.Net;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using PreMailer.Net;
 
 namespace RazorMinifier.Core.Minifiers
 {
@@ -77,14 +77,22 @@ private static (string, MinifyResult) Minify(string input, bool usePreMailer)
 
             input = _emptyLineRegex.Replace(input, string.Empty);
 
+            var indexOffset = 0;
+
             foreach (Match match in _razorSectionRegex.Matches(input))
             {
-                input = input.Insert(match.Index, Environment.NewLine);
+                input = input.Insert(match.Index + indexOffset, Environment.NewLine);
+
+                indexOffset += Environment.NewLine.Length;
             }
 
+            indexOffset = 0;
+
             foreach (Match match in _razorFunctionsRegex.Matches(input))
             {
-                input = input.Insert(match.Index, Environment.NewLine);
+                input = input.Insert(match.Index + indexOffset, Environment.NewLine);
+
+                indexOffset += Environment.NewLine.Length;
             }
 
             foreach (var header in headers)

diff --git a/src/RazorMinifier/RazorMinifier/RazorMinifier.cs b/src/RazorMinifier/RazorMinifier/RazorMinifier.cs
@@ -1,4 +1,12 @@
-using DulcisX.Core;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Threading;
+using System.Threading.Tasks;
+using DulcisX.Core;
 using DulcisX.Core.Enums;
 using DulcisX.Core.Enums.VisualStudio;
 using DulcisX.Nodes;
@@ -10,14 +18,6 @@
 using RazorMinifier.Core.Minifiers;
 using RazorMinifier.Models;
 using RazorMinifier.Models.Enums;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Threading;
-using System.Threading.Tasks;
 using Task = System.Threading.Tasks.Task;
 
 namespace RazorMinifier.VSIX

diff --git a/src/RazorMinifier/RazorMinifier/ToggleRazorMinifier.cs b/src/RazorMinifier/RazorMinifier/ToggleRazorMinifier.cs
@@ -1,10 +1,10 @@
-using DulcisX.Nodes;
-using Microsoft.VisualStudio.Shell;
-using RazorMinifier.Models.Enums;
-using System;
+using System;
 using System.ComponentModel.Design;
 using System.IO;
 using System.Linq;
+using DulcisX.Nodes;
+using Microsoft.VisualStudio.Shell;
+using RazorMinifier.Models.Enums;
 using Task = System.Threading.Tasks.Task;
 
 namespace RazorMinifier.VSIX