Add some initial easy binding tests.

nojaf · nojaf · commit ec16276d98f2 · 2022-11-02T08:23:44.000+01:00
diff --git a/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/AddFunctionToSignatureFileAction.fs b/ReSharper.FSharp/src/FSharp.Psi.Intentions/src/Intentions/AddFunctionToSignatureFileAction.fs
@@ -1,4 +1,4 @@
-namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Intentions.Intentions
+namespace JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions
 
 open FSharp.Compiler.Text
 open FSharp.Compiler.Symbols
@@ -63,6 +63,8 @@ type AddFunctionToSignatureFileAction(dataProvider: FSharpContextActionDataProvi
         | Some signatureCounterPart ->
 
         let symbolUse = refPat.GetFcsSymbolUse()
+        if isNull symbolUse then None else
+        
         match symbolUse.Symbol with
         | ValFromImpl valSymbol ->
             let text =
@@ -124,7 +126,7 @@ type AddFunctionToSignatureFileAction(dataProvider: FSharpContextActionDataProvi
 
         let valSig = factory.CreateBindingSignature(refPat, typeInfo)
         let newlineNode = NewLine(signatureModuleOrNamespaceDecl.GetLineEnding()) :> ITreeNode
-        addNodesAfter signatureModuleOrNamespaceDecl.LastChild [| newlineNode; valSig; newlineNode |] |> ignore
+        addNodesAfter signatureModuleOrNamespaceDecl.LastChild [| newlineNode; valSig |] |> ignore
 
         null
 
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fs b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fs
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b c = b + c
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fs.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fs.gold
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b c = b + c
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fsi b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fsi
@@ -0,0 +1 @@
+module Test
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fsi.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 01.fsi.gold
@@ -0,0 +1,2 @@
+module Test
+val a: b: int -> c: int -> int
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fs b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fs
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} (b:string) c = c + 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fs.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fs.gold
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} (b:string) c = c + 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fsi b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fsi
@@ -0,0 +1 @@
+module Test
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fsi.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 02.fsi.gold
@@ -0,0 +1,2 @@
+module Test
+val a: b: string -> c: int -> int
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fs b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fs
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b (c: char) d = b + d + 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fs.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fs.gold
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b (c: char) d = b + d + 1
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fsi b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fsi
@@ -0,0 +1 @@
+module Test
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fsi.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 03.fsi.gold
@@ -0,0 +1,2 @@
+module Test
+val a: b: int -> c: char -> d: int -> int
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fs b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fs
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b : int = printfn "%s" b ; 0
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fs.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fs.gold
@@ -0,0 +1,3 @@
+module Test
+
+let a{caret} b : int = printfn "%s" b ; 0
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fsi b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fsi
@@ -0,0 +1 @@
+module Test
diff --git a/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fsi.gold b/ReSharper.FSharp/test/data/features/intentions/addFunctionToSignature/Simple Binding - 04.fsi.gold
@@ -0,0 +1,2 @@
+module Test
+val a: b: string -> int
diff --git a/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/FSharp.Intentions.Tests.fsproj b/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/FSharp.Intentions.Tests.fsproj
@@ -47,6 +47,7 @@
     <Compile Include="src\Intentions\LetToUseTest.fs" />
     <Compile Include="src\Intentions\RenameFileToMatchTypeNameTest.fs" />
     <Compile Include="src\Intentions\DeconstructPatternTest.fs" />
+    <Compile Include="src\Intentions\AddFunctionToSignatureFileActionTest.fs" />
     <Compile Include="src\QuickFixes\FSharpQuickFixTestBase.fs" />
     <Compile Include="src\QuickFixes\ReplaceUseWithLetTest.fs" />
     <Compile Include="src\QuickFixes\RemoveUnusedSelfIdVariableFix.fs" />
diff --git a/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Intentions/AddFunctionToSignatureFileActionTest.fs b/ReSharper.FSharp/test/src/FSharp.Intentions.Tests/src/Intentions/AddFunctionToSignatureFileActionTest.fs
@@ -0,0 +1,24 @@
+namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Intentions.Intentions
+
+open JetBrains.ReSharper.Plugins.FSharp
+open JetBrains.ReSharper.Plugins.FSharp.Psi.Features.Intentions
+open NUnit.Framework
+
+type AddFunctionToSignatureFileActionTest() =
+    inherit FSharpContextActionExecuteTestBase<AddFunctionToSignatureFileAction>()
+    
+    // TODO: is there an equivalent to CheckAllFiles for FSharpContextActionExecuteTestBase<'T>?
+    // override this.CheckAllFiles = true
+
+    override this.ExtraPath = "addFunctionToSignature"
+
+    member x.DoNamedTestWithSignature() =
+        let testName = x.TestMethodName
+        let fsExt = FSharpProjectFileType.FsExtension
+        let fsiExt = FSharpSignatureProjectFileType.FsiExtension
+        x.DoTestSolution(testName + fsiExt, testName + fsExt)
+
+    [<Test>] member x.``Simple Binding - 01`` () = x.DoNamedTestWithSignature()
+    [<Test>] member x.``Simple Binding - 02`` () = x.DoNamedTestWithSignature()
+    [<Test>] member x.``Simple Binding - 03`` () = x.DoNamedTestWithSignature()
+    [<Test>] member x.``Simple Binding - 04`` () = x.DoNamedTestWithSignature()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module Test`
	`2`	`+`
	`3`	`+let a{caret} b c = b + c`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+module Test`
	`2`	`+val a: b: int -> c: int -> int`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module Test`
	`2`	`+`
	`3`	`+let a{caret} (b:string) c = c + 1`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+module Test`
	`2`	`+val a: b: string -> c: int -> int`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module Test`
	`2`	`+`
	`3`	`+let a{caret} b (c: char) d = b + d + 1`