Quick fixes: better reference binding when adding Extension attribute

Author: auduchinok

ReSharper.FSharp/src/FSharp.Psi.Features/src/Generate/GenerateOverrides.fs

@@ -66,7 +66,7 @@ let generateMember (context: IFSharpTreeNode) (indent: int) (element: IFSharpGen
     if element.Mfv.IsCliEvent() then
         let attribute = context.CreateElementFactory().CreateAttribute("CLIEvent")
         FSharpAttributesUtil.addOuterAttributeListWithIndent true indent memberDeclaration
-        FSharpAttributesUtil.addAttribute memberDeclaration.AttributeLists.[0] attribute
+        FSharpAttributesUtil.addAttribute memberDeclaration.AttributeLists.[0] attribute |> ignore
 
     if element.AddTypes then
         let lastParam = memberDeclaration.ParametersDeclarations.LastOrDefault()

ReSharper.FSharp/src/FSharp.Psi.Features/src/Intentions/ToLiteralAction.fs

@@ -61,6 +61,6 @@ type ToLiteralAction(dataProvider: FSharpContextActionDataProvider) =
 
         let attributeList = getAttributeList binding
         let attribute = binding.CreateElementFactory().CreateAttribute("Literal")
-        FSharpAttributesUtil.addAttribute attributeList attribute
+        FSharpAttributesUtil.addAttribute attributeList attribute |> ignore
 
         null

ReSharper.FSharp/src/FSharp.Psi.Features/src/QuickFixes/AddExtensionAttributeFix.fs

@@ -3,17 +3,15 @@
 open JetBrains.ReSharper.Plugins.FSharp.Psi
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.Highlightings
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Daemon.QuickFixes
-open JetBrains.ReSharper.Plugins.FSharp.Psi.Util
+open JetBrains.ReSharper.Psi
 open JetBrains.ReSharper.Psi.ExtensionsAPI
 open JetBrains.ReSharper.Resources.Shell
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Tree
-open JetBrains.ReSharper.Psi.Tree
 open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Util.FSharpAttributesUtil
 
 type AddExtensionAttributeFix(warning: ExtensionMemberInNonExtensionTypeWarning) =
     inherit FSharpQuickFixBase()
 
-    let [<Literal>] extensionNamespaceName = "System.Runtime.CompilerServices"
     let [<Literal>] attributeName = "Extension"
 
     let declaration =
@@ -23,32 +21,33 @@ type AddExtensionAttributeFix(warning: ExtensionMemberInNonExtensionTypeWarning)
             | letModuleDec -> letModuleDec :> _
         if isNotNull attributeOwner then attributeOwner.GetContainingTypeDeclaration() else null
 
-    override x.Text = sprintf "Add 'Extension' attribute to '%s'" declaration.SourceName
+    override x.Text = $"Add 'Extension' attribute to '{declaration.SourceName}'"
 
     override x.IsAvailable _ =
-        match declaration with
-        | :? ITopLevelModuleLikeDeclaration -> false
-        | _ -> isValid declaration
+        isValid declaration
 
     override x.ExecutePsiTransaction _ =
         use writeCookie = WriteLockCookie.Create(warning.Attr.IsPhysical())
         use disableFormatter = new DisableCodeFormatter()
 
+        let attributeList = 
+            match declaration with
+            | :? IDeclaredModuleDeclaration as moduleDecl ->
+                if moduleDecl.AttributeLists.IsEmpty then
+                    addOuterAttributeList true moduleDecl
+                moduleDecl.AttributeLists.[0]
+
+            | :? IFSharpTypeOrExtensionDeclaration as t ->
+                getTypeDeclarationAttributeList t
+
+            | _ -> null
+
+        if isNull attributeList then () else
+
         let attribute = warning.Attr.CreateElementFactory().CreateAttribute(attributeName)
-        match declaration with
-        | :? INestedModuleDeclaration as m ->
-            match tryGetOpen m extensionNamespaceName with
-            | Some _ ->
-                let file = declaration.FSharpFile
-                let settingsStore = file.GetSettingsStoreWithEditorConfig()
-                addOpen (m.GetDocumentStartOffset()) file settingsStore extensionNamespaceName
-            | None -> ()
-
-            if m.AttributeLists.IsEmpty then
-                addOuterAttributeList true m
-            addAttribute m.AttributeLists.[0] attribute
-
-        | :? IFSharpTypeOrExtensionDeclaration as t ->
-            let attributeList = getTypeDeclarationAttributeList t
-            addAttribute attributeList attribute
-        | _ -> ()
+        let attribute = addAttribute attributeList attribute
+        
+        let reference = attribute.ReferenceName.Reference
+        let extensionTypeElement = attribute.GetPsiModule().GetPredefinedType().ExtensionAttribute.GetTypeElement()
+        let importHelper = LanguageManager.Instance.GetService<IFSharpQuickFixUtilComponent>(attribute.Language)
+        importHelper.BindTo(reference, extensionTypeElement) |> ignore

ReSharper.FSharp/src/FSharp.Psi.Features/src/QuickFixes/ToAbstractFix.fs

@@ -23,4 +23,4 @@ type ToAbstractFix(error: NoImplementationGivenTypeError) =
 
         let attributeList = getTypeDeclarationAttributeList typeDecl
         let attribute = typeDecl.CreateElementFactory().CreateAttribute("AbstractClass")
-        addAttribute attributeList attribute
+        addAttribute attributeList attribute |> ignore

ReSharper.FSharp/src/FSharp.Psi.Features/src/Util/FSharpAttributesUtil.fs

@@ -23,6 +23,8 @@ let addAttribute (attributeList: IAttributeList) (attribute: IAttribute) =
                 Whitespace()
         ] |> ignore
 
+    attribute
+
 
 let addAttributeAfter (anchor: IAttribute) (attribute: IAttribute) =
     let anchor, seenSemi =

ReSharper.FSharp/src/FSharp.Psi/src/Impl/FSharpReferenceBindingUtil.cs

@@ -55,7 +55,7 @@ private static INamespace GetNamespace([NotNull] IClrDeclaredElement declaredEle
 
     private static bool IsNamespaceQualifierRequired([NotNull] FSharpSymbolReference reference)
     {
-      var attribute = reference.GetTreeNode().GetContainingNode<IAttribute>();
+      var attribute = reference.GetTreeNode().GetContainingNode<IAttribute>(true);
       return NamedModuleDeclarationNavigator.GetByAttribute(attribute) != null;
     }
 

ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module.fs renamed to ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module - Nested 01.fs

@@ -1,8 +1,7 @@
-namespace Test
+namespace Ns
 
 open System.Runtime.CompilerServices
 
 module Module =
-
     [<{caret}Extension>]
-    let a() = 5
+    let f x = 5

ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module.fs.gold renamed to ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module - Nested 01.fs.gold

@@ -1,9 +1,8 @@
-namespace Test
+namespace Ns
 
 open System.Runtime.CompilerServices
 
 [<Extension>]
 module Module =
-
     [<{caret}Extension>]
-    let a() = 5
+    let f x = 5

ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Attribute namespace - add.fs renamed to ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module - Nested 02 - Add open.fs

@@ -1,8 +1,7 @@
-namespace Test
+namespace Ns
 
 module Module =
     open System.Runtime.CompilerServices
 
     [<{caret}Extension>]
-    let a() = 5
-
+    let f x = 5

ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Attribute namespace - add.fs.gold renamed to ReSharper.FSharp/test/data/features/quickFixes/addExtensionAttribute/Module - Nested 02 - Add open.fs.gold

@@ -1,4 +1,4 @@
-namespace Test
+namespace Ns
 
 open System.Runtime.CompilerServices
 
@@ -7,5 +7,4 @@ module Module =
     open System.Runtime.CompilerServices
 
     [<{caret}Extension>]
-    let a() = 5
-
+    let f x = 5