Generate/overrides: fix isOverriden check for generic members

Author: auduchinok

ReSharper.FSharp/src/FSharp.Psi.Services/src/Generate/GenerateProvider.fs

@@ -1,5 +1,6 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features
 
+open System
 open System.Collections.Generic
 open FSharp.Compiler.Symbols
 open JetBrains.Application.Progress
@@ -20,7 +21,6 @@ open JetBrains.ReSharper.Psi.Impl
 open JetBrains.ReSharper.Psi.Tree
 open JetBrains.ReSharper.Psi.Util
 open JetBrains.ReSharper.Resources.Shell
-open JetBrains.Util
 
 [<Language(typeof<FSharpLanguage>)>]
 type FSharpGeneratorContextFactory() =
@@ -70,6 +70,13 @@ type FSharpGeneratorElement(element, mfvInstance: FcsMfvInstance, addTypes) =
     override x.ToString() = element.ToString()
 
 
+[<Flags>]
+type PropertyOverrideState =
+    | None = 0
+    | Getter = 1
+    | Setter = 2
+
+
 [<GeneratorElementProvider(GeneratorStandardKinds.Overrides, typeof<FSharpLanguage>)>]
 [<GeneratorElementProvider(GeneratorStandardKinds.MissingMembers, typeof<FSharpLanguage>)>]
 type FSharpOverridableMembersProvider() =
@@ -113,7 +120,7 @@ type FSharpOverridableMembersProvider() =
             | Some baseType when baseType.HasTypeDefinition -> loop [] baseType
             | _ -> []
 
-        let ownMembersIds =
+        let ownMembersDescriptors =
             typeElement.GetMembers()
             |> Seq.collect (fun typeMember ->
                 if typeMember :? IFSharpGeneratedElement then Seq.empty else
@@ -140,7 +147,39 @@ type FSharpOverridableMembersProvider() =
                     |> Seq.toList
                 fcsEntityInstance, mfvInstances)
 
-        let alreadyOverriden = HashSet()
+        let alreadyOverriden = Dictionary<OverridableMemberInstance, PropertyOverrideState>()
+
+        let addOverrides (memberInstance: OverridableMemberInstance) =
+            for overridableMemberInstance in OverridableMemberImpl.GetImmediateOverride(memberInstance) do
+                let state = 
+                    match memberInstance.Member with
+                    | :? IProperty as prop ->
+                        (if prop.IsReadable then PropertyOverrideState.Getter else PropertyOverrideState.None) |||
+                        (if prop.IsReadable then PropertyOverrideState.Getter else PropertyOverrideState.None)
+                    | _ -> PropertyOverrideState.None
+
+                let state = 
+                    match alreadyOverriden.TryGetValue(overridableMemberInstance) with
+                    | true, existingState -> existingState ||| state
+                    | _ -> state
+
+                alreadyOverriden[overridableMemberInstance] <- state
+
+        let isOverridden (memberInstance: OverridableMemberInstance) =
+            match alreadyOverriden.TryGetValue(memberInstance) with
+            | false, _ -> false
+            | true, state ->
+
+            let prop = memberInstance.Member.As<IProperty>()
+            isNull prop ||
+
+            (not prop.IsReadable || (state &&& PropertyOverrideState.Getter <> enum 0)) &&
+            (not prop.IsWritable || (state &&& PropertyOverrideState.Setter <> enum 0))
+
+        for KeyValue(_, memberInstance) in memberInstances do
+            let fsTypeMember = memberInstance.Member.As<IFSharpTypeMember>()
+            if isNull fsTypeMember || fsTypeMember.IsVisibleFromFSharp then
+                addOverrides memberInstance
 
         let overridableMemberInstances =
             baseFcsMembers |> List.collect (fun (_, mfvInstances) ->
@@ -153,15 +192,18 @@ type FSharpOverridableMembersProvider() =
                         | null -> mfv.GetXmlDocId()
                         | typeMember -> XMLDocUtil.GetTypeMemberXmlDocId(typeMember, typeMember.ShortName)
 
-                    if ownMembersIds.Contains(xmlDocId) then None else
+                    if ownMembersDescriptors.Contains(xmlDocId) then None else
 
                     let mutable memberInstance = Unchecked.defaultof<_>
                     if not (memberInstances.TryGetValue(xmlDocId, &memberInstance)) then None else
-                    if alreadyOverriden.Contains(memberInstance) then None else
 
-                    OverridableMemberImpl.GetImmediateOverride(memberInstance) |> alreadyOverriden.AddRange
-                    Some (memberInstance.Member, mfvInstance))
-                |> Seq.toList)
+                    if isOverridden memberInstance then None else
+
+                    addOverrides memberInstance
+                    Some (memberInstance.Member, mfvInstance)
+                )
+                |> Seq.toList
+            )
 
         let needsTypesAnnotations =
             overridableMemberInstances
@@ -182,7 +224,7 @@ type FSharpOverridableMembersProvider() =
                   prop.Setter :> IOverridableMember, { mfvInstance with Mfv = mfv.SetterMethod } ])
         |> Seq.map (fun (m, mfvInstance) ->
             FSharpGeneratorElement(m, mfvInstance, needsTypesAnnotations.Contains(mfvInstance.Mfv)))
-        |> Seq.filter (fun i -> not (ownMembersIds.Contains(i.TestDescriptor)))
+        |> Seq.filter (fun i -> not (ownMembersDescriptors.Contains(i.TestDescriptor)))
         |> Seq.distinctBy (fun i -> i.TestDescriptor) // todo: better way to check shadowing/overriding members
         |> Seq.filter (fun i -> not missingMembersOnly || i.Member.IsAbstract)
         |> Seq.iter context.ProvidedElements.Add

ReSharper.FSharp/test/data/features/generate/overrides/Super - Substitution 05.fs

@@ -0,0 +1,12 @@
+// ${KIND:Overrides}
+// ${SELECT0:ToString():System.String}
+
+[<AbstractClass>]
+type A<'T1>() =
+    abstract P: 'T1
+
+[<AbstractClass>]
+type T() ={caret}
+    inherit A<int>()
+
+    override this.P = 1

ReSharper.FSharp/test/data/features/generate/overrides/Super - Substitution 05.fs.gold

@@ -0,0 +1,19 @@
+Provided elements:
+ 0: ToString():System.String
+ 1: Equals(System.Object):System.Boolean
+ 2: GetHashCode():System.Int32
+ 3: Finalize():System.Void
+
+// ${KIND:Overrides}
+// ${SELECT0:ToString():System.String}
+
+[<AbstractClass>]
+type A<'T1>() =
+    abstract P: 'T1
+
+[<AbstractClass>]
+type T() =
+    inherit A<int>()
+
+    override this.P = 1
+    override this.ToString() = {selstart}failwith "todo"{selend}

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 01.fs

@@ -0,0 +1,9 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract P1: 'T list
+    abstract P2: int
+
+type {caret}B() =
+    inherit A<int>()
+
+    override this.P1 = []

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 01.fs.gold

@@ -0,0 +1,10 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract P1: 'T list
+    abstract P2: int
+
+type B() =
+    inherit A<int>()
+
+    override this.P1 = []
+    override this.P2 = {selstart}failwith "todo"{selend}

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 02.fs

@@ -0,0 +1,9 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract M1: unit -> 'T list
+    abstract M2: unit -> int
+
+type {caret}B() =
+    inherit A<int>()
+
+    override this.M1() = []

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 02.fs.gold

@@ -0,0 +1,10 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract M1: unit -> 'T list
+    abstract M2: unit -> int
+
+type B() =
+    inherit A<int>()
+
+    override this.M1() = []
+    override this.M2() = {selstart}failwith "todo"{selend}

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 03.fs

@@ -0,0 +1,9 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract M1: 'T list -> unit
+    abstract M2: int -> unit
+
+type {caret}B() =
+    inherit A<int>()
+
+    override this.M1 _ = ()

ReSharper.FSharp/test/data/features/quickFixes/generateMissingMembers/Substitution 03.fs.gold

@@ -0,0 +1,10 @@
+[<AbstractClass>]
+type A<'T>() =
+    abstract M1: 'T list -> unit
+    abstract M2: int -> unit
+
+type B() =
+    inherit A<int>()
+
+    override this.M1 _ = ()
+    override this.M2(var0) = {selstart}failwith "todo"{selend}

ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/QuickFixes/GenerateInterfaceMembersFixTest.fs

@@ -82,4 +82,7 @@ type GenerateMissingMembersFixTest() =
     [<Test>] member x.``Property 01``() = x.DoNamedTest()
     [<Test>] member x.``Same name 01``() = x.DoNamedTest()
     [<Test>] member x.``Same name 02``() = x.DoNamedTest()
+    [<Test>] member x.``Substitution 01``() = x.DoNamedTest()
+    [<Test>] member x.``Substitution 02``() = x.DoNamedTest()
+    [<Test>] member x.``Substitution 03``() = x.DoNamedTest()
     [<Test>] member x.``Super 01 - Different type parameter name``() = x.DoNamedTest()