Defer getting all entities as much as possible (dotnet#2072)

xamarin · Dec 22, 2016 · 9ae2d6c · 9ae2d6c
1 parent 5d2082b
commit 9ae2d6c
Showing 1 changed file with 4 additions and 8 deletions.
diff --git a/CodeFix/AddOpenCodeFixProvider.fs b/CodeFix/AddOpenCodeFixProvider.fs
@@ -176,8 +176,7 @@ type internal FSharpAddOpenCodeFixProvider
                 match parseResults.ParseTree, checkFileAnswer with
                 | None, _
                 | _, FSharpCheckFileAnswer.Aborted -> ()
-                | Some parsedInput, FSharpCheckFileAnswer.Succeeded(checkFileResults) ->
-                    let entities = assemblyContentProvider.GetAllEntitiesInProjectAndReferencedAssemblies checkFileResults
+                | Some parsedInput, FSharpCheckFileAnswer.Succeeded checkFileResults ->
                     let textLinePos = sourceText.Lines.GetLinePosition context.Span.Start
                     let defines = CompilerEnvironment.GetCompilationDefinesForEditing(context.Document.FilePath, options.OtherOptions |> Seq.toList)
                     let symbol = CommonHelpers.getSymbolAtPosition(context.Document.Id, sourceText, context.Span.Start, context.Document.FilePath, defines, SymbolLookupKind.Fuzzy)
@@ -188,20 +187,17 @@ type internal FSharpAddOpenCodeFixProvider
                         | None -> ()
                         | Some entityKind ->
                             let isAttribute = entityKind = EntityKind.Attribute
-
                             let entities =
-                                entities |> List.filter (fun e ->
+                                assemblyContentProvider.GetAllEntitiesInProjectAndReferencedAssemblies checkFileResults
+                                |> List.filter (fun e ->
                                     match entityKind, e.Kind with
                                     | EntityKind.Attribute, EntityKind.Attribute 
                                     | EntityKind.Type, (EntityKind.Type | EntityKind.Attribute)
                                     | EntityKind.FunctionOrValue _, _ -> true 
                                     | EntityKind.Attribute, _
                                     | _, EntityKind.Module _
                                     | EntityKind.Module _, _
-                                    | EntityKind.Type, _ -> false)
-
-                            let entities = 
-                                entities
+                                    | EntityKind.Type, _ -> false)                            
                                 |> List.map (fun e -> 
                                      [ yield e.TopRequireQualifiedAccessParent, e.AutoOpenParent, e.Namespace, e.CleanedIdents
                                        if isAttribute then