Optimize completion

src/fsharp/service/ServiceAssemblyContent.fs

@@ -111,7 +111,8 @@ type AssemblySymbol =
       TopRequireQualifiedAccessParent: Idents option
       AutoOpenParent: Idents option
       Symbol: FSharpSymbol
-      Kind: LookupType -> EntityKind }
+      Kind: LookupType -> EntityKind
+      UnresolvedSymbol: UnresolvedSymbol }
     override x.ToString() = sprintf "%A" x  
 
 type AssemblyPath = string
@@ -186,14 +187,30 @@ type IAssemblyContentCache =
 module AssemblyContentProvider =
     open System.IO
 
-    let private createEntity ns (parent: Parent) (entity: FSharpEntity) =
+    let unresolvedSymbol (topRequireQualifiedAccessParent: Idents option) (cleanedIdents: Idents) =
+        let getNamespace (idents: Idents) = 
+            if idents.Length > 1 then Some idents.[..idents.Length - 2] else None
+
+        let ns = 
+            topRequireQualifiedAccessParent 
+            |> Option.bind getNamespace 
+            |> Option.orElseWith (fun () -> getNamespace cleanedIdents)
+            |> Option.defaultValue [||]
+
+        let displayName = cleanedIdents |> Array.skip ns.Length |> String.concat "."
+
+        { DisplayName = displayName
+          Namespace = ns }
+
+    let createEntity ns (parent: Parent) (entity: FSharpEntity) =
         parent.FormatEntityFullName entity
         |> Option.map (fun (fullName, cleanIdents) ->
+            let topRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess false |> Option.map parent.FixParentModuleSuffix
             { FullName = fullName
               CleanedIdents = cleanIdents
               Namespace = ns
               NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess false |> Option.map parent.FixParentModuleSuffix
-              TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess false |> Option.map parent.FixParentModuleSuffix
+              TopRequireQualifiedAccessParent = topRequireQualifiedAccessParent
               AutoOpenParent = parent.AutoOpen |> Option.map parent.FixParentModuleSuffix
               Symbol = entity
               Kind = fun lookupType ->
@@ -208,21 +225,25 @@ module AssemblyContentProvider =
                     match entity with
                     | Symbol.Attribute -> EntityKind.Attribute 
                     | _ -> EntityKind.Type
+              UnresolvedSymbol = unresolvedSymbol topRequireQualifiedAccessParent cleanIdents
             })
 
-    let private traverseMemberFunctionAndValues ns (parent: Parent) (membersFunctionsAndValues: seq<FSharpMemberOrFunctionOrValue>) =
+    let traverseMemberFunctionAndValues ns (parent: Parent) (membersFunctionsAndValues: seq<FSharpMemberOrFunctionOrValue>) =
         membersFunctionsAndValues
         |> Seq.filter (fun x -> not x.IsInstanceMember && not x.IsPropertyGetterMethod && not x.IsPropertySetterMethod)
         |> Seq.collect (fun func ->
             let processIdents fullName idents = 
+                let topRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess true |> Option.map parent.FixParentModuleSuffix
+                let cleanedIdentes = parent.FixParentModuleSuffix idents
                 { FullName = fullName
-                  CleanedIdents = parent.FixParentModuleSuffix idents
+                  CleanedIdents = cleanedIdentes
                   Namespace = ns
                   NearestRequireQualifiedAccessParent = parent.ThisRequiresQualifiedAccess true |> Option.map parent.FixParentModuleSuffix
-                  TopRequireQualifiedAccessParent = parent.TopRequiresQualifiedAccess true |> Option.map parent.FixParentModuleSuffix
+                  TopRequireQualifiedAccessParent = topRequireQualifiedAccessParent
                   AutoOpenParent = parent.AutoOpen |> Option.map parent.FixParentModuleSuffix
                   Symbol = func
-                  Kind = fun _ -> EntityKind.FunctionOrValue func.IsActivePattern }
+                  Kind = fun _ -> EntityKind.FunctionOrValue func.IsActivePattern
+                  UnresolvedSymbol = unresolvedSymbol topRequireQualifiedAccessParent cleanedIdentes }
 
             [ yield! func.TryGetFullDisplayName() 
                      |> Option.map (fun fullDisplayName -> processIdents func.FullName (fullDisplayName.Split '.'))
@@ -241,7 +262,7 @@ module AssemblyContentProvider =
                           processIdents (fullCompiledIdents |> String.concat ".") fullCompiledIdents)
                      |> Option.toList ])
 
-    let rec private traverseEntity contentType (parent: Parent) (entity: FSharpEntity) = 
+    let rec traverseEntity contentType (parent: Parent) (entity: FSharpEntity) = 
 
         seq { 
 #if !NO_EXTENSIONTYPING 
@@ -308,7 +329,7 @@ module AssemblyContentProvider =
         |> Seq.distinctBy (fun {FullName = fullName; CleanedIdents = cleanIdents} -> (fullName, cleanIdents))
         |> Seq.toList
 
-    let private getAssemblySignaturesContent contentType (assemblies: FSharpAssembly list) = 
+    let getAssemblySignaturesContent contentType (assemblies: FSharpAssembly list) = 
         assemblies |> List.collect (fun asm -> getAssemblySignatureContent contentType asm.Contents)
 
     let getAssemblyContent (withCache: (IAssemblyContentCache -> _) -> _) contentType (fileName: string option) (assemblies: FSharpAssembly list) =

src/fsharp/service/ServiceAssemblyContent.fsi

@@ -57,7 +57,9 @@ type public AssemblySymbol =
       AutoOpenParent: Idents option
       Symbol: FSharpSymbol
       /// Function that returns `EntityKind` based of given `LookupKind`.
-      Kind: LookupType -> EntityKind }
+      Kind: LookupType -> EntityKind
+      /// Cache display name and namespace, used for completion.
+      UnresolvedSymbol: UnresolvedSymbol }
 
 /// `RawEntity` list retrieved from an assembly.
 type internal AssemblyContentCacheEntry =

src/fsharp/service/ServiceDeclarationLists.fs

@@ -548,6 +548,8 @@ type FSharpDeclarationListItem(name: string, nameInCode: string, fullName: strin
 /// A table of declarations for Intellisense completion 
 [<Sealed>]
 type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForType: bool, isError: bool) = 
+    static let fsharpNamespace = [|"Microsoft"; "FSharp"|]
+
     member __.Items = declarations
     member __.IsForType = isForType
     member __.IsError = isError
@@ -650,22 +652,24 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForT
                             | Some _ -> displayName
                             | None -> Lexhelp.Keywords.QuoteIdentifierIfNeeded displayName
 
-                    let isAttribute = SymbolHelpers.IsAttribute infoReader item.Item
-
                     let cutAttributeSuffix (name: string) =
-                        if isAttributeApplicationContext && isAttribute && name <> "Attribute" && name.EndsWith "Attribute" then
+                        if isAttributeApplicationContext && name <> "Attribute" && name.EndsWith "Attribute" && SymbolHelpers.IsAttribute infoReader item.Item then
                             name.[0..name.Length - "Attribute".Length - 1]
                         else name
 
                     let name = cutAttributeSuffix name
                     let nameInCode = cutAttributeSuffix nameInCode
-                    let fullName = SymbolHelpers.FullNameOfItem g item.Item
+
+                    let fullName = 
+                        match item.FullName with
+                        | Some x -> x
+                        | None -> SymbolHelpers.FullNameOfItem g item.Item
 
                     let namespaceToOpen = 
                         item.Unresolved 
                         |> Option.map (fun x -> x.Namespace)
                         |> Option.bind (fun ns ->
-                            if ns |> Array.startsWith [|"Microsoft"; "FSharp"|] then None
+                            if ns |> Array.startsWith fsharpNamespace then None
                             else Some ns)
                         |> Option.map (fun ns ->
                             match currentNamespaceOrModule with
@@ -676,7 +680,7 @@ type FSharpDeclarationListInfo(declarations: FSharpDeclarationListItem[], isForT
                             | None -> ns)
                         |> Option.bind (function
                             | [||] -> None
-                            | ns -> Some (ns |> String.concat "."))
+                            | ns -> Some (System.String.Join(".", ns)))
 
                     FSharpDeclarationListItem(
                         name, nameInCode, fullName, glyph, Choice1Of2 (items, infoReader, m, denv, reactor, checkAlive), getAccessibility item.Item, 

src/fsharp/service/service.fs

@@ -579,24 +579,10 @@ type TypeCheckInfo
             | Item.Value _ -> CompletionItemKind.Field
             | _ -> CompletionItemKind.Other
 
-        let getNamespace (idents: Idents) = 
-            if idents.Length > 1 then Some idents.[..idents.Length - 2] else None
-
-        let unresolved =
-            unresolvedEntity
-            |> Option.map (fun x ->
-                let ns = 
-                    x.TopRequireQualifiedAccessParent 
-                    |> Option.bind getNamespace 
-                    |> Option.orElseWith (fun () -> getNamespace x.CleanedIdents)
-                    |> Option.defaultValue [||]
-
-                let displayName = x.CleanedIdents |> Array.skip ns.Length |> String.concat "."
-
-                { DisplayName = displayName
-                  Namespace = ns })
+
 
-        { ItemWithInst = item
+        { FullName = unresolvedEntity |> Option.map (fun x -> x.FullName)
+          ItemWithInst = item
           MinorPriority = 0
           Kind = kind
           IsOwnMember = false
@@ -859,7 +845,8 @@ type TypeCheckInfo
                         |> RemoveExplicitlySuppressed g
                         |> List.filter (fun item -> not (fields.Contains item.Item.DisplayName))
                         |> List.map (fun item -> 
-                            { ItemWithInst = item
+                            { FullName = None
+                              ItemWithInst = item
                               Kind = CompletionItemKind.Argument
                               MinorPriority = 0
                               IsOwnMember = false

src/fsharp/symbols/SymbolHelpers.fs

@@ -282,7 +282,8 @@ type UnresolvedSymbol =
       Namespace: string[] }
 
 type CompletionItem =
-    { ItemWithInst: ItemWithInst
+    { FullName: string option
+      ItemWithInst: ItemWithInst
       Kind: CompletionItemKind
       IsOwnMember: bool
       MinorPriority: int
@@ -827,10 +828,11 @@ module internal SymbolHelpers =
          | Item.Types(it, [ty]) -> 
              g.suppressed_types 
              |> List.exists (fun supp -> 
-                if isAppTy g ty && isAppTy g (generalizedTyconRef supp) then 
+                let generalizedSupp = generalizedTyconRef supp
+                if isAppTy g ty && isAppTy g generalizedSupp then 
                   // check if they are the same logical type (after removing all abbreviations)
                   let tcr1 = tcrefOfAppTy g ty
-                  let tcr2 = tcrefOfAppTy g (generalizedTyconRef supp) 
+                  let tcr2 = tcrefOfAppTy g generalizedSupp
                   tyconRefEq g tcr1 tcr2 && 
                   // check the display name is precisely the one we're suppressing
                   it = supp.DisplayName

src/fsharp/symbols/SymbolHelpers.fsi

@@ -115,12 +115,13 @@ type public CompletionItemKind =
     | Argument
     | Other
 
-type internal UnresolvedSymbol =
+type UnresolvedSymbol =
     { DisplayName: string
       Namespace: string[] }
 
 type internal CompletionItem =
-    { ItemWithInst: ItemWithInst
+    { FullName: string option
+      ItemWithInst: ItemWithInst
       Kind: CompletionItemKind
       IsOwnMember: bool
       MinorPriority: int