From 17d120bff92feeb53f24ae17127de260434e9ad7 Mon Sep 17 00:00:00 2001
From: Phillip Carter <pcarter@fastmail.com>
Date: Thu, 5 Nov 2020 19:23:08 -0800
Subject: [PATCH] Sequentialize GetAllUsesOfAllSymolsInFile (#10357)

---
 CodeFix/SimplifyName.fs                       | 3 ---
 Common/Extensions.fs                          | 4 +++-
 Diagnostics/SimplifyNameDiagnosticAnalyzer.fs | 7 +------
 Diagnostics/UnusedDeclarationsAnalyzer.fs     | 2 +-
 Diagnostics/UnusedOpensDiagnosticAnalyzer.fs  | 7 -------
 5 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/CodeFix/SimplifyName.fs b/CodeFix/SimplifyName.fs
index a2768640387..4656ce1c42b 100644
--- a/CodeFix/SimplifyName.fs
+++ b/CodeFix/SimplifyName.fs
@@ -6,12 +6,9 @@ open System.Composition
 open System.Collections.Immutable
 open System.Threading.Tasks
 
-open Microsoft.CodeAnalysis
-open Microsoft.CodeAnalysis.Diagnostics
 open Microsoft.CodeAnalysis.Text
 open Microsoft.CodeAnalysis.CodeFixes
 open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics
-open SymbolHelpers
 
 [<ExportCodeFixProvider(FSharpConstants.FSharpLanguageName, Name = "SimplifyNames"); Shared>]
 type internal FSharpSimplifyNameCodeFixProvider() =
diff --git a/Common/Extensions.fs b/Common/Extensions.fs
index 86484f79739..a68ce44a226 100644
--- a/Common/Extensions.fs
+++ b/Common/Extensions.fs
@@ -5,6 +5,7 @@ module internal Microsoft.VisualStudio.FSharp.Editor.Extensions
 
 open System
 open System.IO
+open System.Collections.Immutable
 
 open Microsoft.CodeAnalysis
 open Microsoft.CodeAnalysis.Text
@@ -243,7 +244,6 @@ module Option =
 
 [<RequireQualifiedAccess>]
 module Seq =
-    open System.Collections.Immutable
 
     let toImmutableArray (xs: seq<'a>) : ImmutableArray<'a> = xs.ToImmutableArray()
 
@@ -257,6 +257,8 @@ module Array =
             i <- i + 1
         state
 
+    let toImmutableArray (xs: 'T[]) = xs.ToImmutableArray()
+
 [<RequireQualifiedAccess>]
 module Exception =
 
diff --git a/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs b/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs
index e888ccdc7ce..43641cc957b 100644
--- a/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs
+++ b/Diagnostics/SimplifyNameDiagnosticAnalyzer.fs
@@ -7,18 +7,13 @@ open System.Composition
 open System.Collections.Immutable
 open System.Diagnostics
 open System.Threading
-open System.Threading.Tasks
 
 open Microsoft.CodeAnalysis
-open Microsoft.CodeAnalysis.Diagnostics
-open FSharp.Compiler
 open FSharp.Compiler.Range
 open System.Runtime.Caching
-open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics
 open FSharp.Compiler.SourceCodeServices
 
-type private TextVersionHash = int
 type private PerDocumentSavedData = { Hash: int; Diagnostics: ImmutableArray<Diagnostic> }
 
 [<Export(typeof<IFSharpSimplifyNameDiagnosticAnalyzer>)>]
@@ -36,7 +31,7 @@ type internal SimplifyNameDiagnosticAnalyzer [<ImportingConstructor>] () =
 
     interface IFSharpSimplifyNameDiagnosticAnalyzer with
 
-        member this.AnalyzeSemanticsAsync(descriptor, document: Document, cancellationToken: CancellationToken) =
+        member _.AnalyzeSemanticsAsync(descriptor, document: Document, cancellationToken: CancellationToken) =
             asyncMaybe {
                 do! Option.guard document.FSharpOptions.CodeFixes.SimplifyName
                 do Trace.TraceInformation("{0:n3} (start) SimplifyName", DateTime.Now.TimeOfDay.TotalSeconds)
diff --git a/Diagnostics/UnusedDeclarationsAnalyzer.fs b/Diagnostics/UnusedDeclarationsAnalyzer.fs
index 66c0a60e452..62b556cb0bb 100644
--- a/Diagnostics/UnusedDeclarationsAnalyzer.fs
+++ b/Diagnostics/UnusedDeclarationsAnalyzer.fs
@@ -25,7 +25,7 @@ type internal UnusedDeclarationsAnalyzer [<ImportingConstructor>] () =
 
     interface IFSharpUnusedDeclarationsDiagnosticAnalyzer with
 
-        member __.AnalyzeSemanticsAsync(descriptor, document, cancellationToken) =
+        member _.AnalyzeSemanticsAsync(descriptor, document, cancellationToken) =
             asyncMaybe {
                 do! Option.guard document.FSharpOptions.CodeFixes.UnusedDeclarations
 
diff --git a/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs b/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs
index f9e4d917c2d..a16a66e43eb 100644
--- a/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs
+++ b/Diagnostics/UnusedOpensDiagnosticAnalyzer.fs
@@ -7,19 +7,12 @@ open System.Composition
 open System.Collections.Immutable
 open System.Diagnostics
 open System.Threading
-open System.Threading.Tasks
 
 open Microsoft.CodeAnalysis
-open Microsoft.CodeAnalysis.Text
-open Microsoft.CodeAnalysis.Diagnostics
 
-open FSharp.Compiler
 open FSharp.Compiler.Range
 open FSharp.Compiler.SourceCodeServices
-open FSharp.Compiler.SyntaxTree
 
-open Microsoft.VisualStudio.FSharp.Editor.Symbols
-open Microsoft.CodeAnalysis.Host.Mef
 open Microsoft.CodeAnalysis.ExternalAccess.FSharp.Diagnostics
 
 [<Export(typeof<IFSharpUnusedOpensDiagnosticAnalyzer>)>]