fantomas bump

Author: baronfel

src/FsAutoComplete.Core/AbstractClassStubGenerator.fs

@@ -14,27 +14,27 @@ type AbstractClassData =
 
   member x.AbstractTypeIdentRange =
     match x with
-    | ObjExpr (baseTy, _, _)
-    | ExplicitImpl (baseTy, _, _) -> baseTy.Range
+    | ObjExpr(baseTy, _, _)
+    | ExplicitImpl(baseTy, _, _) -> baseTy.Range
 
   member x.TypeParameters =
     match x with
-    | ObjExpr (t, _, _)
-    | ExplicitImpl (t, _, _) -> expandTypeParameters t
+    | ObjExpr(t, _, _)
+    | ExplicitImpl(t, _, _) -> expandTypeParameters t
 
 /// checks to see if a type definition inherits an abstract class, and if so collects the members defined at that
-let private walkTypeDefn (SynTypeDefn (info, repr, members, implicitCtor, range, trivia)) =
+let private walkTypeDefn (SynTypeDefn(info, repr, members, implicitCtor, range, trivia)) =
   let reprMembers =
     match repr with
-    | SynTypeDefnRepr.ObjectModel (_, members, _) -> members
+    | SynTypeDefnRepr.ObjectModel(_, members, _) -> members
     | _ -> []
 
   let allMembers = reprMembers @ (Option.toList implicitCtor) @ members
 
   let inheritMember =
     allMembers
     |> List.tryPick (function
-      | SynMemberDefn.ImplicitInherit (inheritType, inheritArgs, alias, range) -> Some(inheritType)
+      | SynMemberDefn.ImplicitInherit(inheritType, inheritArgs, alias, range) -> Some(inheritType)
       | _ -> None)
 
   let otherMembers =
@@ -43,8 +43,8 @@ let private walkTypeDefn (SynTypeDefn (info, repr, members, implicitCtor, range,
     |> List.filter (function
       | SynMemberDefn.ImplicitCtor _
       | SynMemberDefn.ImplicitInherit _ -> false
-      | SynMemberDefn.Member (SynBinding(valData = SynValData (Some ({ MemberKind = SynMemberKind.Constructor }), _, _)),
-                              _) -> false
+      | SynMemberDefn.Member(SynBinding(valData = SynValData(Some({ MemberKind = SynMemberKind.Constructor }), _, _)), _) ->
+        false
       | _ -> true)
 
   match inheritMember with
@@ -68,13 +68,13 @@ let private tryFindAbstractClassExprInParsedInput
     { new SyntaxVisitorBase<_>() with
         member _.VisitExpr(path, traverseExpr, defaultTraverse, expr) =
           match expr with
-          | SynExpr.ObjExpr (baseTy, constructorArgs, withKeyword, bindings, members, extraImpls, newExprRange, range) ->
+          | SynExpr.ObjExpr(baseTy, constructorArgs, withKeyword, bindings, members, extraImpls, newExprRange, range) ->
             Some(AbstractClassData.ObjExpr(baseTy, bindings, range))
           | _ -> defaultTraverse expr
 
         override _.VisitModuleDecl(_, defaultTraverse, decl) =
           match decl with
-          | SynModuleDecl.Types (types, m) -> List.tryPick walkTypeDefn types
+          | SynModuleDecl.Types(types, m) -> List.tryPick walkTypeDefn types
           | _ -> defaultTraverse decl }
   )
 
@@ -103,14 +103,14 @@ let getAbstractClassIdentifier (abstractClassData: AbstractClassData) tokens =
 
 let getMemberNameAndRanges (abstractClassData) =
   match abstractClassData with
-  | AbstractClassData.ExplicitImpl (ty, members, _) ->
+  | AbstractClassData.ExplicitImpl(ty, members, _) ->
     members
     |> Seq.choose (function
-      | (SynMemberDefn.Member (binding, _)) -> Some binding
+      | (SynMemberDefn.Member(binding, _)) -> Some binding
       | _ -> None)
     |> Seq.choose (|MemberNameAndRange|_|)
     |> Seq.toList
-  | AbstractClassData.ObjExpr (_, bindings, _) -> List.choose (|MemberNameAndRange|_|) bindings
+  | AbstractClassData.ObjExpr(_, bindings, _) -> List.choose (|MemberNameAndRange|_|) bindings
 
 /// Try to find the start column, so we know what the base indentation should be
 let inferStartColumn
@@ -129,7 +129,7 @@ let inferStartColumn
     | AbstractClassData.ExplicitImpl _ ->
       // 'interface ISomething with' is often in a new line, we use the indentation of that line
       getLineIdent lineStr + indentSize
-    | AbstractClassData.ObjExpr (_, _, newExprRange) ->
+    | AbstractClassData.ObjExpr(_, _, newExprRange) ->
       match codeGenServer.TokenizeLine(doc.FullName, pos.Line) with
       | Some tokens ->
         tokens
@@ -188,7 +188,7 @@ let writeAbstractClassStub
         match abstractClassData with
         | AbstractClassData.ObjExpr _ ->
           findLastPositionOfWithKeyword tokens entity pos (getAbstractClassIdentifier abstractClassData)
-        | AbstractClassData.ExplicitImpl (_, _, safeInsertPosition) -> Some(false, safeInsertPosition)
+        | AbstractClassData.ExplicitImpl(_, _, safeInsertPosition) -> Some(false, safeInsertPosition)
       | None -> None
 
     let desiredMemberNamesWithRanges = getMemberNameAndRanges abstractClassData
@@ -222,7 +222,7 @@ let writeAbstractClassStub
       return! None
     else
       match insertInfo with
-      | Some (shouldAppendWith, insertPosition) ->
+      | Some(shouldAppendWith, insertPosition) ->
         if shouldAppendWith then
           return! Some(insertPosition, " with" + generatedString)
         else

src/FsAutoComplete.Core/CodeGeneration.fs

@@ -43,7 +43,7 @@ type CodeGenerationService(checker: FSharpCompilerServiceChecker, state: State)
     override x.GetSymbolAtPosition(fileName, pos: Position) =
       match state.TryGetFileCheckerOptionsWithLinesAndLineStr(fileName, pos) with
       | ResultOrString.Error _ -> None
-      | ResultOrString.Ok (opts, lines, line) ->
+      | ResultOrString.Ok(opts, lines, line) ->
         try
           Lexer.getSymbol pos.Line pos.Column line SymbolLookupKind.Fuzzy [||]
         with _ ->
@@ -56,7 +56,7 @@ type CodeGenerationService(checker: FSharpCompilerServiceChecker, state: State)
         if symbol.Kind = kind then
           match state.TryGetFileCheckerOptionsWithLinesAndLineStr(fileName, pos) with
           | ResultOrString.Error _ -> return! None
-          | ResultOrString.Ok (opts, text, line) ->
+          | ResultOrString.Ok(opts, text, line) ->
             let! result = checker.TryGetRecentCheckResultsForFile(fileName, opts, text)
             let symbolUse = result.TryGetSymbolUse pos line
             return! Some(symbol, symbolUse)
@@ -67,7 +67,7 @@ type CodeGenerationService(checker: FSharpCompilerServiceChecker, state: State)
     override x.ParseFileInProject(fileName) =
       match state.TryGetFileCheckerOptionsWithLines fileName with
       | ResultOrString.Error _ -> None
-      | ResultOrString.Ok (opts, text) ->
+      | ResultOrString.Ok(opts, text) ->
         try
           checker.TryGetRecentCheckResultsForFile(fileName, opts, text)
           |> Option.map (fun n -> n.GetParseResults)
@@ -278,17 +278,17 @@ module CodeGenerationUtils =
     let args, namesWithIndices =
       args
       |> List.fold
-           (fun (argsSoFar: string list list, namesWithIndices) args ->
-             let argsSoFar', namesWithIndices =
-               args
-               |> List.fold
-                    (fun (acc: string list, allNames) arg ->
-                      let name, allNames = formatArgUsage ctx hasTypeAnnotation allNames arg
-                      name :: acc, allNames)
-                    ([], namesWithIndices)
-
-             List.rev argsSoFar' :: argsSoFar, namesWithIndices)
-           ([], Map.ofList [ ctx.ObjectIdent, Set.empty ])
+        (fun (argsSoFar: string list list, namesWithIndices) args ->
+          let argsSoFar', namesWithIndices =
+            args
+            |> List.fold
+              (fun (acc: string list, allNames) arg ->
+                let name, allNames = formatArgUsage ctx hasTypeAnnotation allNames arg
+                name :: acc, allNames)
+              ([], namesWithIndices)
+
+          List.rev argsSoFar' :: argsSoFar, namesWithIndices)
+        ([], Map.ofList [ ctx.ObjectIdent, Set.empty ])
 
     args
     |> List.rev
@@ -313,7 +313,7 @@ module CodeGenerationUtils =
 
     let argInfos, retType =
       match argInfos, v.IsPropertyGetterMethod, v.IsPropertySetterMethod with
-      | [ AllAndLast (args, last) ], _, true -> [ args ], Some last.Type
+      | [ AllAndLast(args, last) ], _, true -> [ args ], Some last.Type
       | [ [] ], true, _ -> [], Some retType
       | _, _, _ -> argInfos, Some retType
 
@@ -440,7 +440,7 @@ module CodeGenerationUtils =
       if m.IsDispatchSlot then "override " else "member "
 
     match m with
-    | MemberInfo.PropertyGetSet (getter, setter) ->
+    | MemberInfo.PropertyGetSet(getter, setter) ->
       let (usage, modifiers, getterArgInfos, retType) = preprocess ctx getter
       let closeDeclaration = closeDeclaration retType
       let writeImplementation = writeImplementation ctx
@@ -558,7 +558,7 @@ module CodeGenerationUtils =
 
   let (|TypeOfMember|_|) (m: FSharpMemberOrFunctionOrValue) =
     match m.FullTypeSafe with
-    | Some (MemberFunctionType typ) when m.IsProperty && m.DeclaringEntity.IsSome && m.DeclaringEntity.Value.IsFSharp ->
+    | Some(MemberFunctionType typ) when m.IsProperty && m.DeclaringEntity.IsSome && m.DeclaringEntity.Value.IsFSharp ->
       Some typ
     | Some typ -> Some typ
     | None -> None
@@ -640,7 +640,7 @@ module CodeGenerationUtils =
 
   let (|LongIdentPattern|_|) =
     function
-    | SynPat.LongIdent(longDotId = LongIdentWithDots (xs, _)) ->
+    | SynPat.LongIdent(longDotId = LongIdentWithDots(xs, _)) ->
       //            let (name, range) = xs |> List.map (fun x -> x.idText, x.idRange) |> List.last
       let last = List.last xs
       Some(last.idText, last.idRange)
@@ -651,21 +651,21 @@ module CodeGenerationUtils =
   // so we use 'get_' and 'set_' prefix to ensure corresponding symbols are retrieved correctly.
   let (|MemberNameAndRange|_|) =
     function
-    | SynBinding (valData = SynValData (Some mf, _, _); headPat = LongIdentPattern (name, range)) when
+    | SynBinding(valData = SynValData(Some mf, _, _); headPat = LongIdentPattern(name, range)) when
       mf.MemberKind = SynMemberKind.PropertyGet
       ->
       if name.StartsWith("get_") then
         Some(name, range)
       else
         Some("get_" + name, range)
-    | SynBinding (valData = SynValData (Some mf, _, _); headPat = LongIdentPattern (name, range)) when
+    | SynBinding(valData = SynValData(Some mf, _, _); headPat = LongIdentPattern(name, range)) when
       mf.MemberKind = SynMemberKind.PropertySet
       ->
       if name.StartsWith("set_") then
         Some(name, range)
       else
         Some("set_" + name, range)
-    | SynBinding(headPat = LongIdentPattern (name, range)) -> Some(name, range)
+    | SynBinding(headPat = LongIdentPattern(name, range)) -> Some(name, range)
     | _ -> None
 
   let normalizeEventName (m: FSharpMemberOrFunctionOrValue) =
@@ -815,8 +815,8 @@ module CodeGenerationUtils =
     (displayContext: FSharpDisplayContext)
     excludedMemberSignatures
     (e: FSharpEntity)
-    (getMembersToImplement: FSharpEntity
-                              -> seq<FSharpMemberOrFunctionOrValue * seq<FSharpGenericParameter * FSharpType>>)
+    (getMembersToImplement:
+      FSharpEntity -> seq<FSharpMemberOrFunctionOrValue * seq<FSharpGenericParameter * FSharpType>>)
     verboseMode
     =
     let lines = String.getLines methodBody
@@ -923,17 +923,17 @@ module CodeGenerationUtils =
   let rec (|RationalConst|) =
     function
     | SynRationalConst.Integer i -> string i
-    | SynRationalConst.Rational (numerator, denominator, _) -> sprintf "(%i/%i)" numerator denominator
-    | SynRationalConst.Negate (RationalConst s) -> sprintf "- %s" s
+    | SynRationalConst.Rational(numerator, denominator, _) -> sprintf "(%i/%i)" numerator denominator
+    | SynRationalConst.Negate(RationalConst s) -> sprintf "- %s" s
 
   let rec (|TypeIdent|_|) =
     function
-    | SynType.Var (SynTypar (s, req, _), _) ->
+    | SynType.Var(SynTypar(s, req, _), _) ->
       match req with
       | TyparStaticReq.None -> Some("'" + s.idText)
       | TyparStaticReq.HeadType -> Some("^" + s.idText)
-    | SynType.LongIdent (LongIdentWithDots (xs, _)) -> xs |> Seq.map (fun x -> x.idText) |> String.concat "." |> Some
-    | SynType.App (t, _, ts, _, _, isPostfix, _) ->
+    | SynType.LongIdent(LongIdentWithDots(xs, _)) -> xs |> Seq.map (fun x -> x.idText) |> String.concat "." |> Some
+    | SynType.App(t, _, ts, _, _, isPostfix, _) ->
       match t, ts with
       | TypeIdent typeName, [] -> Some typeName
       | TypeIdent typeName, [ TypeIdent typeArg ] ->
@@ -952,15 +952,15 @@ module CodeGenerationUtils =
         debug "Unsupported case with %A and %A" t ts
         None
     | SynType.Anon _ -> Some "_"
-    | SynType.Tuple (_, ts, _) -> Some(ts |> Seq.choose (snd >> (|TypeIdent|_|)) |> String.concat " * ")
-    | SynType.Array (dimension, TypeIdent typeName, _) -> Some(sprintf "%s [%s]" typeName (String(',', dimension - 1)))
-    | SynType.MeasurePower (TypeIdent typeName, RationalConst power, _) -> Some(sprintf "%s^%s" typeName power)
-    | SynType.MeasureDivide (TypeIdent numerator, TypeIdent denominator, _) ->
+    | SynType.Tuple(_, ts, _) -> Some(ts |> Seq.choose (snd >> (|TypeIdent|_|)) |> String.concat " * ")
+    | SynType.Array(dimension, TypeIdent typeName, _) -> Some(sprintf "%s [%s]" typeName (String(',', dimension - 1)))
+    | SynType.MeasurePower(TypeIdent typeName, RationalConst power, _) -> Some(sprintf "%s^%s" typeName power)
+    | SynType.MeasureDivide(TypeIdent numerator, TypeIdent denominator, _) ->
       Some(sprintf "%s/%s" numerator denominator)
     | _ -> None
 
   let expandTypeParameters (typ: SynType) =
     match typ with
-    | SynType.App (_, _, ts, _, _, _, _)
-    | SynType.LongIdentApp (_, _, _, ts, _, _, _) -> ts |> Seq.choose (|TypeIdent|_|) |> Seq.toArray
+    | SynType.App(_, _, ts, _, _, _, _)
+    | SynType.LongIdentApp(_, _, _, ts, _, _, _) -> ts |> Seq.choose (|TypeIdent|_|) |> Seq.toArray
     | _ -> [||]