Simplify source formatting tests

Author: natecook1000

Sources/SKTestSupport/String+applyingTextEdits.swift

@@ -27,9 +27,9 @@ final class FormattingTests: XCTestCase {
 
     let source = """
       struct S {
-      1️⃣var foo: 2️⃣ 3️⃣Int
-      4️⃣var bar: Int
-      }5️⃣
+      var foo:  Int
+      var bar: Int
+      }
       """
     testClient.openDocument(source, uri: uri)
 
@@ -41,8 +41,7 @@ final class FormattingTests: XCTestCase {
     )
 
     let edits = try XCTUnwrap(response)
-    let (_, unmarkedSource) = extractMarkers(source)
-    let formattedSource = unmarkedSource.applying(edits)
+    let formattedSource = apply(edits: edits, to: source)
 
     XCTAssertEqual(
       formattedSource,
@@ -52,7 +51,6 @@ final class FormattingTests: XCTestCase {
          var bar: Int
       }
 
-
       """
     )
   }
@@ -221,8 +219,8 @@ final class FormattingTests: XCTestCase {
     let uri = DocumentURI(for: .swift)
 
     let source = """
-      1️⃣public 2️⃣extension Example {
-        3️⃣func function() {}
+      public extension Example {
+        func function() {}
       }
 
       """
@@ -236,8 +234,7 @@ final class FormattingTests: XCTestCase {
     )
 
     let edits = try XCTUnwrap(response)
-    let (_, unmarkedSource) = extractMarkers(source)
-    let formattedSource = unmarkedSource.applying(edits)
+    let formattedSource = apply(edits: edits, to: source)
 
     XCTAssertEqual(
       formattedSource,
@@ -246,7 +243,6 @@ final class FormattingTests: XCTestCase {
         public func function() {}
       }
 
-
       """
     )
   }
@@ -259,16 +255,16 @@ final class FormattingTests: XCTestCase {
       _ = [
         Node(
           documentation: """
-          1️⃣A
-          2️⃣B
-          3️⃣C
-          4️⃣""",
+          A
+          B
+          C
+          """,
           children: [
             Child(
               documentation: """
-              5️⃣A
-      6️⃣        7️⃣\#("")
-      8️⃣  9️⃣      🔟"""
+              A
+              \#("")
+              """
             )
           ]
         )
@@ -285,8 +281,7 @@ final class FormattingTests: XCTestCase {
     )
 
     let edits = try XCTUnwrap(response)
-    let (_, unmarkedSource) = extractMarkers(source)
-    let formattedSource = unmarkedSource.applying(edits)
+    let formattedSource = apply(edits: edits, to: source)
 
     XCTAssertEqual(
       formattedSource,
@@ -309,7 +304,6 @@ final class FormattingTests: XCTestCase {
         )
       ]
 
-
       """#
     )
   }

Tests/SourceKitLSPTests/FormattingTests.swift

@@ -56,7 +56,7 @@ final class OnTypeFormattingTests: XCTestCase {
 
     let source = """
       func foo() {
-      1️⃣if let SomeReallyLongVar = 2️⃣    3️⃣Some.More.Stuff(), let a = 4️⃣    5️⃣myfunc() 6️⃣{
+      if let SomeReallyLongVar =     Some.More.Stuff(), let a =     myfunc() 1️⃣{
       }
       }
       """
@@ -65,15 +65,15 @@ final class OnTypeFormattingTests: XCTestCase {
     let response = try await testClient.send(
       DocumentOnTypeFormattingRequest(
         textDocument: TextDocumentIdentifier(uri),
-        position: positions["6️⃣"],
+        position: positions["1️⃣"],
         ch: "{",
         options: FormattingOptions(tabSize: 4, insertSpaces: true)
       )
     )
 
     let edits = try XCTUnwrap(response)
     let (_, unmarkedSource) = extractMarkers(source)
-    let formattedSource = unmarkedSource.applying(edits)
+    let formattedSource = apply(edits: edits, to: unmarkedSource)
 
     XCTAssertEqual(
       formattedSource,

Tests/SourceKitLSPTests/OnTypeFormattingTests.swift

@@ -15,7 +15,7 @@ import SKTestSupport
 import SKUtilities
 import XCTest
 
-private func apply(edits: [TextEdit], to source: String) -> String {
+internal func apply(edits: [TextEdit], to source: String) -> String {
   var lineTable = LineTable(source)
   let edits = edits.sorted(by: { $0.range.lowerBound < $1.range.lowerBound })
   for edit in edits.reversed() {