Add empty line if necessary before 'open' statements

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

@@ -44,14 +44,25 @@ let addOpen (coords: DocumentCoords) (fsFile: IFSharpFile) (settings: IContextBo
         |> Seq.tryLast
         |> Option.defaultValue line
 
+    // if this is the first open statement, add a new line before
+    let insertEmptyLineBefore =
+        if line > 0 then
+            let lineText = document.GetLineText(docLine (line - 1))
+            not (lineText.StartsWith(openPrefix) || lineText.Trim().Length = 0)
+        else
+            false
+
     // add empty line after all open expressions if needed
-    let insertEmptyLine = not (document.GetLineText(docLine line).IsNullOrWhitespace())
+    let insertEmptyLineAfter = not (document.GetLineText(docLine line).IsNullOrWhitespace())
 
     let prevLineEndOffset =
         if lineToInsert > 0 then document.GetLineEndOffsetWithLineBreak(docLine (max 0 (lineToInsert - 1)))
         else 0
 
     let newLineText = document.GetPsiSourceFile(fsFile.GetSolution()).DetectLineEnding().GetPresentation()
-    let emptyLine = if insertEmptyLine then newLineText else ""
-    document.InsertText(prevLineEndOffset, textToInsert + newLineText + emptyLine)
+
+    let prefix = if insertEmptyLineBefore then newLineText else ""
+    let postfix = if insertEmptyLineAfter then newLineText else ""
+
+    document.InsertText(prevLineEndOffset, prefix + textToInsert + newLineText + postfix)
 

ReSharper.FSharp/test/data/features/completion/Open 01 - First open.fs

@@ -0,0 +1,3 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+{caret}

ReSharper.FSharp/test/data/features/completion/Open 01 - First open.fs.gold

@@ -0,0 +1,6 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+
+open System
+
+IDisposable{caret}

ReSharper.FSharp/test/data/features/completion/Open 02 - Second open.fs

@@ -0,0 +1,6 @@
+// ${COMPLETE_ITEM:Task (in System.Threading.Tasks)}
+namespace SomeNamespace
+
+open System
+
+{caret}

ReSharper.FSharp/test/data/features/completion/Open 02 - Second open.fs.gold

@@ -0,0 +1,7 @@
+// ${COMPLETE_ITEM:Task (in System.Threading.Tasks)}
+namespace SomeNamespace
+
+open System
+open System.Threading.Tasks
+
+Task{caret}

ReSharper.FSharp/test/data/features/completion/Open 03 - Comment after namespace.fs

@@ -0,0 +1,4 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+// Some comment here
+{caret}

ReSharper.FSharp/test/data/features/completion/Open 03 - Comment after namespace.fs.gold

@@ -0,0 +1,7 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+
+open System
+
+// Some comment here
+IDisposable{caret}

ReSharper.FSharp/test/data/features/completion/Open 04 - Inside module.fs

@@ -0,0 +1,6 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+
+module Module =
+    let foo () =
+        {caret}

ReSharper.FSharp/test/data/features/completion/Open 04 - Inside module.fs.gold

@@ -0,0 +1,9 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+namespace SomeNamespace
+
+module Module =
+
+    open System
+
+    let foo () =
+        IDisposable{caret}

ReSharper.FSharp/test/data/features/completion/Open 05 - Empty file.fs

@@ -0,0 +1,2 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+{caret}

ReSharper.FSharp/test/data/features/completion/Open 05 - Empty file.fs.gold

@@ -0,0 +1,5 @@
+// ${COMPLETE_ITEM:IDisposable (in System)}
+
+open System
+
+IDisposable{caret}

ReSharper.FSharp/test/src/FSharp.Tests/FSharpCompletionTest.fs

@@ -1,10 +1,12 @@
 namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features
 
 open JetBrains.ReSharper.FeaturesTestFramework.Completion
+open JetBrains.ReSharper.Plugins.FSharp.Settings
 open JetBrains.ReSharper.Plugins.FSharp.Tests.Common
+open JetBrains.ReSharper.TestFramework
 open NUnit.Framework
 
-[<FSharpTest>]
+[<FSharpTest; TestSettingsKey(typeof<FSharpOptions>)>]
 type FSharpCompletionTest() =
     inherit CodeCompletionTestBase()
 
@@ -21,3 +23,10 @@ type FSharpCompletionTest() =
     [<Test>] member x.``Wild 02 - Insert``() = x.DoNamedTest()
     [<Test>] member x.``Wild 03 - Replace before``() = x.DoNamedTest()
     [<Test>] member x.``Wild 04 - Insert before``() = x.DoNamedTest()
+
+    [<Test>] member x.``Open 01 - First open``() = x.DoNamedTest()
+    [<Test>] member x.``Open 02 - Second open``() = x.DoNamedTest()
+    [<Test>] member x.``Open 03 - Comment after namespace``() = x.DoNamedTest()
+
+    [<TestSettings("{ TopLevelOpenCompletion: false }")>]
+    [<Test>] member x.``Open 04 - Inside module``() = x.DoNamedTest()