Allow solution to build

nojaf · Sep 13, 2024 · ec0ad23 · ec0ad23
1 parent 9ccf437
commit ec0ad23
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj b/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
@@ -132,6 +132,7 @@
     <Compile Include="DotLambdaTests.fs" />
     <Compile Include="ConstraintIntersectionTests.fs" />
     <Compile Include="BeginEndTests.fs" />
+    <Compile Include="NullnessTests.fs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Fantomas.Core\Fantomas.Core.fsproj" />

diff --git a/src/Fantomas.Core.Tests/NullnessTests.fs b/src/Fantomas.Core.Tests/NullnessTests.fs
@@ -0,0 +1,21 @@
+module Fantomas.Core.Tests.NullnessTests
+
+open NUnit.Framework
+open FsUnit
+open Fantomas.Core.Tests.TestHelpers
+
+[<Test>]
+let ``abstract property`` () =
+    formatSourceString
+        """
+[<AbstractClass>]
+type AbstractBase() =
+    abstract Property1 : string | null with get, set
+"""
+        config
+    |> prepend newline
+    |> should
+        equal
+        """
+
+"""
diff --git a/src/Fantomas.Core/ASTTransformer.fs b/src/Fantomas.Core/ASTTransformer.fs
@@ -78,6 +78,10 @@ let mkSynAccess (vis: SynAccess option) =
     | Some(SynAccess.Private range) -> Some(stn "private" range)
     | Some(SynAccess.Public range) -> Some(stn "public" range)
 
+let mkSynValSigAccess (vis: SynValSigAccess) =
+    // https://fsharp.github.io/fsharp-compiler-docs/reference/fsharp-compiler-syntax-synvalsigaccess.html
+    failwith "todo SynValSigAccess: %A" vis
+
 let parseExpressionInSynBinding returnInfo expr =
     match returnInfo, expr with
     | Some(SynBindingReturnInfo(typeName = t1)), SynExpr.Typed(e, t2, _) when RangeHelpers.rangeEq t1.Range t2.Range ->
@@ -2168,6 +2172,8 @@ let mkSynTypeConstraint (creationAide: CreationAide) (tc: SynTypeConstraint) : T
         TypeConstraintEnumOrDelegateNode(mkSynTypar tp, "delegate", List.map (mkType creationAide) ts, m)
         |> TypeConstraint.EnumOrDelegate
     | SynTypeConstraint.WhereSelfConstrained(t, _) -> mkType creationAide t |> TypeConstraint.WhereSelfConstrained
+    | SynTypeConstraint.WhereTyparNotSupportsNull(genericName, range) ->
+        failwithf "todo WhereTyparNotSupportsNull : %A" (genericName, range)
 
 // Arrow type is right-associative
 let rec (|TFuns|_|) =
@@ -2845,7 +2851,7 @@ let mkMemberDefn (creationAide: CreationAide) (md: SynMemberDefn) =
             mkXmlDoc px,
             mkAttributes creationAide ats,
             mkSynLeadingKeyword lk,
-            mkSynAccess ao,
+            mkSynValSigAccess ao,
             mkIdent ident,
             Option.map (mkType creationAide) typeOpt,
             stn "=" mEq,
@@ -3027,7 +3033,7 @@ let mkVal
         lk,
         Option.map (stn "inline") trivia.InlineKeyword,
         isMutable,
-        mkSynAccess ao,
+        mkSynValSigAccess ao,
         mkSynIdent synIdent,
         mkSynValTyparDecls creationAide (Some vtd),
         mkType creationAide t,

diff --git a/src/Fantomas/EditorConfig.fs b/src/Fantomas/EditorConfig.fs
@@ -16,7 +16,7 @@ module Reflection =
           DisplayName: string option
           Description: string option }
 
-    let inline getCustomAttribute<'t, 'v when 't :> Attribute and 't: null>
+    let inline getCustomAttribute<'t, 'v when 't :> Attribute and 't: null and 't: not struct>
         (projection: 't -> 'v)
         (property: PropertyInfo)
         : 'v option =