Make swift-syntax build in Swift 6 language mode

ahoppen · ahoppen · commit 3688dcbc1d51 · 2024-03-27T10:48:27.000+01:00
diff --git a/Package.swift b/Package.swift
@@ -294,7 +294,8 @@ let package = Package(
       dependencies: ["_InstructionCounter", "_SwiftSyntaxTestSupport", "SwiftIDEUtils", "SwiftParser", "SwiftSyntax"],
       exclude: ["Inputs"]
     ),
-  ]
+  ],
+  swiftLanguageVersions: [.v5, .version("6")]
 )
 
 // This is a fake target that depends on all targets in the package.
diff --git a/Sources/SwiftParser/ExpressionInterpretedAsVersionTuple.swift b/Sources/SwiftParser/ExpressionInterpretedAsVersionTuple.swift
@@ -10,7 +10,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if swift(>=6)
+@_spi(RawSyntax) public import SwiftSyntax
+#else
 @_spi(RawSyntax) import SwiftSyntax
+#endif
 
 extension ExprSyntax {
   /// Parse the source code of this node as a `VersionTupleSyntax`.
diff --git a/Sources/SwiftParser/TokenSpecSet.swift b/Sources/SwiftParser/TokenSpecSet.swift
@@ -10,11 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if swift(>=6)
-@_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) public import SwiftSyntax
-#else
 @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftSyntax
-#endif
 
 /// A set of `TokenSpecs`. We expect to consume one of the sets specs in the
 /// parser.
diff --git a/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift b/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift
@@ -63,7 +63,7 @@ public struct NoteSpec {
     message: String,
     line: Int,
     column: Int,
-    originatorFile: StaticString = #file,
+    originatorFile: StaticString = #filePath,
     originatorLine: UInt = #line
   ) {
     self.message = message
diff --git a/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/Paths.swift b/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/Paths.swift
@@ -14,7 +14,7 @@ import Foundation
 
 enum Paths {
   static var packageDir: URL {
-    URL(fileURLWithPath: #file)
+    URL(fileURLWithPath: #filePath)
       .deletingLastPathComponent()
       .deletingLastPathComponent()
       .deletingLastPathComponent()
diff --git a/Tests/PerformanceTest/InstructionsCountAssertion.swift b/Tests/PerformanceTest/InstructionsCountAssertion.swift
@@ -17,7 +17,7 @@ fileprivate var baselineURL: URL {
   if let baselineFile = ProcessInfo.processInfo.environment["BASELINE_FILE"] {
     return URL(fileURLWithPath: baselineFile)
   } else {
-    return URL(fileURLWithPath: #file)
+    return URL(fileURLWithPath: #filePath)
       .deletingLastPathComponent()
       .appendingPathComponent("baselines.json")
   }
diff --git a/Tests/PerformanceTest/ParsingPerformanceTests.swift b/Tests/PerformanceTest/ParsingPerformanceTests.swift
@@ -18,7 +18,7 @@ import _SwiftSyntaxTestSupport
 class ParsingPerformanceTests: XCTestCase {
 
   var inputFile: URL {
-    return URL(fileURLWithPath: #file)
+    return URL(fileURLWithPath: #filePath)
       .deletingLastPathComponent()
       .appendingPathComponent("Inputs")
       .appendingPathComponent("MinimalCollections.swift.input")
diff --git a/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift b/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift
@@ -19,7 +19,7 @@ import _SwiftSyntaxTestSupport
 class SyntaxClassifierPerformanceTests: XCTestCase {
 
   var inputFile: URL {
-    return URL(fileURLWithPath: #file)
+    return URL(fileURLWithPath: #filePath)
       .deletingLastPathComponent()
       .appendingPathComponent("Inputs")
       .appendingPathComponent("MinimalCollections.swift.input")
diff --git a/Tests/PerformanceTest/VisitorPerformanceTests.swift b/Tests/PerformanceTest/VisitorPerformanceTests.swift
@@ -18,7 +18,7 @@ import _SwiftSyntaxTestSupport
 class VisitorPerformanceTests: XCTestCase {
 
   var inputFile: URL {
-    return URL(fileURLWithPath: #file)
+    return URL(fileURLWithPath: #filePath)
       .deletingLastPathComponent()
       .appendingPathComponent("Inputs")
       .appendingPathComponent("MinimalCollections.swift.input")
diff --git a/Tests/SwiftParserTest/ParserTests.swift b/Tests/SwiftParserTest/ParserTests.swift
@@ -85,7 +85,7 @@ class ParserTests: ParserTestCase {
     }
   }
 
-  let packageDir = URL(fileURLWithPath: #file)
+  let packageDir = URL(fileURLWithPath: #filePath)
     .deletingLastPathComponent()
     .deletingLastPathComponent()
     .deletingLastPathComponent()
diff --git a/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift b/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift
@@ -37,7 +37,7 @@ func verifySequentialToConcurrentTranslation(
   _ sequential: [IncrementalEdit],
   _ expectedConcurrent: [IncrementalEdit],
   testString: String = longString,
-  file: StaticString = #file,
+  file: StaticString = #filePath,
   line: UInt = #line
 ) {
   let concurrent = ConcurrentEdits(fromSequential: sequential)
diff --git a/Tests/SwiftSyntaxMacroExpansionTest/LexicalContextTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/LexicalContextTests.swift
@@ -200,8 +200,8 @@ struct AllLexicalContextsMacro: DeclarationMacro {
   }
 }
 
-public struct LexicalContextDescriptionMacro: ExpressionMacro {
-  public static func expansion(
+struct LexicalContextDescriptionMacro: ExpressionMacro {
+  static func expansion(
     of node: some FreestandingMacroExpansionSyntax,
     in context: some MacroExpansionContext
   ) throws -> ExprSyntax {

Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,8 @@ let package = Package(`
`294`	`294`	`dependencies: ["_InstructionCounter", "_SwiftSyntaxTestSupport", "SwiftIDEUtils", "SwiftParser", "SwiftSyntax"],`
`295`	`295`	`exclude: ["Inputs"]`
`296`	`296`	`),`
`297`		`- ]`
	`297`	`+ ],`
	`298`	`+ swiftLanguageVersions: [.v5, .version("6")]`
`298`	`299`	`)`
`299`	`300`
`300`	`301`	`// This is a fake target that depends on all targets in the package.`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ fileprivate var baselineURL: URL {`
`17`	`17`	`if let baselineFile = ProcessInfo.processInfo.environment["BASELINE_FILE"] {`
`18`	`18`	`return URL(fileURLWithPath: baselineFile)`
`19`	`19`	`} else {`
`20`		`- return URL(fileURLWithPath: #file)`
	`20`	`+ return URL(fileURLWithPath: #filePath)`
`21`	`21`	`.deletingLastPathComponent()`
`22`	`22`	`.appendingPathComponent("baselines.json")`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class ParserTests: ParserTestCase {`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- let packageDir = URL(fileURLWithPath: #file)`
	`88`	`+ let packageDir = URL(fileURLWithPath: #filePath)`
`89`	`89`	`.deletingLastPathComponent()`
`90`	`90`	`.deletingLastPathComponent()`
`91`	`91`	`.deletingLastPathComponent()`