Fix stub generation tests

src/FsAutoComplete.Core/Commands.fs

@@ -258,7 +258,7 @@ module Commands =
       | None -> return CoreResponse.InfoRes "Record at position not found"
       | Some(recordEpr, (Some recordDefinition), insertionPos) ->
         if shouldGenerateRecordStub recordEpr recordDefinition then
-          let result = formatRecord insertionPos "$1" recordDefinition recordEpr.FieldExprList
+          let result = (formatRecord insertionPos "$1" recordDefinition recordEpr.FieldExprList).TrimStart(' ')
           return CoreResponse.Res(result, insertionPos.InsertionPos)
         else
           return CoreResponse.InfoRes "Record at position not found"

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests.fs

@@ -5,7 +5,11 @@ open Helpers
 open Utils.ServerTests
 open Utils.CursorbasedTests
 open FsAutoComplete.CodeFix
+open System.IO
 
+let sourceDir = __SOURCE_DIRECTORY__
+let expectedTestDir = Path.Join(sourceDir, "GenerateAbstractClassStubTests")
+let expectFile file = File.ReadAllText(Path.Join(expectedTestDir, file))
 let tests state =
   let config = { defaultConfigDto with AbstractClassStubGeneration = Some true }
   serverTestList (nameof GenerateAbstractClassStub) state config None (fun server -> [
@@ -28,6 +32,7 @@ let tests state =
         (Diagnostics.expectCode "365")
         selectCodeFix
     testCaseAsync "can generate abstract class stub" <|
+
       CodeFix.check server
         """
         [<AbstractClass>]
@@ -46,26 +51,8 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        """
-        [<AbstractClass>]
-        type Shape(x0: float, y0: float) =
-          let mutable x, y = x0, y0
-
-          abstract Name : string with get
-          abstract Area : float with get
-
-          member _.Move dx dy =
-            x <- x + dx
-            y <- y + dy
+        (expectFile "can_generate_abstract_class_stub.expected")
 
-        type Square(x,y, sideLength) =
-          inherit Shape(x,y)
-
-          override this.Area: float =
-              failwith "Not Implemented"
-          override this.Name: string =
-              failwith "Not Implemented"
-        ()"""
     testCaseAsync "can generate abstract class stub with another member with attribute" <|
       CodeFix.check server
         """
@@ -88,29 +75,8 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        """
-        [<AbstractClass>]
-        type Shape(x0: float, y0: float) =
-          let mutable x, y = x0, y0
+         (expectFile "can_generate_abstract_class_stub_with_another_member_with_attribute.expected")
 
-          abstract Name : string with get
-          abstract Area : float with get
-
-          member _.Move dx dy =
-            x <- x + dx
-            y <- y + dy
-
-        type Square(x,y, sideLength) =
-          inherit Shape(x,y)
-
-          override this.Area: float =
-              failwith "Not Implemented"
-          override this.Name: string =
-              failwith "Not Implemented"
-
-          [<CompiledName("yo")>]
-          member x.Foo() = 1
-        ()"""
     testCaseAsync "can generate abstract class stub without trailing nl" <|
       CodeFix.check server
         """
@@ -130,26 +96,8 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        """
-        [<AbstractClass>]
-        type Shape(x0: float, y0: float) =
-          let mutable x, y = x0, y0
-
-          abstract Name : string with get
-          abstract Area : float with get
+        (expectFile "can_generate_abstract_class_stub_without_trailing_nl.expected")
 
-          member _.Move dx dy =
-            x <- x + dx
-            y <- y + dy
-
-        type Square(x,y, sideLength) =
-          inherit Shape(x,y)
-
-          override this.Area: float =
-              failwith "Not Implemented"
-          override this.Name: string =
-              failwith "Not Implemented"
-        ()"""
     testCaseAsync "inserts override in correct place" <|
       CodeFix.check server
         """
@@ -169,26 +117,8 @@ let tests state =
         let a = 0"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        """
-        [<AbstractClass>]
-        type Shape(x0: float, y0: float) =
-          let mutable x, y = x0, y0
-
-          abstract Name : string with get
-          abstract Area : float with get
-
-          member _.Move dx dy =
-            x <- x + dx
-            y <- y + dy
-
-        type Square(x,y, sideLength) =
-          inherit Shape(x,y)
+        (expectFile "inserts_override_in_correct_place.expected")
 
-          override this.Area: float =
-              failwith "Not Implemented"
-          override this.Name: string =
-              failwith "Not Implemented"
-        let a = 0"""
     testCaseAsync "can generate abstract class stub with existing override" <|
       CodeFix.check server
         """
@@ -210,24 +140,5 @@ let tests state =
         ()"""
         (Diagnostics.expectCode "365")
         selectCodeFix
-        """
-        [<AbstractClass>]
-        type Shape(x0: float, y0: float) =
-          let mutable x, y = x0, y0
-
-          abstract Name : string with get
-          abstract Area : float with get
-
-          member _.Move dx dy =
-            x <- x + dx
-            y <- y + dy
-
-        type Square(x,y, sideLength) =
-          inherit Shape(x,y)
-
-          override this.Area: float =
-              failwith "Not Implemented"
-
-          override this.Name = "Circle"
-        ()"""
+        (expectFile "can_generate_abstract_class_stub_with_existing_override.expected")
   ])

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub.expected

@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      ()

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub_with_another_member_with_attribute.expected

@@ -0,0 +1,22 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+
+        [<CompiledName("yo")>]
+        member x.Foo() = 1
+      ()

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub_with_existing_override.expected

@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+
+        override this.Name = "Circle"
+      ()

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests/can_generate_abstract_class_stub_without_trailing_nl.expected

@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      ()

test/FsAutoComplete.Tests.Lsp/CodeFixTests/GenerateAbstractClassStubTests/inserts_override_in_correct_place.expected

@@ -0,0 +1,19 @@
+      [<AbstractClass>]
+      type Shape(x0: float, y0: float) =
+        let mutable x, y = x0, y0
+
+        abstract Name : string with get
+        abstract Area : float with get
+
+        member _.Move dx dy =
+          x <- x + dx
+          y <- y + dy
+
+      type Square(x,y, sideLength) =
+        inherit Shape(x,y)
+
+        override this.Area: float =
+            failwith "Not Implemented"
+        override this.Name: string =
+            failwith "Not Implemented"
+      let a = 0