Updates SwiftSyntax to 600.0.0 with explicit import access (#52)

* Updates `swift-syntax` package to v600

* Adopts import access level from SE-0409

* Resolves deprecations and use more generalized return type

* Removes `String.isSwiftKeyword` extension

...and thus `@_spi` dependencies on `SwiftSyntax` and `SwiftParser`

* Resolves regressions found

* Specifies minimal import access level with Swift 6.0+

* Removes styling workarounds

* Resolves Swift 5.x regressions

Author: stevapple

Package.resolved

@@ -29,7 +29,7 @@ let package = Package(
     ],
     dependencies: [
         // Dependencies declare other packages that this package depends on.
-        .package(url: "https://github.com/apple/swift-syntax.git", from: "509.0.0"),
+        .package(url: "https://github.com/swiftlang/swift-syntax.git", from: "600.0.0"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-collections.git", from: "1.0.0"),
         .package(url: "https://github.com/teco-project/teco-core.git", .upToNextMinor(from: "0.5.3")),

Package.swift

@@ -22,8 +22,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if compiler(>=6.0)
+public import SwiftBasicFormat
+public import SwiftSyntax
+#else
 import SwiftBasicFormat
 import SwiftSyntax
+#endif
 
 /// A format style for files generated by TecoCodeGenerator.
 public class CodeGenerationFormat: BasicFormat {

Sources/TecoCodeGeneratorCommons/CodeGenerationFormat.swift

@@ -1,8 +1,16 @@
+#if compiler(>=6.0)
+public import ArgumentParser
+private import struct Foundation.Calendar
+private import struct Foundation.Date
+private import class Foundation.FileManager
+private import struct Foundation.URL
+#else
 import ArgumentParser
 import struct Foundation.Calendar
 import struct Foundation.Date
 import class Foundation.FileManager
-@_exported import struct Foundation.URL
+import struct Foundation.URL
+#endif
 
 public struct GeneratorContext {
     @TaskLocal

Sources/TecoCodeGeneratorCommons/TecoCodeGenerator.swift

@@ -1,9 +1,18 @@
-import Foundation
+#if compiler(>=6.0)
+private import ArgumentParser
+public import Foundation
+private import OrderedCollections
+private import SwiftParser
+public import SwiftSyntax
+private import SwiftSyntaxBuilder
+#else
 import ArgumentParser
-@_spi(Diagnostics) import SwiftParser
-@_spi(RawSyntax) import SwiftSyntax
-import SwiftSyntaxBuilder
+import Foundation
 @_implementationOnly import OrderedCollections
+import SwiftParser
+import SwiftSyntax
+import SwiftSyntaxBuilder
+#endif
 
 extension String {
     public func lowerFirst() -> String {
@@ -24,20 +33,12 @@ extension String {
         return String(self[...startIndex]).uppercased() + self[index(after: startIndex)...]
     }
 
-    public var isSwiftKeyword: Bool {
-        var string = self
-        if let keyword = string.withSyntaxText(Keyword.init) {
-            return TokenKind.keyword(keyword).isLexerClassifiedKeyword
-        }
-        return false
-    }
-
     public func swiftMemberEscaped() -> String {
-        self == "init" ? "`init`" : self
+        self.isValidSwiftIdentifier(for: .memberAccess) ? self : "`\(self)`"
     }
 
     public func swiftIdentifierEscaped() -> String {
-        (self == "init" || self.isSwiftKeyword) ? "`\(self)`" : self
+        self.isValidSwiftIdentifier(for: .variableName) ? self : "`\(self)`"
     }
 }
 
@@ -68,7 +69,7 @@ extension TecoCodeGenerator {
 
 extension SourceFileSyntax {
     public func withCopyrightHeader() -> SourceFileSyntax {
-        let header = """
+        let headerTrivia = Trivia("""
             //===----------------------------------------------------------------------===//
             //
             // This source file is part of the Teco open source project
@@ -84,10 +85,8 @@ extension SourceFileSyntax {
 
             // THIS FILE IS AUTOMATICALLY GENERATED by \(GeneratorContext.generator).
             // DO NOT EDIT.
-            
-            
-            """
-        return self.with(\.leadingTrivia, .lineComment(header) + self.leadingTrivia)
+            """)
+        return self.with(\.leadingTrivia, headerTrivia + .newlines(2) + self.leadingTrivia)
     }
 
     public func save(to url: URL) throws {
@@ -105,19 +104,8 @@ extension SourceFileSyntax {
         // Skip formatting and writing to disk in dry-run mode
         if GeneratorContext.dryRun { return }
 
-        // Work around styling issues regarding blank lines.
-        var sourceCode = source.description.trimmingCharacters(in: .whitespacesAndNewlines).appending("\n")
-
-        // Work around styling issues regarding trailing whitespaces.
-        sourceCode = sourceCode.split(omittingEmptySubsequences: false, whereSeparator: \.isNewline).map {
-            var line = $0
-            while line.last?.isWhitespace == true {
-                line.removeLast()
-            }
-            return line
-        }.joined(separator: "\n")
-
         // Save to file.
+        let sourceCode = source.description + "\n"
         try sourceCode.write(to: url, atomically: true, encoding: .utf8)
     }
 }

Sources/TecoCodeGeneratorCommons/Utils.swift

@@ -1,8 +1,14 @@
+#if compiler(>=6.0)
+internal import SwiftSyntax
+private import SwiftSyntaxBuilder
+private import TecoCodeGeneratorCommons
+#else
 import SwiftSyntax
 import SwiftSyntaxBuilder
 import TecoCodeGeneratorCommons
+#endif
 
-func buildCommonErrorStructDecl(from errors: [CommonError]) throws -> DeclSyntax {
+func buildCommonErrorStructDecl(from errors: [CommonError]) throws -> some DeclSyntaxProtocol {
     try StructDeclSyntax("""
         /// Common error type returned by Tencent Cloud.
         public struct TCCommonError: TCServiceErrorType
@@ -52,5 +58,5 @@ func buildCommonErrorStructDecl(from errors: [CommonError]) throws -> DeclSyntax
                 }
                 """)
         }
-    }.as(DeclSyntax.self)!
+    }
 }

Sources/TecoCommonErrorGenerator/builder.swift

@@ -1,4 +1,8 @@
+#if compiler(>=6.0)
+private import OrderedCollections
+#else
 @_implementationOnly import OrderedCollections
+#endif
 
 // https://cloud.tencent.com/document/product/213/30435#.E5.85.AC.E5.85.B1.E9.94.99.E8.AF.AF.E7.A0.81
 private let tcCommonErrors: [String : String] = [

Sources/TecoCommonErrorGenerator/data.swift

@@ -1,10 +1,19 @@
+#if compiler(>=6.0)
+private import ArgumentParser
+private import struct Foundation.URL
+private import SwiftSyntax
+private import SwiftSyntaxBuilder
+private import TecoCodeGeneratorCommons
+#else
 import ArgumentParser
+import struct Foundation.URL
 import SwiftSyntax
 import SwiftSyntaxBuilder
 import TecoCodeGeneratorCommons
+#endif
 
 @main
-struct TecoCommonErrorGenerator: TecoCodeGenerator {
+private struct TecoCommonErrorGenerator: TecoCodeGenerator {
     static let startingYear = 2022
 
     @Option(name: .shortAndLong, completion: .file(extensions: ["swift"]), transform: URL.init(fileURLWithPath:))

Sources/TecoCommonErrorGenerator/generator.swift

@@ -1,6 +1,14 @@
+#if compiler(>=6.0)
+private import ArgumentParser
+private import TecoCodeGeneratorCommons
+internal import class Foundation.JSONDecoder
+internal import struct Foundation.URL
+#else
 import ArgumentParser
 import TecoCodeGeneratorCommons
 import class Foundation.JSONDecoder
+import struct Foundation.URL
+#endif
 
 struct CommonError {
     let code: String

Sources/TecoCommonErrorGenerator/helpers.swift

@@ -1,5 +1,10 @@
+#if compiler(>=6.0)
+internal import SwiftSyntax
+private import SwiftSyntaxBuilder
+#else
 import SwiftSyntax
 import SwiftSyntaxBuilder
+#endif
 
 @CodeBlockItemListBuilder
 func buildImportDecls(for encoding: DateEncoding) -> CodeBlockItemListSyntax {
@@ -16,7 +21,7 @@ func buildImportDecls(for encoding: DateEncoding) -> CodeBlockItemListSyntax {
     DeclSyntax("@_implementationOnly import struct NIOConcurrencyHelpers.NIOLockedValueBox")
 }
 
-func buildDateFormatterDecl(for encoding: DateEncoding) -> DeclSyntax {
+func buildDateFormatterDecl(for encoding: DateEncoding) -> some DeclSyntaxProtocol {
     let dateFormat: String
     switch encoding {
     case .date: