Merge pull request #2230 from bnbarham/disable-raw-test-pre-6.2

Only run raw identifier tests for >= 6.2

Author: bnbarham

Sources/SKTestSupport/SkipUnless.swift

@@ -352,6 +352,39 @@ package actor SkipUnless {
       return .featureSupported
     }
   }
+
+  package static func haveRawIdentifiers(
+    file: StaticString = #filePath,
+    line: UInt = #line
+  ) async throws {
+    return try await shared.skipUnlessSupportedByToolchain(
+      swiftVersion: SwiftVersion(6, 2),
+      file: file,
+      line: line
+    ) {
+      let testClient = try await TestSourceKitLSPClient()
+      let uri = DocumentURI(for: .swift)
+      testClient.openDocument(
+        """
+        let `1 * 1` = 1
+        _ = `1 * 1`
+        """,
+        uri: uri
+      )
+
+      let response = try unwrap(
+        await testClient.send(DocumentSemanticTokensRequest(textDocument: TextDocumentIdentifier(uri)))
+      )
+
+      let tokens = SyntaxHighlightingTokens(lspEncodedTokens: response.data)
+      return tokens.tokens.last
+        == SourceKitLSP.SyntaxHighlightingToken(
+          range: Position(line: 1, utf16index: 4)..<Position(line: 1, utf16index: 11),
+          kind: .variable,
+          modifiers: []
+        )
+    }
+  }
 }
 
 // MARK: - Parsing Swift compiler version

Tests/SourceKitLSPTests/DocumentTestDiscoveryTests.swift

@@ -704,6 +704,8 @@ final class DocumentTestDiscoveryTests: XCTestCase {
   }
 
   func testSwiftTestingTestWithRawIdentifiers() async throws {
+    try await SkipUnless.haveRawIdentifiers()
+
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -784,6 +786,8 @@ final class DocumentTestDiscoveryTests: XCTestCase {
   }
 
   func testSwiftTestingTestWithNestedRawIdentifiers() async throws {
+    try await SkipUnless.haveRawIdentifiers()
+
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -844,6 +848,8 @@ final class DocumentTestDiscoveryTests: XCTestCase {
   }
 
   func testSwiftTestingTestWithNestedRawIdentifiersExtension() async throws {
+    try await SkipUnless.haveRawIdentifiers()
+
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -909,6 +915,8 @@ final class DocumentTestDiscoveryTests: XCTestCase {
   }
 
   func testSwiftTestingTestWithSlashRawIdentifiers() async throws {
+    try await SkipUnless.haveRawIdentifiers()
+
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 

Tests/SourceKitLSPTests/SemanticTokensTests.swift

@@ -882,6 +882,8 @@ final class SemanticTokensTests: XCTestCase {
   }
 
   func testRawIdentifier() async throws {
+    try await SkipUnless.haveRawIdentifiers()
+
     try await assertSemanticTokens(
       markedContents: """
         1️⃣func 2️⃣`square returns x * x`() {}