Filter out IExceptionFieldDeclaration for IExceptionDeclaration.

JetBrains · May 8, 2023 · 31f6605 · 31f6605
1 parent 12a6bdc
commit 31f6605
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ReSharper.FSharp/src/FSharp.Common/src/Settings/FSharpOptionsPageBase.fs b/ReSharper.FSharp/src/FSharp.Common/src/Settings/FSharpOptionsPageBase.fs
@@ -20,11 +20,11 @@ type FSharpOptionsPageBase(lifetime, optionsPageContext, settings) =
     member x.AddString(text: string, getter: Expression<Func<_,_>>) =
         x.AddString(text, settings.GetValueProperty(lifetime, getter))
 
-    member x.AddDescription(text) =
+    member x.AddDescription(text: string) =
         use indent = x.Indent()
         x.AddRichText(RichText(text)) |> ignore
 
-    member x.AddBool(text, property: IProperty<_>) =
+    member x.AddBool(text: string, property: IProperty<_>) =
         x.AddBoolOption(property, RichText(text), text) |> ignore
 
     member x.AddHeader(text: string) =

diff --git a/ReSharper.FSharp/src/FSharp.Psi.Services/src/Generate/GenerateSignatureProvider.fs b/ReSharper.FSharp/src/FSharp.Psi.Services/src/Generate/GenerateSignatureProvider.fs
@@ -192,7 +192,12 @@ type FSharpGenerateSignatureBuilder() =
                 factory.CreateTypeMemberSignature(sigStrings)
             | :? IExceptionDeclaration as exceptionDeclaration ->
                 let sigExceptionDeclaration = exceptionDeclaration.Copy()
-                if not (Seq.isEmpty exceptionDeclaration.MemberDeclarations) then
+                let memberDeclarations =
+                    exceptionDeclaration.MemberDeclarations
+                    |> Seq.filter (function | :? IExceptionFieldDeclaration -> false | _ -> true)
+                    |> Seq.toArray
+
+                if memberDeclarations.Length > 0 then
                     let sigMembers =
                         exceptionDeclaration.TypeMembers
                         |> Seq.choose (createMemberDeclaration >> Option.ofObj)