diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 146c46e4fb..4975c1cf16 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "fantomas-tool": { - "version": "4.5.0-beta-001", + "version": "4.5.0-beta-002", "commands": [ "fantomas" ] diff --git a/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs b/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs index 36e6be1e12..98c8d9f71e 100644 --- a/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs +++ b/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs @@ -38,7 +38,7 @@ type TemporaryFileCodeSample else File.WriteAllText(filename, codeSnippet)) - member _.Filename : string = filename + member _.Filename: string = filename interface IDisposable with member this.Dispose() : unit = @@ -54,7 +54,7 @@ type OutputFile internal () = let filename = Path.Join(Path.GetTempPath(), Guid.NewGuid().ToString() + ".fs") - member _.Filename : string = filename + member _.Filename: string = filename interface IDisposable with member this.Dispose() : unit = @@ -66,7 +66,7 @@ type ConfigurationFile internal (content: string) = Path.Join(Path.GetTempPath(), ".editorconfig") do File.WriteAllText(filename, content) - member _.Filename : string = filename + member _.Filename: string = filename interface IDisposable with member this.Dispose() : unit = @@ -78,7 +78,7 @@ type FantomasIgnoreFile internal (content: string) = Path.Join(Path.GetTempPath(), IgnoreFile.IgnoreFileName) do File.WriteAllText(filename, content) - member _.Filename : string = filename + member _.Filename: string = filename interface IDisposable with member this.Dispose() : unit = diff --git a/src/Fantomas.Extras/EditorConfig.fs b/src/Fantomas.Extras/EditorConfig.fs index ac3c4fc838..4418152bd7 100644 --- a/src/Fantomas.Extras/EditorConfig.fs +++ b/src/Fantomas.Extras/EditorConfig.fs @@ -88,7 +88,7 @@ let configToEditorConfig (config: FormatConfig) : string = let private editorConfigParser = EditorConfig.Core.EditorConfigParser() let tryReadConfiguration (fsharpFile: string) : FormatConfig option = - let editorConfigSettings : EditorConfig.Core.FileConfiguration = + let editorConfigSettings: EditorConfig.Core.FileConfiguration = editorConfigParser.Parse(fileName = fsharpFile) if editorConfigSettings.Properties.Count = 0 then diff --git a/src/Fantomas.Tests/FormatConfigEditorConfigurationFileTests.fs b/src/Fantomas.Tests/FormatConfigEditorConfigurationFileTests.fs index d28db07369..875de2a5eb 100644 --- a/src/Fantomas.Tests/FormatConfigEditorConfigurationFileTests.fs +++ b/src/Fantomas.Tests/FormatConfigEditorConfigurationFileTests.fs @@ -86,7 +86,7 @@ type FSharpFile internal (rootFolderName: string, ?fsharpFileExtension: string, do File.WriteAllText(fsharpFilePath, String.empty) - member __.FSharpFile : string = fsharpFilePath + member __.FSharpFile: string = fsharpFilePath interface IDisposable with member this.Dispose() : unit = diff --git a/src/Fantomas.Tests/TestHelpers.fs b/src/Fantomas.Tests/TestHelpers.fs index 46f60e8c2f..09b63ea6a7 100644 --- a/src/Fantomas.Tests/TestHelpers.fs +++ b/src/Fantomas.Tests/TestHelpers.fs @@ -320,7 +320,7 @@ type TemporaryFileCodeSample internal (codeSnippet: string) = do File.WriteAllText(filename, codeSnippet) - member __.Filename : string = filename + member __.Filename: string = filename interface IDisposable with member this.Dispose() : unit = File.Delete(filename) diff --git a/src/Fantomas.Tests/TokenParserTests.fs b/src/Fantomas.Tests/TokenParserTests.fs index b25a9b6246..97b4452e9f 100644 --- a/src/Fantomas.Tests/TokenParserTests.fs +++ b/src/Fantomas.Tests/TokenParserTests.fs @@ -19,7 +19,7 @@ let private getDefines v = let private tokenize v = tokenize [] [] v -let private mkRange : MkRange = +let private mkRange: MkRange = fun (sl, sc) (el, ec) -> FSharp.Compiler.Text.Range.mkRange "TokenParserTests" diff --git a/src/Fantomas/AstExtensions.fs b/src/Fantomas/AstExtensions.fs index a534a39904..b88b847228 100644 --- a/src/Fantomas/AstExtensions.fs +++ b/src/Fantomas/AstExtensions.fs @@ -6,7 +6,7 @@ open FSharp.Compiler.Text.Range type SynTypeDefnSig with /// Combines the range of type name and the body. - member this.FullRange : Range = + member this.FullRange: Range = match this with | SynTypeDefnSig.TypeDefnSig (comp, _, _, r) -> mkRange r.FileName comp.Range.Start r.End diff --git a/src/Fantomas/AstTransformer.fs b/src/Fantomas/AstTransformer.fs index 33aa2b6f39..9ca8c1cbd7 100644 --- a/src/Fantomas/AstTransformer.fs +++ b/src/Fantomas/AstTransformer.fs @@ -36,7 +36,7 @@ module private Ast = [ mkNode SynModuleDecl_ModuleAbbrev range ] |> finalContinuation | SynModuleDecl.NestedModule (sci, _, decls, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = decls |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -100,7 +100,7 @@ module private Ast = mkNode SynExpr_Paren range :: nodes |> finalContinuation) | SynExpr.Quote (operator, _, quotedSynExpr, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit operator; visit quotedSynExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -116,7 +116,7 @@ module private Ast = | SynExpr.Typed (expr, typeName, _) -> visit expr (fun nodes -> nodes @ visitSynType typeName |> finalContinuation) | SynExpr.Tuple (_, exprs, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = exprs |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -126,7 +126,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.ArrayOrList (_, exprs, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = exprs |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -160,7 +160,7 @@ module private Ast = yield! bindings |> List.collect visitSynBinding ] |> finalContinuation | SynExpr.While (_, whileExpr, doExpr, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit whileExpr; visit doExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -170,7 +170,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.For (_, _, identBody, _, toBody, doBody, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit identBody visit toBody visit doBody ] @@ -182,7 +182,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.ForEach (_, SeqExprOnly _, _, pat, enumExpr, bodyExpr, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit enumExpr; visit bodyExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -232,7 +232,7 @@ module private Ast = mkNode SynExpr_Assert range :: nodes |> finalContinuation) | SynExpr.App (_, _, funcExpr, argExpr, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit funcExpr; visit argExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -265,7 +265,7 @@ module private Ast = yield! withCases |> List.collect visitSynMatchClause ] |> finalContinuation) | SynExpr.TryFinally (tryExpr, finallyExpr, range, _, _) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit tryExpr; visit finallyExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -283,7 +283,7 @@ module private Ast = | SynExpr.Sequential (_, _, expr1, expr2, _) -> visit expr2 (fun nodes1 -> visit expr1 (fun nodes2 -> nodes1 @ nodes2 |> finalContinuation)) | SynExpr.SequentialOrImplicitYield (_, expr1, expr2, ifNotStmt, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit expr1 visit expr2 visit ifNotStmt ] @@ -301,7 +301,7 @@ module private Ast = es |> List.collect (fun (e1, e2, _, _, _) -> [ visit e1; visit e2 ]) - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ yield visit ifExpr yield visit thenExpr yield! elifs @@ -315,7 +315,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.IfThenElse (ifExpr, thenExpr, elseExpr, _, _, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ yield visit ifExpr yield visit thenExpr yield! (Option.toList elseExpr |> List.map visit) ] @@ -350,7 +350,7 @@ module private Ast = yield! (visitLongIdentWithDots longDotId) ] |> finalContinuation) | SynExpr.DotSet (expr, _, e2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit expr; visit e2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -360,7 +360,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.Set (e1, e2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit e1; visit e2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -378,7 +378,7 @@ module private Ast = yield! indexExprs |> List.collect visitSynIndexerArg ] |> finalContinuation) | SynExpr.DotIndexedSet (objectExpr, indexExprs, valueExpr, _, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit objectExpr; visit valueExpr ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -389,7 +389,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.NamedIndexedPropertySet (_, e1, e2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit e1; visit e2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -399,7 +399,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynExpr.DotNamedIndexedPropertySet (expr, _, e1, e2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit expr; visit e1; visit e2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -464,7 +464,7 @@ module private Ast = yield! nodes ] |> finalContinuation) | SynExpr.JoinIn (expr, _, expr2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit expr; visit expr2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -490,7 +490,7 @@ module private Ast = mkNode SynExpr_YieldOrReturnFrom range :: nodes |> finalContinuation) | SynExpr.LetOrUseBang (_, _, _, pat, rhsExpr, andBangs, body, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ yield visit rhsExpr yield visit body yield! (List.map (fun (_, _, _, _, body, _) -> visit body) andBangs) ] @@ -535,7 +535,7 @@ module private Ast = :: nodes |> finalContinuation) | SynExpr.LibraryOnlyUnionCaseFieldSet (e1, _, _, e2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit e1; visit e2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -850,7 +850,7 @@ module private Ast = yield! (visitSynAttributeLists range attrs) ] |> finalContinuation) | SynPat.Or (synPat, synPat2, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit synPat; visit synPat2 ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -859,7 +859,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynPat.Ands (pats, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = pats |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -875,7 +875,7 @@ module private Ast = yield! visitSynConstructorArgs ctorArgs ] |> finalContinuation | SynPat.Tuple (_, pats, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = pats |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -891,7 +891,7 @@ module private Ast = mkNode SynPat_Paren range :: nodes |> finalContinuation) | SynPat.ArrayOrList (_, pats, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = pats |> List.map visit let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -901,7 +901,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynPat.Record (pats, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = pats |> List.map (snd >> visit) let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -1076,7 +1076,7 @@ module private Ast = match st with | SynType.LongIdent li -> visitLongIdentWithDots li |> finalContinuation | SynType.App (typeName, _, typeArgs, _, _, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ yield! (List.map visit typeArgs) yield visit typeName ] @@ -1087,7 +1087,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynType.LongIdentApp (typeName, _, _, typeArgs, _, _, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ yield! (List.map visit typeArgs) yield visit typeName ] @@ -1098,7 +1098,7 @@ module private Ast = Continuation.sequence continuations finalContinuation | SynType.Tuple (_, typeNames, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = List.map (snd >> visit) typeNames let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -1114,7 +1114,7 @@ module private Ast = mkNode SynType_Array range :: nodes |> finalContinuation) | SynType.Fun (argType, returnType, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit argType; visit returnType ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -1145,7 +1145,7 @@ module private Ast = mkNode SynType_HashConstraint range :: nodes |> finalContinuation) | SynType.MeasureDivide (dividendType, divisorType, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit dividendType visit divisorType ] @@ -1170,7 +1170,7 @@ module private Ast = :: (visitSynExpr expr) |> finalContinuation | SynType.StaticConstantNamed (expr, typ, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = [ visit expr; visit typ ] let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = @@ -1268,7 +1268,7 @@ module private Ast = |> List.singleton |> finalContinuation | SynModuleSigDecl.NestedModule (sci, _, decls, range) -> - let continuations : ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = + let continuations: ((TriviaNodeAssigner list -> TriviaNodeAssigner list) -> TriviaNodeAssigner list) list = List.map visit decls let finalContinuation (nodes: TriviaNodeAssigner list list) : TriviaNodeAssigner list = diff --git a/src/Fantomas/Context.fs b/src/Fantomas/Context.fs index 9ff57d4363..46333fec70 100644 --- a/src/Fantomas/Context.fs +++ b/src/Fantomas/Context.fs @@ -1031,7 +1031,7 @@ let internal futureNlnCheckMem (f, ctx) = (false, false) else // Create a dummy context to evaluate length of current operation - let dummyCtx : Context = + let dummyCtx: Context = ctx.WithDummy(Queue.empty, keepPageWidth = true) |> f @@ -1044,11 +1044,11 @@ let internal futureNlnCheck f (ctx: Context) = /// similar to futureNlnCheck but validates whether the expression is going over the max page width /// This functions is does not use any caching let internal exceedsWidth maxWidth f (ctx: Context) = - let dummyCtx : Context = + let dummyCtx: Context = ctx.WithDummy(Queue.empty, keepPageWidth = true) let currentColumn = dummyCtx.Column - let ctxAfter : Context = f dummyCtx + let ctxAfter: Context = f dummyCtx (ctxAfter.Column - currentColumn) > maxWidth /// Similar to col, skip auto newline for index 0 @@ -1371,7 +1371,7 @@ let internal sepNlnTypeAndMembers (mainNodeType: FsAstType) (ctx: Context) : Context = - let triviaNodeOfWithKeyword : TriviaNode option = + let triviaNodeOfWithKeyword: TriviaNode option = let r = ctx.MkRange lastPositionBeforeMembers firstMemberRange.Start diff --git a/src/Fantomas/SourceParser.fs b/src/Fantomas/SourceParser.fs index 11f88db93a..584cc85f3d 100644 --- a/src/Fantomas/SourceParser.fs +++ b/src/Fantomas/SourceParser.fs @@ -27,7 +27,7 @@ type Composite<'a, 'b> = let MaxLength = 512 [] -let private MangledGlobalName : string = "`global`" +let private MangledGlobalName: string = "`global`" let (|Ident|) (s: Ident) = let ident = s.idText diff --git a/src/Fantomas/TokenParser.fs b/src/Fantomas/TokenParser.fs index 45d993196e..48078e3548 100644 --- a/src/Fantomas/TokenParser.fs +++ b/src/Fantomas/TokenParser.fs @@ -52,7 +52,7 @@ let rec private tokenizeLine (tokenizer: FSharpLineTokenizer) sourceCodeLines st tokenizeLine tokenizer sourceCodeLines state lineNumber (token :: extraToken :: tokens) | (Some tok, state), _ -> - let token : Token = + let token: Token = { TokenInfo = tok LineNumber = lineNumber Content = getTokenText sourceCodeLines lineNumber tok }