Merge pull request swiftlang#136 from benlangmuir/testloc-unicode

[test] Update for TestLocation utf8/16 change

Author: benlangmuir

Sources/SKTestSupport/SKTibsTestWorkspace.swift

@@ -121,15 +121,26 @@ extension TestLocation {
 
 extension Position {
   public init(_ loc: TestLocation) {
-    // FIXME: utf16 vfs utf8 column
-    self.init(line: loc.line - 1, utf16index: loc.column - 1)
+    self.init(line: loc.line - 1, utf16index: loc.utf16Column - 1)
+  }
+
+  /// Incorrectly use the UTF-8 column index in place of the UTF-16 one, to match the incorrect
+  /// implementation in SourceKitServer when using the index.
+  public init(badUTF16 loc: TestLocation) {
+    self.init(line: loc.line - 1, utf16index: loc.utf8Column - 1)
   }
 }
 
 extension Location {
   public init(_ loc: TestLocation) {
     self.init(url: loc.url, range: Range(Position(loc)))
   }
+
+  /// Incorrectly use the UTF-8 column index in place of the UTF-16 one, to match the incorrect
+  /// implementation in SourceKitServer when using the index.
+  public init(badUTF16 loc: TestLocation) {
+    self.init(url: loc.url, range: Range(Position(badUTF16: loc)))
+  }
 }
 
 extension TibsToolchain {

Tests/SourceKitTests/ImplementationTests.swift

@@ -34,7 +34,7 @@ final class ImplementationTests: XCTestCase {
       ws.testLoc(name)
     }  
     func loc(_ name: String) -> Location {
-      Location(ws.testLoc(name))
+      Location(badUTF16: ws.testLoc(name))
     }
 
     try XCTAssertEqual(impls(at: testLoc("Protocol")), [loc("StructConformance")])
@@ -54,8 +54,7 @@ final class ImplementationTests: XCTestCase {
     try XCTAssertEqual(impls(at: testLoc("Trematothoracinae")), [])
 
     try XCTAssertEqual(impls(at: testLoc("Prozaiczne")), [loc("MurkwiaConformance2"), loc("SepulkaConformance1")])
-    // FIXME: For some reason we get a location in the middle of a symbol for PćmaŁagodnaConformance 
-    // try XCTAssertEqual(impls(at: testLoc("Sepulkowate")), [loc("MurkwiaConformance1"), loc("SepulkaConformance2"), loc("PćmaŁagodnaConformance"), loc("PćmaZwyczajnaConformance")])
+    try XCTAssertEqual(impls(at: testLoc("Sepulkowate")), [loc("MurkwiaConformance1"), loc("SepulkaConformance2"), loc("PćmaŁagodnaConformance"), loc("PćmaZwyczajnaConformance")])
     // FIXME: sourcekit returns wrong locations for the function (subclasses that don't override it, and extensions that don't implement it)
     // try XCTAssertEqual(impls(at: testLoc("rozpocznijSepulenie")), [loc("MurkwiaFunc"), loc("SepulkaFunc"), loc("PćmaŁagodnaFunc"), loc("PćmaZwyczajnaFunc")])
     try XCTAssertEqual(impls(at: testLoc("Murkwia")), [])
@@ -64,4 +63,4 @@ final class ImplementationTests: XCTestCase {
     try XCTAssertEqual(impls(at: testLoc("SepulkaVar")), [loc("SepulkaDwuusznaVar"), loc("SepulkaPrzechylnaVar")])
     try XCTAssertEqual(impls(at: testLoc("SepulkaFunc")), [])
   }
-}
+}