Import type: try getting parent modules when importing module attribute

Author: auduchinok

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

@@ -61,7 +61,13 @@ let rec getModuleToOpen (typeElement: ITypeElement): IClrDeclaredElement =
 
 let findModuleToInsert (fsFile: IFSharpFile) (offset: DocumentOffset) (settings: IContextBoundSettingsStore) =
     if not (settings.GetValue(fun key -> key.TopLevelOpenCompletion)) then
-        fsFile.GetNode<IModuleLikeDeclaration>(offset)
+        match fsFile.GetNode<IModuleLikeDeclaration>(offset) with
+        | :? IDeclaredModuleLikeDeclaration as moduleDecl when
+                let keyword = moduleDecl.ModuleOrNamespaceKeyword
+                isNotNull keyword && keyword.GetTreeStartOffset().Offset < offset.Offset ->
+            moduleDecl :> IModuleLikeDeclaration
+        | moduleDecl ->
+            moduleDecl.GetContainingNode<IModuleLikeDeclaration>()
     else
         match fsFile.GetNode<ITopLevelModuleLikeDeclaration>(offset) with
         | null -> fsFile.GetNode<IAnonModuleDeclaration>(offset) :> _

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 01.fs

@@ -0,0 +1,5 @@
+namespace Ns
+
+[<Optional{caret}>]
+module Module = 
+   ()

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 01.fs.gold

@@ -0,0 +1,7 @@
+namespace Ns
+
+open System.Runtime.InteropServices
+
+[<Optional{caret}>]
+module Module = 
+   ()

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 02 - Prefer nested.fs

@@ -0,0 +1,5 @@
+namespace Ns
+
+[<Optional{caret}>]
+module Module = 
+   ()

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 02 - Prefer nested.fs.gold

@@ -0,0 +1,7 @@
+namespace Ns
+
+open System.Runtime.InteropServices
+
+[<Optional{caret}>]
+module Module = 
+   ()

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 03 - Nested modules.fs

@@ -0,0 +1,6 @@
+namespace Ns
+
+module Module =
+    [<Optional{caret}>]
+    module Nested = 
+       ()

ReSharper.FSharp/test/data/features/quickFixes/importType/Nested Module - Attribute 03 - Nested modules.fs.gold

@@ -0,0 +1,9 @@
+namespace Ns
+
+module Module =
+
+    open System.Runtime.InteropServices
+
+    [<Optional{caret}>]
+    module Nested = 
+       ()

ReSharper.FSharp/test/src/FSharp.Tests/QuickFixes/ImportTypeTest.fs

@@ -1,7 +1,9 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features
 
 open JetBrains.ReSharper.Intentions.QuickFixes
+open JetBrains.ReSharper.Plugins.FSharp.Settings
 open JetBrains.ReSharper.Plugins.FSharp.Tests
+open JetBrains.ReSharper.TestFramework
 open NUnit.Framework
 
 [<FSharpTest>]
@@ -23,6 +25,12 @@ type ImportTypeTest() =
     [<Test>] member x.``Type arguments - Count 01``() = x.DoNamedTest()
     [<Test>] member x.``Module name - Escaped 01``() = x.DoNamedTest()
 
+    [<Test>] member x.``Nested Module - Attribute 01``() = x.DoNamedTest()
+    [<TestSetting(typeof<FSharpOptions>, "TopLevelOpenCompletion", "false")>]
+    [<Test>] member x.``Nested Module - Attribute 02 - Prefer nested``() = x.DoNamedTest()
+    [<TestSetting(typeof<FSharpOptions>, "TopLevelOpenCompletion", "false")>]
+    [<Test>] member x.``Nested Module - Attribute 03 - Nested modules``() = x.DoNamedTest()
+
     [<Test>] member x.``Qualifiers - Expr - Imported 01``() = x.DoNamedTest()
     [<Test>] member x.``Qualifiers - Expr - Imported 02 - Nested``() = x.DoNamedTest()
     [<Test>] member x.``Qualifiers - Expr 01``() = x.DoNamedTest()