From d73298347f0873d91157ae2a35c93191d080721e Mon Sep 17 00:00:00 2001 From: nojaf Date: Mon, 18 Mar 2024 10:23:41 +0100 Subject: [PATCH] Bump fantomas tool to 6.3.0 --- .config/dotnet-tools.json | 2 +- src/Fantomas.Client/LSPFantomasService.fs | 12 ++++-------- src/Fantomas.Core/SyntaxOak.fs | 4 +--- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9e2b41df29..b843844031 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -9,7 +9,7 @@ ] }, "fantomas": { - "version": "6.2.0", + "version": "6.3.0", "commands": [ "fantomas" ] diff --git a/src/Fantomas.Client/LSPFantomasService.fs b/src/Fantomas.Client/LSPFantomasService.fs index 096d4cfa37..d585e2a3af 100644 --- a/src/Fantomas.Client/LSPFantomasService.fs +++ b/src/Fantomas.Client/LSPFantomasService.fs @@ -362,10 +362,8 @@ type LSPFantomasService() = |> mapResultToResponse filePath member _.FormatDocumentAsync - ( - formatDocumentOptions: FormatDocumentRequest, - ?cancellationToken: CancellationToken - ) : Task = + (formatDocumentOptions: FormatDocumentRequest, ?cancellationToken: CancellationToken) + : Task = isCancellationRequested cts.IsCancellationRequested |> Result.bind (getFolderFor formatDocumentOptions.FilePath) |> Result.bind (getDaemon agent) @@ -380,10 +378,8 @@ type LSPFantomasService() = |> mapResultToResponse formatDocumentOptions.FilePath member _.FormatSelectionAsync - ( - formatSelectionRequest: FormatSelectionRequest, - ?cancellationToken: CancellationToken - ) = + (formatSelectionRequest: FormatSelectionRequest, ?cancellationToken: CancellationToken) + = isCancellationRequested cts.IsCancellationRequested |> Result.bind (getFolderFor formatSelectionRequest.FilePath) |> Result.bind (getDaemon agent) diff --git a/src/Fantomas.Core/SyntaxOak.fs b/src/Fantomas.Core/SyntaxOak.fs index 1cbc77d52e..a592fc74e6 100644 --- a/src/Fantomas.Core/SyntaxOak.fs +++ b/src/Fantomas.Core/SyntaxOak.fs @@ -1154,9 +1154,7 @@ type ExprPrefixAppNode(operator: SingleTextNode, expr: Expr, range) = member val Operator = operator member val Expr = expr -type InfixApp = - interface - end +type InfixApp = interface end type ExprSameInfixAppsNode(leadingExpr: Expr, subsequentExpressions: (SingleTextNode * Expr) list, range) = inherit NodeBase(range)