Merge pull request #28 from OpenTabletDriver/codeblock-newline

InfinityGhost · web-flow · commit 74ed4a9313a7 · 2021-12-30T17:56:33.000-08:00
CodeBlockTagHelper: Fix newlines not being copied
diff --git a/OpenTabletDriver.Web/TagHelpers/CodeBlockTagHelper.cs b/OpenTabletDriver.Web/TagHelpers/CodeBlockTagHelper.cs
@@ -60,7 +60,7 @@ private IEnumerable<string> LanguageFormat(IList<string> lines, string language)
                         {
                             var nextLine = lines[i + 1];
                             const string tag = "span";
-                            yield return $"<{tag} class=\"text-muted\">{line}</{tag}>{nextLine}";
+                            yield return $"<{tag} class=\"text-muted\">{line}{Environment.NewLine}</{tag}>{nextLine}";
                             i++;
                         }
                         else
@@ -80,7 +80,7 @@ private IEnumerable<string> LanguageFormat(IList<string> lines, string language)
                         {
                             var nextLine = lines[i + 1];
                             const string tag = "span";
-                            yield return $"<{tag} class=\"text-info\">{line}</{tag}>{nextLine}";
+                            yield return $"<{tag} class=\"text-info\">{line}{Environment.NewLine}</{tag}>{nextLine}";
                             i++;
                         }
                         else

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private IEnumerable<string> LanguageFormat(IList<string> lines, string language)`
`60`	`60`	`{`
`61`	`61`	`var nextLine = lines[i + 1];`
`62`	`62`	`const string tag = "span";`
`63`		`- yield return $"<{tag} class=\"text-muted\">{line}</{tag}>{nextLine}";`
	`63`	`+ yield return $"<{tag} class=\"text-muted\">{line}{Environment.NewLine}</{tag}>{nextLine}";`
`64`	`64`	`i++;`
`65`	`65`	`}`
`66`	`66`	`else`
`@@ -80,7 +80,7 @@ private IEnumerable<string> LanguageFormat(IList<string> lines, string language)`
`80`	`80`	`{`
`81`	`81`	`var nextLine = lines[i + 1];`
`82`	`82`	`const string tag = "span";`
`83`		`- yield return $"<{tag} class=\"text-info\">{line}</{tag}>{nextLine}";`
	`83`	`+ yield return $"<{tag} class=\"text-info\">{line}{Environment.NewLine}</{tag}>{nextLine}";`
`84`	`84`	`i++;`
`85`	`85`	`}`
`86`	`86`	`else`