use new methods that are in FCS to do walk (#1238)

ionide · Feb 19, 2024 · a5ad3c0 · a5ad3c0
1 parent 6f9cf86
commit a5ad3c0
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/FsAutoComplete/LspServers/AdaptiveServerState.fs b/src/FsAutoComplete/LspServers/AdaptiveServerState.fs
@@ -35,6 +35,7 @@ open System.Threading.Tasks
 open FsAutoComplete.FCSPatches
 open FsAutoComplete.Lsp
 open FsAutoComplete.Lsp.Helpers
+open FSharp.Compiler.Syntax
 
 
 [<RequireQualifiedAccess>]
@@ -354,7 +355,23 @@ type AdaptiveState(lspClient: FSharpLspClient, sourceTextFactory: ISourceTextFac
           use progress = new ServerProgressReport(lspClient)
           do! progress.Begin($"Checking for unnecessary parentheses {fileName}...", message = filePathUntag)
 
-          let! unnecessaryParentheses = UnnecessaryParentheses.getUnnecessaryParentheses getSourceLine tyRes.GetAST
+          let unnecessaryParentheses =
+            (System.Collections.Generic.HashSet(comparer = Range.comparer), tyRes.GetAST)
+            ||> ParsedInput.fold (fun ranges path node ->
+              match node with
+              | SyntaxNode.SynExpr(SynExpr.Paren(expr = inner; rightParenRange = Some _; range = range)) when
+                not (SynExpr.shouldBeParenthesizedInContext getSourceLine path inner)
+                ->
+                ignore (ranges.Add range)
+                ranges
+
+              | SyntaxNode.SynPat(SynPat.Paren(inner, range)) when
+                not (SynPat.shouldBeParenthesizedInContext path inner)
+                ->
+                ignore (ranges.Add range)
+                ranges
+
+              | _ -> ranges)
 
           let! ct = Async.CancellationToken
 
@@ -1594,8 +1611,6 @@ type AdaptiveState(lspClient: FSharpLspClient, sourceTextFactory: ISourceTextFac
     allFilesToDeclarations
     |> AMapAsync.tryFindAndFlattenR $"Could not find getDeclarations for {filename}" filename
 
-
-
   let codeGenServer =
     { new ICodeGenerationService with
         member x.TokenizeLine(file, i) =