Address remaining problems detected by analyzers.

Author: nojaf

src/Common/StringParsing.fs

@@ -23,15 +23,15 @@ module String =
 
     /// Matches when a string starts with the specified sub-string
     let (|StartsWith|_|) (start: string) (text: string) =
-        if text.StartsWith(start) then
+        if text.StartsWith(start, StringComparison.Ordinal) then
             Some(text.Substring(start.Length))
         else
             None
 
     /// Matches when a string starts with the specified sub-string
     /// The matched string is trimmed from all whitespace.
     let (|StartsWithTrim|_|) (start: string) (text: string) =
-        if text.StartsWith(start) then
+        if text.StartsWith(start, StringComparison.Ordinal) then
             Some(text.Substring(start.Length).Trim())
         else
             None
@@ -40,8 +40,8 @@ module String =
     /// with a given value (and returns the rest of it)
     let (|StartsAndEndsWith|_|) (starts: string, ends: string) (s: string) =
         if
-            s.StartsWith(starts)
-            && s.EndsWith(ends)
+            s.StartsWith(starts, StringComparison.Ordinal)
+            && s.EndsWith(ends, StringComparison.Ordinal)
             && s.Length >= starts.Length + ends.Length
         then
             Some(s.Substring(starts.Length, s.Length - starts.Length - ends.Length))
@@ -60,8 +60,8 @@ module String =
     /// For example "[aa]bc" is wrapped in [ and ] pair. Returns the wrapped
     /// text together with the rest.
     let (|StartsWithWrapped|_|) (starts: string, ends: string) (text: string) =
-        if text.StartsWith(starts) then
-            let id = text.IndexOf(ends, starts.Length)
+        if text.StartsWith(starts, StringComparison.Ordinal) then
+            let id = text.IndexOf(ends, starts.Length, StringComparison.Ordinal)
 
             if id >= 0 then
                 let wrapped = text.Substring(starts.Length, id - starts.Length)
@@ -79,7 +79,7 @@ module String =
         let rec tryEol eolList =
             match eolList with
             | h: string :: t ->
-                match text.IndexOf(h) with
+                match text.IndexOf(h, StringComparison.Ordinal) with
                 | i when i < 0 -> tryEol t
                 | i -> text.Substring(i + h.Length)
             | _ -> text
@@ -174,15 +174,15 @@ module StringPosition =
              StartColumn = n.StartColumn + text.Length - trimmed.Length })
 
     /// Matches when a string starts with any of the specified sub-strings
-    let (|StartsWithAny|_|) (starts: seq<string>) (text: string, _n: MarkdownRange) =
-        if starts |> Seq.exists (text.StartsWith) then
+    let (|StartsWithAny|_|) (starts: string seq) (text: string, _n: MarkdownRange) =
+        if starts |> Seq.exists (fun s -> text.StartsWith(s, StringComparison.Ordinal)) then
             Some()
         else
             None
 
     /// Matches when a string starts with the specified sub-string
     let (|StartsWith|_|) (start: string) (text: string, n: MarkdownRange) =
-        if text.StartsWith(start) then
+        if text.StartsWith(start, StringComparison.Ordinal) then
             Some(
                 text.Substring(start.Length),
                 { n with
@@ -194,7 +194,7 @@ module StringPosition =
     /// Matches when a string starts with the specified sub-string
     /// The matched string is trimmed from all whitespace.
     let (|StartsWithTrim|_|) (start: string) (text: string, n: MarkdownRange) =
-        if text.StartsWith(start) then
+        if text.StartsWith(start, StringComparison.Ordinal) then
             Some(
                 text.Substring(start.Length).Trim(),
                 { n with
@@ -207,7 +207,7 @@ module StringPosition =
     /// The matched string is trimmed from all whitespace.
     let (|StartsWithNTimesTrimIgnoreStartWhitespace|_|) (start: string) (text: string, _n: MarkdownRange) =
         if text.Contains(start) then
-            let beforeStart = text.Substring(0, text.IndexOf(start))
+            let beforeStart = text.Substring(0, text.IndexOf(start, StringComparison.Ordinal))
 
             if String.IsNullOrWhiteSpace(beforeStart) then
                 let startAndRest = text.Substring(beforeStart.Length)
@@ -232,8 +232,8 @@ module StringPosition =
     /// with a given value (and returns the rest of it)
     let (|StartsAndEndsWith|_|) (starts: string, ends: string) (s: string, n: MarkdownRange) =
         if
-            s.StartsWith(starts)
-            && s.EndsWith(ends)
+            s.StartsWith(starts, StringComparison.Ordinal)
+            && s.EndsWith(ends, StringComparison.Ordinal)
             && s.Length >= starts.Length + ends.Length
         then
             Some(
@@ -276,8 +276,8 @@ module StringPosition =
     /// For example "[aa]bc" is wrapped in [ and ] pair. Returns the wrapped
     /// text together with the rest.
     let (|StartsWithWrapped|_|) (starts: string, ends: string) (text: string, n: MarkdownRange) =
-        if text.StartsWith(starts) then
-            let id = text.IndexOf(ends, starts.Length)
+        if text.StartsWith(starts, StringComparison.Ordinal) then
+            let id = text.IndexOf(ends, starts.Length, StringComparison.Ordinal)
 
             if id >= 0 then
                 let wrapped = text.Substring(starts.Length, id - starts.Length)
@@ -363,7 +363,8 @@ module Lines =
     let (|TakeStartingWithOrBlank|_|) (start: string) (input: string list) =
         match
             input
-            |> List.partitionWhile (fun s -> String.IsNullOrWhiteSpace s || s.StartsWith(start))
+            |> List.partitionWhile (fun s ->
+                String.IsNullOrWhiteSpace s || s.StartsWith(start, StringComparison.Ordinal))
         with
         | matching, rest when matching <> [] -> Some(matching, rest)
         | _ -> None
@@ -405,7 +406,7 @@ module Lines =
         |> List.map (fun (StringPosition.TrimStart s) -> s)
         // Now remove all additional spaces at the end, but keep two spaces if existent
         |> List.map (fun (s, n) ->
-            let endsWithTwoSpaces = s.EndsWith("  ")
+            let endsWithTwoSpaces = s.EndsWith("  ", StringComparison.Ordinal)
 
             let trimmed = s.TrimEnd([| ' ' |]) + if endsWithTwoSpaces then "  " else ""
 

src/Directory.Build.targets

@@ -3,6 +3,6 @@
         <FSharpAnalyzersOtherFlags>--analyzers-path &quot;$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --analyzers-path &quot;$(PkgIonide_Analyzers)/analyzers/dotnet/fs&quot;</FSharpAnalyzersOtherFlags>
         <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --exclude-analyzer PartialAppAnalyzer -c Release</FSharpAnalyzersOtherFlags>
-        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --verbose --code-root ../.. --report &quot;../../reports/$(MSBuildProjectName)-$(TargetFramework).sarif&quot;</FSharpAnalyzersOtherFlags>
+        <FSharpAnalyzersOtherFlags>$(FSharpAnalyzersOtherFlags) --code-root ../.. --report &quot;../../reports/$(MSBuildProjectName)-$(TargetFramework).sarif&quot;</FSharpAnalyzersOtherFlags>
     </PropertyGroup>
 </Project>

src/FSharp.Formatting.ApiDocs/GenerateHtml.fs

@@ -58,7 +58,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
               ] ]
 
     let removeParen (memberName: string) =
-        let firstParen = memberName.IndexOf("(")
+        let firstParen = memberName.IndexOf('(')
 
         if firstParen > 0 then
             memberName.Substring(0, firstParen)
@@ -81,7 +81,7 @@ type HtmlRender(model: ApiDocModel, ?menuTemplateFolder: string) =
 
     // Copy XML sig for use in `cref` markdown
     let copyXmlSigIconMarkdown (xmlDocSig: string) =
-        if xmlDocSig.StartsWith("`") || xmlDocSig.EndsWith("`") then
+        if xmlDocSig.StartsWith('`') || xmlDocSig.EndsWith('`') then
             div [] []
         else
             let delim =

src/FSharp.Formatting.ApiDocs/GenerateModel.fs

@@ -173,7 +173,7 @@ type ApiDocAttribute(name, fullName, constructorArguments, namedConstructorArgum
     member x.ObsoleteMessage =
         let tryFindObsoleteMessage =
             x.ConstructorArguments
-            |> Seq.tryFind (fun x -> x :? string)
+            |> List.tryFind (fun x -> x :? string)
             |> Option.map string
             |> Option.defaultValue ""
 
@@ -186,7 +186,7 @@ type ApiDocAttribute(name, fullName, constructorArguments, namedConstructorArgum
     member x.CustomOperationName =
         let tryFindCustomOperation =
             x.ConstructorArguments
-            |> Seq.tryFind (fun x -> x :? string)
+            |> List.tryFind (fun x -> x :? string)
             |> Option.map string
             |> Option.defaultValue ""
 
@@ -200,7 +200,10 @@ type ApiDocAttribute(name, fullName, constructorArguments, namedConstructorArgum
         let dropSuffix (s: string) (t: string) = s.[0 .. s.Length - t.Length - 1]
 
         let attributeName =
-            if removeAttributeSuffix && attributeName.EndsWith "Attribute" then
+            if
+                removeAttributeSuffix
+                && attributeName.EndsWith("Attribute", StringComparison.Ordinal)
+            then
                 dropSuffix attributeName "Attribute"
             else
                 attributeName
@@ -368,7 +371,7 @@ type ApiDocMember
                     printfn "%s(%d,%d): error: duplicate id for example '%s'" m.FileName m.StartLine m.StartColumn id
 
         for (id, _count) in knownExampleIds do
-            if id.StartsWith "example-" then
+            if id.StartsWith("example-", StringComparison.Ordinal) then
                 let potentialInteger = id.["example-".Length ..]
 
                 match System.Int32.TryParse potentialInteger with
@@ -482,13 +485,13 @@ type ApiDocMember
     member x.Symbol: FSharpSymbol = symbol
 
     /// Gets a value indicating whether this member is obsolete
-    member x.IsObsolete = x.Attributes |> Seq.exists (fun a -> a.IsObsoleteAttribute)
+    member x.IsObsolete = x.Attributes |> List.exists (fun a -> a.IsObsoleteAttribute)
 
     /// Returns the obsolete message, when this member is obsolete. When its not or no message was specified, an empty string is returned
     member x.ObsoleteMessage = ApiDocAttribute.TryGetObsoleteMessage(x.Attributes)
 
     member x.IsRequireQualifiedAccessAttribute =
-        x.Attributes |> Seq.exists (fun a -> a.IsRequireQualifiedAccessAttribute)
+        x.Attributes |> List.exists (fun a -> a.IsRequireQualifiedAccessAttribute)
 
     /// Returns the custom operation name, when this attribute is the CustomOperationAttribute.
     member x.CustomOperationName = ApiDocAttribute.TryGetCustomOperationName(x.Attributes)
@@ -602,7 +605,7 @@ type ApiDocEntity
     member x.StaticMembers: ApiDocMember list = stat
 
     /// Gets a value indicating whether this member is obsolete
-    member x.IsObsolete = x.Attributes |> Seq.exists (fun a -> a.IsObsoleteAttribute)
+    member x.IsObsolete = x.Attributes |> List.exists (fun a -> a.IsObsoleteAttribute)
 
     /// Returns the obsolete message, when this member is obsolete. When its not or no message was specified, an empty string is returned
     member x.ObsoleteMessage = ApiDocAttribute.TryGetObsoleteMessage(x.Attributes)
@@ -782,7 +785,8 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)
 
     let nameGen (name: string) =
         let nice =
-            (toReplace |> Seq.fold (fun (s: string) (inv, repl) -> s.Replace(inv, repl)) name)
+            (toReplace
+             |> List.fold (fun (s: string) (inv, repl) -> s.Replace(inv, repl)) name)
                 .ToLower()
 
         let found =
@@ -837,7 +841,7 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)
             failwithf "The entity %s was not registered before!" (sprintf "%s.%s" entity.AccessPath entity.CompiledName)
 
     let removeParen (memberName: string) =
-        let firstParen = memberName.IndexOf("(")
+        let firstParen = memberName.IndexOf('(')
 
         if firstParen > 0 then
             memberName.Substring(0, firstParen)
@@ -874,7 +878,7 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)
         let noNamespaceParts =
             if hasModuleSuffix then
                 match noNamespaceParts with
-                | h :: t when h.EndsWith("Module") -> h.[0 .. h.Length - 7] :: t
+                | h :: t when h.EndsWith("Module", StringComparison.Ordinal) -> h.[0 .. h.Length - 7] :: t
                 | s -> s
             else
                 noNamespaceParts
@@ -890,7 +894,10 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)
         noGenerics
 
     let externalDocsLink isMember simple (typeName: string) (fullName: string) =
-        if fullName.StartsWith "FSharp." || fullName.StartsWith "Microsoft.FSharp." then
+        if
+            fullName.StartsWith("FSharp.", StringComparison.Ordinal)
+            || fullName.StartsWith("Microsoft.FSharp.", StringComparison.Ordinal)
+        then
             let noParen = removeParen typeName
 
             let docs =
@@ -1051,9 +1058,9 @@ type internal CrossReferenceResolver(root, collectionName, qualify, extensions)
 
         match cref with
         // Type
-        | _ when cref.StartsWith("T:") -> Some(resolveCrossReferenceForTypeByXmlSig cref)
+        | _ when cref.StartsWith("T:", StringComparison.Ordinal) -> Some(resolveCrossReferenceForTypeByXmlSig cref)
         // Compiler was unable to resolve!
-        | _ when cref.StartsWith("!:") ->
+        | _ when cref.StartsWith("!:", StringComparison.Ordinal) ->
             Log.warnf "Compiler was unable to resolve %s" cref
             None
         // ApiDocMember
@@ -1165,7 +1172,7 @@ module internal TypeFormatter =
             match args with
             | [] -> typeName
             | [ arg ] ->
-                if tcref.DisplayName.StartsWith "[" then
+                if tcref.DisplayName.StartsWith '[' then
                     span [] [ formatTypeWithPrecAsHtml ctx 2 arg; !!tcref.DisplayName ]
                 else
                     span [] [ formatTypeWithPrecAsHtml ctx 2 arg; !! " "; typeName ]
@@ -1581,7 +1588,7 @@ module internal SymbolReader =
     let readUnionCase (ctx: ReadingContext) (_typ: FSharpEntity) (case: FSharpUnionCase) =
 
         let formatFieldUsage (field: FSharpField) =
-            if field.Name.StartsWith("Item") then
+            if field.Name.StartsWith("Item", StringComparison.Ordinal) then
                 formatTypeAsHtml ctx.UrlMap field.FieldType
             else
                 !!field.Name
@@ -1993,7 +2000,7 @@ module internal SymbolReader =
         let remarks =
             let remarkNodes = doc.Elements(XName.Get "remarks") |> Seq.toList
 
-            if Seq.length remarkNodes > 0 then
+            if List.length remarkNodes > 0 then
                 let html = new StringBuilder()
 
                 for (id, e) in List.indexed remarkNodes do
@@ -2036,7 +2043,11 @@ module internal SymbolReader =
                           // FSharp.Core cref listings don't start with "T:", see https://github.com/dotnet/fsharp/issues/9805
                           let cname = cref.Value
 
-                          let cname = if cname.StartsWith("T:") then cname else "T:" + cname // FSharp.Core exception listings don't start with "T:"
+                          let cname =
+                              if cname.StartsWith("T:", StringComparison.Ordinal) then
+                                  cname
+                              else
+                                  "T:" + cname // FSharp.Core exception listings don't start with "T:"
 
                           match urlMap.ResolveCref cname with
                           | Some reference ->
@@ -2095,7 +2106,7 @@ module internal SymbolReader =
 
             match lst with
             | [ x ] -> rawData.[n] <- x.Value
-            | lst -> lst |> Seq.iteri (fun id el -> rawData.[n + "-" + string id] <- el.Value))
+            | lst -> lst |> List.iteri (fun id el -> rawData.[n + "-" + string id] <- el.Value))
 
         let rawData = rawData |> Seq.toList
 
@@ -2756,9 +2767,9 @@ module internal SymbolReader =
     // ----------------------------------------------------------------------------------------------
 
     let stripMicrosoft (str: string) =
-        if str.StartsWith("Microsoft.") then
+        if str.StartsWith("Microsoft.", StringComparison.Ordinal) then
             str.["Microsoft.".Length ..]
-        elif str.StartsWith("microsoft-") then
+        elif str.StartsWith("microsoft-", StringComparison.Ordinal) then
             str.["microsoft-".Length ..]
         else
             str

src/FSharp.Formatting.CodeFormat/CodeFormat.fs

@@ -6,7 +6,6 @@
 namespace FSharp.Formatting.CodeFormat
 
 open System
-open System.Diagnostics
 
 /// <summary>
 ///  Represents an individual formatted snippet with title as key
@@ -28,7 +27,7 @@ type FormattedSnippet(key: string, content: string) =
 
 
 /// Represents formatted snippets
-type FormattedContent(snippets: FormattedSnippet[], tips: string) =
+type FormattedContent(snippets: FormattedSnippet array, tips: string) =
     /// Returns the processed snippets as an array
     member x.Snippets = snippets