Minor performance improvements / code cleanup (#1424)

* Minor performance improvements / code cleanup

* Fantomas commit

Author: Thorium

src/FsAutoComplete.Core/CodeGeneration.fs

@@ -543,7 +543,7 @@ module CodeGenerationUtils =
     m.IsDispatchSlot
     // this member doesn't implement anything
     && (try
-          m.ImplementedAbstractSignatures <> null
+          (not (isNull m.ImplementedAbstractSignatures))
           && m.ImplementedAbstractSignatures.Count = 0
         with _ ->
           true) // exceptions here trying to access the member means we're safe
@@ -672,7 +672,7 @@ module CodeGenerationUtils =
     // This rule match when we are at the end of the namespace and there is no more tokens
     // interface System.Collections.ICollection
     //                              ^
-    | potentialDot :: validIdentifier :: [] when
+    | potentialDot :: [ validIdentifier ] when
       potentialDot.CharClass = FSharpTokenCharKind.Delimiter
       && potentialDot.TokenName = "DOT"
       && validIdentifier.CharClass = FSharpTokenCharKind.Identifier

src/FsAutoComplete.Core/Commands.fs

@@ -728,7 +728,7 @@ module Commands =
               Position.mkPos l indentation
             else
               pos
-          | Pos(_, _) -> pos
+          | Pos _ -> pos
 
         { Namespace = n
           Position = pos

src/FsAutoComplete.Core/CompilerServiceInterface.fs

@@ -267,7 +267,7 @@ type FSharpCompilerServiceChecker
           |> Seq.distinctBy (fun o -> o.ProjectFileName)
           |> Seq.filter (fun o ->
             o.ReferencedProjectsPath
-            |> List.map (fun p -> Path.GetFullPath p)
+            |> List.map Path.GetFullPath
             |> List.contains option.ProjectFileName) ])
 
   member private __.GetNetFxScriptSnapshot(file: string<LocalPath>, source) =

src/FsAutoComplete.Core/DocumentationFormatter.fs

@@ -50,6 +50,8 @@ module DocumentationFormatter =
 
       $"<a href='command:fsharp.showDocumentation?%s{content}'>%s{name}</a>", name.Length
 
+  let tag = Regex """<.*>"""
+
   let rec formatType (displayContext: FSharpDisplayContext) (typ: FSharpType) : string * int =
     let combineParts (parts: (string * int) seq) : string * int =
       // make a single type name out of all of the tuple parts, since each part is correct by construction
@@ -101,7 +103,7 @@ module DocumentationFormatter =
       // we set this context specifically because we want to enforce prefix-generic form on tooltip displays
       let newContext = displayContext.WithPrefixGenericParameters()
       let org = typ.Format newContext
-      let t = Regex.Replace(org, """<.*>""", "<")
+      let t = tag.Replace(org, "<")
 
       [ yield formatShowDocumentationLink t xmlDocSig assemblyName
         if t.EndsWith("<", StringComparison.Ordinal) then

src/FsAutoComplete.Core/FCSPatches.fs

@@ -20,7 +20,7 @@ module internal SynExprAppLocationsImpl =
       let res = loop exprs ranges
       Some(res), None
 
-    | SynExpr.Paren(SynExpr.Paren(_, _, _, _) as synExpr, _, _, _parenRange) ->
+    | SynExpr.Paren(SynExpr.Paren _ as synExpr, _, _, _parenRange) ->
       let r, _cacheOpt = searchSynArgExpr traverseSynExpr synExpr ranges
       r, None
 

src/FsAutoComplete.Core/Fsdn.fs

@@ -50,8 +50,7 @@ let query (queryStr: string) =
         "language", "fsharp"
         "single_letter_as_variable", "enabled"
         "limit", "50" ]
-      |> List.map (fun (k, v) -> k, System.Uri.EscapeDataString(v))
-      |> List.map (fun (k, v) -> sprintf "%s=%s" k v)
+      |> List.map (fun (k, v) -> sprintf "%s=%s" k (System.Uri.EscapeDataString v))
       |> String.concat "&"
 
     let! req =

src/FsAutoComplete.Core/TipFormatter.fs

@@ -33,7 +33,7 @@ module private Section =
       content
       |> Seq.map (fun kv ->
         let text =
-          if kv.Value.Contains("\n") then
+          if kv.Value.Contains '\n' then
             kv.Value.Split('\n')
             |> Seq.map (fun line -> "> " + line.TrimStart())
             |> String.concat Environment.NewLine
@@ -453,6 +453,8 @@ module private Format =
       text
 
 
+  let private thsPattern = Regex "<th\s?>"
+
   let private convertTable =
     { TagName = "table"
       Formatter =
@@ -461,7 +463,7 @@ module private Format =
 
         | NonVoidElement(innerText, _) ->
 
-          let rowCount = Regex.Matches(innerText, "<th\s?>").Count
+          let rowCount = thsPattern.Matches(innerText).Count
 
           let convertedTable =
             innerText
@@ -488,6 +490,7 @@ module private Format =
   type private Term = string
   type private Definition = string
 
+  [<Struct>]
   type private ListStyle =
     | Bulleted
     | Numbered
@@ -535,8 +538,10 @@ module private Format =
 
     let tryGetTerm (text: string) = tryGetInnerTextOnNonVoidElement text "term"
 
+    let itmPattern = Regex(tagPattern "item", RegexOptions.IgnoreCase)
+
     let rec extractItemList (res: ItemList list) (text: string) =
-      match Regex.Match(text, tagPattern "item", RegexOptions.IgnoreCase) with
+      match itmPattern.Match text with
       | m when m.Success ->
         let newText = text.Substring(m.Value.Length)
 
@@ -559,8 +564,10 @@ module private Format =
           extractItemList res newText
       | _ -> res
 
+    let listHeader = Regex(tagPattern "listheader", RegexOptions.IgnoreCase)
+
     let rec extractColumnHeader (res: string list) (text: string) =
-      match Regex.Match(text, tagPattern "listheader", RegexOptions.IgnoreCase) with
+      match listHeader.Match text with
       | m when m.Success ->
         let newText = text.Substring(m.Value.Length)
 
@@ -580,9 +587,10 @@ module private Format =
           extractColumnHeader res newText
       | _ -> res
 
+    let itemPattern = Regex(tagPattern "item", RegexOptions.IgnoreCase)
 
     let rec extractRowsForTable (res: (string list) list) (text: string) =
-      match Regex.Match(text, tagPattern "item", RegexOptions.IgnoreCase) with
+      match itemPattern.Match text with
       | m when m.Success ->
         let newText = text.Substring(m.Value.Length)
 
@@ -707,7 +715,7 @@ module private Format =
     |> handleMicrosoftOrList
     |> unescapeSpecialCharacters
 
-[<RequireQualifiedAccess>]
+[<RequireQualifiedAccess; Struct>]
 type FormatCommentStyle =
   | Legacy
   | FullEnhanced
@@ -907,9 +915,11 @@ let private findLocalizedXmlFile (xmlFile: string) =
 
   findCultures System.Globalization.CultureInfo.CurrentUICulture
   |> List.map (fun culture -> Path.Combine(path, culture, xmlName))
-  |> List.tryFind (fun i -> File.Exists i)
+  |> List.tryFind File.Exists
   |> Option.defaultValue xmlFile
 
+let pPattern = Regex """(<p .*?>)+(.*)(<\/?p>)*"""
+
 let private getXmlDoc dllFile =
   let xmlFile = Path.ChangeExtension(dllFile, ".xml")
   //Workaround for netstandard.dll
@@ -925,9 +935,9 @@ let private getXmlDoc dllFile =
 
   let xmlFile = findLocalizedXmlFile xmlFile
 
-  if xmlDocCache.ContainsKey xmlFile then
-    Some xmlDocCache.[xmlFile]
-  else
+  match xmlDocCache.TryGetValue xmlFile with
+  | true, cachedXmlFile -> Some cachedXmlFile
+  | false, _ ->
     let rec exists filePath tryAgain =
       match File.Exists filePath, tryAgain with
       | true, _ -> Some filePath
@@ -948,7 +958,7 @@ let private getXmlDoc dllFile =
         //Workaround for netstandard xmlDoc
         let cnt =
           if actualXmlFile.Contains "netstandard.xml" then
-            let cnt = Regex.Replace(cnt, """(<p .*?>)+(.*)(<\/?p>)*""", "$2")
+            let cnt = pPattern.Replace(cnt, "$2")
 
             cnt.Replace("<p>", "").Replace("</p>", "").Replace("<br>", "")
           else
@@ -995,7 +1005,7 @@ let private tryGetXmlDocMember (xmlDoc: FSharpXmlDoc) =
       let rec findIndentationSize (lines: string list) =
         match lines with
         | head :: tail ->
-          let lesserThanIndex = head.IndexOf("<", StringComparison.Ordinal)
+          let lesserThanIndex = head.IndexOf('<', StringComparison.Ordinal)
 
           if lesserThanIndex <> -1 then
             lesserThanIndex
@@ -1012,8 +1022,10 @@ let private tryGetXmlDocMember (xmlDoc: FSharpXmlDoc) =
 
     | FSharpXmlDoc.FromXmlFile(dllFile, memberName) ->
       match getXmlDoc dllFile with
-      | Some doc when doc.ContainsKey memberName -> TryGetXmlDocMemberResult.Some doc.[memberName]
-
+      | Some doc ->
+        match doc.TryGetValue memberName with
+        | true, docmember -> TryGetXmlDocMemberResult.Some docmember
+        | false, _ -> TryGetXmlDocMemberResult.None
       | _ -> TryGetXmlDocMemberResult.None
 
     | FSharpXmlDoc.None -> TryGetXmlDocMemberResult.None

src/FsAutoComplete.Core/TipFormatter.fsi

@@ -37,6 +37,7 @@ module private Format =
   type private Term = string
   type private Definition = string
 
+  [<Struct>]
   type private ListStyle =
     | Bulleted
     | Numbered
@@ -55,7 +56,7 @@ module private Format =
 
   val applyAll: text: string -> string
 
-[<RequireQualifiedAccess>]
+[<RequireQualifiedAccess; Struct>]
 type FormatCommentStyle =
   | Legacy
   | FullEnhanced

src/FsAutoComplete.Core/TypedAstUtils.fs

@@ -82,7 +82,7 @@ module TypedAstExtensionHelpers =
         match fullName with
         | Some fullName ->
           match Option.attempt (fun _ -> x.DisplayName) with
-          | Some shortDisplayName when not (shortDisplayName.Contains ".") ->
+          | Some shortDisplayName when not (shortDisplayName.Contains '.') ->
             Some(fullName |> Array.replace (fullName.Length - 1) shortDisplayName)
           | _ -> Some fullName
         | None -> None
@@ -171,7 +171,7 @@ module TypedAstExtensionHelpers =
       match fullName with
       | Some fullName ->
         match Option.attempt (fun _ -> x.DisplayName) with
-        | Some shortDisplayName when not (shortDisplayName.Contains ".") ->
+        | Some shortDisplayName when not (shortDisplayName.Contains '.') ->
           Some(fullName |> Array.replace (fullName.Length - 1) shortDisplayName)
         | _ -> Some fullName
       | None -> None

src/FsAutoComplete.Core/Utils.fs

@@ -886,16 +886,19 @@ module Tracing =
         let activity =
           activitySource.StartActivity(ActivityKind.Server, name = request.Method, tags = tags)
 
-        if activity <> null then
+        if not (isNull activity) then
           activity.TraceStateString <- request.TraceState
 
-          if request.TraceParent <> null then
+          if not (isNull request.TraceParent) then
             activity.SetParentId(request.TraceParent) |> ignore
 
         activity
 
       member this.ApplyOutboundActivity(request: Protocol.JsonRpcRequest) : unit =
-        if Activity.Current <> null && Activity.Current.IdFormat = ActivityIdFormat.W3C then
+        if
+          not (isNull Activity.Current)
+          && Activity.Current.IdFormat = ActivityIdFormat.W3C
+        then
           request.TraceParent <- Activity.Current.Id
           request.TraceState <- Activity.Current.TraceStateString