Merge pull request #1756 from fsprojects/repo-assist/improve-htmlparser-dead-code-2026-04-22-e8df0210e46c5935

dsyme · web-flow · commit 3b3f8251cbea · 2026-04-23T19:31:56.000+10:00
[Repo Assist] improve: HtmlParser remove dead code and redundant ToLowerInvariant in EmitTag
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 8.1.11 - Apr 22 2026
+
+- Code: `HtmlParser` `EmitTag` removes dead code in the `else` branch (the expression `x.HasFormattedParent || x.IsFormattedTag` was always equivalent to `x.HasFormattedParent` since `x.IsFormattedTag` is always `false` in that branch). Uses `name` directly to avoid re-computing `CurrentTagName()` for formatted/script tag checks. Also removes redundant `.ToLowerInvariant()` calls in `IsFormattedTag` and `IsScriptTag` since tag names are already lowercased at read time.
+
 ## 8.1.10 - Apr 20 2026
 
 - Performance: `HtmlCharRefs` entity lookup now uses a `Dictionary<string, string>` instead of an F# `Map`, giving O(1) lookups instead of O(log n) for ~2230 HTML named-entity entries. Also avoids a repeated `char[]` allocation in the `TrimEnd` call inside the active pattern.
diff --git a/src/AssemblyInfo.Csv.Core.fs b/src/AssemblyInfo.Csv.Core.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Csv.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Csv.Core"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.DesignTime.fs b/src/AssemblyInfo.DesignTime.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.DesignTime")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.DesignTime"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.Html.Core.fs b/src/AssemblyInfo.Html.Core.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Html.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Html.Core"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.Http.fs b/src/AssemblyInfo.Http.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Http")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Http"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.Json.Core.fs b/src/AssemblyInfo.Json.Core.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Json.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Json.Core"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.Runtime.Utilities.fs b/src/AssemblyInfo.Runtime.Utilities.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Runtime.Utilities")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Runtime.Utilities"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.WorldBank.Core.fs b/src/AssemblyInfo.WorldBank.Core.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.WorldBank.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.WorldBank.Core"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.Xml.Core.fs b/src/AssemblyInfo.Xml.Core.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data.Xml.Core")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data.Xml.Core"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/AssemblyInfo.fs b/src/AssemblyInfo.fs
@@ -5,13 +5,13 @@ open System.Reflection
 [<assembly: AssemblyTitleAttribute("FSharp.Data")>]
 [<assembly: AssemblyProductAttribute("FSharp.Data")>]
 [<assembly: AssemblyDescriptionAttribute("Library of F# type providers and data access tools")>]
-[<assembly: AssemblyVersionAttribute("8.1.10.0")>]
-[<assembly: AssemblyFileVersionAttribute("8.1.10.0")>]
+[<assembly: AssemblyVersionAttribute("8.1.11.0")>]
+[<assembly: AssemblyFileVersionAttribute("8.1.11.0")>]
 do ()
 
 module internal AssemblyVersionInformation =
     let [<Literal>] AssemblyTitle = "FSharp.Data"
     let [<Literal>] AssemblyProduct = "FSharp.Data"
     let [<Literal>] AssemblyDescription = "Library of F# type providers and data access tools"
-    let [<Literal>] AssemblyVersion = "8.1.10.0"
-    let [<Literal>] AssemblyFileVersion = "8.1.10.0"
+    let [<Literal>] AssemblyVersion = "8.1.11.0"
+    let [<Literal>] AssemblyFileVersion = "8.1.11.0"
diff --git a/src/FSharp.Data.Html.Core/HtmlParser.fs b/src/FSharp.Data.Html.Core/HtmlParser.fs
@@ -177,12 +177,16 @@ module internal HtmlParser =
             x.Tokens <- result :: x.Tokens
 
         member x.IsFormattedTag =
-            match x.CurrentTagName().ToLowerInvariant() with
+            // Tag names are already lowercased at read time (ConsTag applies ToLowerInvariant),
+            // so no need to call ToLowerInvariant here.
+            match x.CurrentTagName() with
             | "pre" -> true
             | _ -> false
 
         member x.IsScriptTag =
-            match x.CurrentTagName().ToLowerInvariant() with
+            // Tag names are already lowercased at read time (ConsTag applies ToLowerInvariant),
+            // so no need to call ToLowerInvariant here.
+            match x.CurrentTagName() with
             | "script"
             | "style" -> true
             | _ -> false
@@ -200,15 +204,15 @@ module internal HtmlParser =
                 else
                     Tag(false, name, x.GetAttributes())
 
-            // pre is the only default formatted tag, nested pres are not
-            // allowed in the spec.
-            if x.IsFormattedTag then
+            // "pre" is the only default formatted tag; nested pre elements are not
+            // allowed in the spec.  Use `name` directly to avoid re-computing CurrentTagName().
+            // The else branch (x.HasFormattedParent <- x.HasFormattedParent || false) was a
+            // no-op and has been removed.
+            if name = "pre" then
                 x.HasFormattedParent <- not isEnd
-            else
-                x.HasFormattedParent <- x.HasFormattedParent || x.IsFormattedTag
 
             x.InsertionMode <-
-                if x.IsScriptTag && (not isEnd) then
+                if (name = "script" || name = "style") && (not isEnd) then
                     ScriptMode
                 else
                     DefaultMode
