diff --git a/.swift-format b/.swift-format index d3464f15b86..6c125bef6ee 100644 --- a/.swift-format +++ b/.swift-format @@ -10,6 +10,7 @@ "AlwaysUseLowerCamelCase": false, "AmbiguousTrailingClosureOverload": false, "NoBlockComments": false, + "OrderedImports": true, "UseLetInEveryBoundCaseVariable": false, "UseSynthesizedInitializer": false } diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index c537d705ca8..ecd3c7e95e8 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -1,7 +1,7 @@ // swift-tools-version:5.7 -import PackageDescription import Foundation +import PackageDescription let package = Package( name: "CodeGeneration", diff --git a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift index 0f001b0300b..9a4336260b1 100644 --- a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift +++ b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftSyntax -import SyntaxSupport import SwiftSyntaxBuilder +import SyntaxSupport import Utils let resultBuildersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) { diff --git a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift index 381f43861d3..074b6d6117f 100644 --- a/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift +++ b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftSyntax -import SyntaxSupport import SwiftSyntaxBuilder +import SyntaxSupport import Utils let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) { diff --git a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift index a0228fa70fb..179c4a30e77 100644 --- a/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift +++ b/CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift @@ -11,7 +11,6 @@ //===----------------------------------------------------------------------===// import SyntaxSupport - import XCTest fileprivate func assertNoFailures( diff --git a/EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift b/EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift index c76db7df240..ab7095fbdfb 100644 --- a/EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift +++ b/EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import Darwin -import MachO import Foundation +import MachO import SwiftRefactor extension SourceEditorExtension { diff --git a/EditorExtension/SwiftRefactorExtension/SourceEditorCommand.swift b/EditorExtension/SwiftRefactorExtension/SourceEditorCommand.swift index bfabd58b19a..777119368c5 100644 --- a/EditorExtension/SwiftRefactorExtension/SourceEditorCommand.swift +++ b/EditorExtension/SwiftRefactorExtension/SourceEditorCommand.swift @@ -11,10 +11,10 @@ //===----------------------------------------------------------------------===// import Foundation -import XcodeKit import SwiftParser import SwiftRefactor import SwiftSyntax +import XcodeKit enum ExtensionError: Error { case unsupportedContentType diff --git a/EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift b/EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift index 4080b69133e..a96467ce7ce 100644 --- a/EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift +++ b/EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import Foundation -import XcodeKit import SwiftRefactor +import XcodeKit final class SourceEditorExtension: NSObject, XCSourceEditorExtension { func extensionDidFinishLaunching() { diff --git a/Examples/Package.swift b/Examples/Package.swift index f10a7c4a48b..c8b57bdead1 100644 --- a/Examples/Package.swift +++ b/Examples/Package.swift @@ -1,7 +1,7 @@ // swift-tools-version: 5.9 -import PackageDescription import CompilerPluginSupport +import PackageDescription let package = Package( name: "Examples", diff --git a/Examples/Sources/AddOneToIntegerLiterals/AddOneToIntegerLiterals.swift b/Examples/Sources/AddOneToIntegerLiterals/AddOneToIntegerLiterals.swift index b236587d625..3fcc35ffac3 100644 --- a/Examples/Sources/AddOneToIntegerLiterals/AddOneToIntegerLiterals.swift +++ b/Examples/Sources/AddOneToIntegerLiterals/AddOneToIntegerLiterals.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax /// AddOneToIntegerLiterals will visit each token in the Syntax tree, and /// (if it is an integer literal token) add 1 to the integer and return the diff --git a/Examples/Sources/MacroExamples/Implementation/AddBlocker.swift b/Examples/Sources/MacroExamples/Implementation/AddBlocker.swift index 61ccaabeb45..b0db043c544 100644 --- a/Examples/Sources/MacroExamples/Implementation/AddBlocker.swift +++ b/Examples/Sources/MacroExamples/Implementation/AddBlocker.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntaxMacros -import SwiftSyntax -import SwiftOperators import SwiftDiagnostics +import SwiftOperators +import SwiftSyntax +import SwiftSyntaxMacros /// Implementation of the `addBlocker` macro, which demonstrates how to /// produce detailed diagnostics from a macro implementation for an utterly diff --git a/Examples/Sources/MacroExamples/Implementation/Diagnostics.swift b/Examples/Sources/MacroExamples/Implementation/Diagnostics.swift index b60ff891a41..83a08df54cb 100644 --- a/Examples/Sources/MacroExamples/Implementation/Diagnostics.swift +++ b/Examples/Sources/MacroExamples/Implementation/Diagnostics.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftDiagnostics +import SwiftSyntax struct SimpleDiagnosticMessage: DiagnosticMessage, Error { let message: String diff --git a/Examples/Sources/MacroExamples/Implementation/MetaEnumMacro.swift b/Examples/Sources/MacroExamples/Implementation/MetaEnumMacro.swift index 02bc8caa495..780a1f2cb37 100644 --- a/Examples/Sources/MacroExamples/Implementation/MetaEnumMacro.swift +++ b/Examples/Sources/MacroExamples/Implementation/MetaEnumMacro.swift @@ -12,8 +12,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxBuilder +import SwiftSyntaxMacros public struct MetaEnumMacro { let parentTypeName: TokenSyntax diff --git a/Examples/Sources/MacroExamples/Playground/main.swift b/Examples/Sources/MacroExamples/Playground/main.swift index 6f531363fcb..6df22c096d6 100644 --- a/Examples/Sources/MacroExamples/Playground/main.swift +++ b/Examples/Sources/MacroExamples/Playground/main.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import MacroExamplesInterface import Foundation +import MacroExamplesInterface let x = 1 let y = 2 diff --git a/Examples/Tests/MacroExamples/Implementation/MacroExamplesPluginTest.swift b/Examples/Tests/MacroExamples/Implementation/MacroExamplesPluginTest.swift index ee1bb726613..28778075cb5 100644 --- a/Examples/Tests/MacroExamples/Implementation/MacroExamplesPluginTest.swift +++ b/Examples/Tests/MacroExamples/Implementation/MacroExamplesPluginTest.swift @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// +import MacroExamplesImplementation import SwiftSyntax import SwiftSyntaxBuilder -import SwiftSyntaxMacros -import MacroExamplesImplementation import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import XCTest var testMacros: [String: Macro.Type] = [ diff --git a/Examples/Tests/MacroExamples/Implementation/MetaEnumMacroTests.swift b/Examples/Tests/MacroExamples/Implementation/MetaEnumMacroTests.swift index 3e46df6eaa4..9e852839dfb 100644 --- a/Examples/Tests/MacroExamples/Implementation/MetaEnumMacroTests.swift +++ b/Examples/Tests/MacroExamples/Implementation/MetaEnumMacroTests.swift @@ -10,12 +10,12 @@ // //===----------------------------------------------------------------------===// -import XCTest +import MacroExamplesImplementation import SwiftSyntax import SwiftSyntaxBuilder -import SwiftSyntaxMacros -import MacroExamplesImplementation import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros +import XCTest final class CaseMacroTests: XCTestCase { let testMacros: [String: Macro.Type] = [ diff --git a/Examples/Tests/MacroExamples/Implementation/NewTypePluginTests.swift b/Examples/Tests/MacroExamples/Implementation/NewTypePluginTests.swift index ad71adcdc01..218c942cc90 100644 --- a/Examples/Tests/MacroExamples/Implementation/NewTypePluginTests.swift +++ b/Examples/Tests/MacroExamples/Implementation/NewTypePluginTests.swift @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// +import MacroExamplesImplementation import SwiftSyntax import SwiftSyntaxBuilder -import SwiftSyntaxMacros -import MacroExamplesImplementation import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import XCTest final class NewTypePluginTests: XCTestCase { diff --git a/Package.swift b/Package.swift index 40c35791839..2354a088271 100644 --- a/Package.swift +++ b/Package.swift @@ -1,7 +1,7 @@ // swift-tools-version:5.7 -import PackageDescription import Foundation +import PackageDescription var swiftSyntaxSwiftSettings: [SwiftSetting] = [] var swiftSyntaxBuilderSwiftSettings: [SwiftSetting] = [] diff --git a/Sources/SwiftCompilerPlugin/CompilerPlugin.swift b/Sources/SwiftCompilerPlugin/CompilerPlugin.swift index 37fa376f15a..23a2b22cdb2 100644 --- a/Sources/SwiftCompilerPlugin/CompilerPlugin.swift +++ b/Sources/SwiftCompilerPlugin/CompilerPlugin.swift @@ -12,10 +12,10 @@ // NOTE: This basic plugin mechanism is mostly copied from // https://github.com/apple/swift-package-manager/blob/main/Sources/PackagePlugin/Plugin.swift -import SwiftSyntaxMacros +@_implementationOnly import Foundation @_implementationOnly import SwiftCompilerPluginMessageHandling +import SwiftSyntaxMacros -@_implementationOnly import Foundation #if os(Windows) @_implementationOnly import ucrt #endif diff --git a/Sources/SwiftCompilerPluginMessageHandling/Macros.swift b/Sources/SwiftCompilerPluginMessageHandling/Macros.swift index fcf869162dd..5d65f8899df 100644 --- a/Sources/SwiftCompilerPluginMessageHandling/Macros.swift +++ b/Sources/SwiftCompilerPluginMessageHandling/Macros.swift @@ -14,8 +14,8 @@ import SwiftBasicFormat import SwiftDiagnostics import SwiftOperators import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros extension CompilerPluginMessageHandler { /// Get concrete macro type from a pair of module name and type name. diff --git a/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift b/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift index 5efa8121845..63629880d5a 100644 --- a/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift +++ b/Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics -import SwiftParser import SwiftOperators +import SwiftParser import SwiftSyntax import SwiftSyntaxMacros diff --git a/Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift b/Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift index 912bd529f75..35ae9364a19 100644 --- a/Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift +++ b/Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftDiagnostics import SwiftBasicFormat +import SwiftDiagnostics @_spi(RawSyntax) import SwiftSyntax extension FixIt { diff --git a/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift b/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift index 331ef89254d..9a59b1ded2b 100644 --- a/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift +++ b/Sources/SwiftParserDiagnostics/LexerDiagnosticMessages.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics -@_spi(RawSyntax) import SwiftSyntax @_spi(Diagnostics) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax fileprivate let diagnosticDomain: String = "SwiftLexer" diff --git a/Sources/SwiftParserDiagnostics/MissingNodesError.swift b/Sources/SwiftParserDiagnostics/MissingNodesError.swift index b03a8fbae2b..74f73c0d63f 100644 --- a/Sources/SwiftParserDiagnostics/MissingNodesError.swift +++ b/Sources/SwiftParserDiagnostics/MissingNodesError.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// +import SwiftBasicFormat import SwiftDiagnostics @_spi(RawSyntax) import SwiftSyntax -import SwiftBasicFormat // MARK: - Shared code diff --git a/Sources/SwiftParserDiagnostics/MissingTokenError.swift b/Sources/SwiftParserDiagnostics/MissingTokenError.swift index a54e9bb800b..b1c3dd8a9ce 100644 --- a/Sources/SwiftParserDiagnostics/MissingTokenError.swift +++ b/Sources/SwiftParserDiagnostics/MissingTokenError.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics -@_spi(RawSyntax) import SwiftSyntax @_spi(Diagnostics) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax extension ParseDiagnosticsGenerator { func handleMissingToken(_ missingToken: TokenSyntax) { diff --git a/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift b/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift index 70205eba144..8d210bd5be6 100644 --- a/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift +++ b/Sources/SwiftParserDiagnostics/ParserDiagnosticMessages.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics -@_spi(RawSyntax) import SwiftSyntax @_spi(Diagnostics) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax fileprivate let diagnosticDomain: String = "SwiftParser" diff --git a/Sources/SwiftParserDiagnostics/PresenceUtils.swift b/Sources/SwiftParserDiagnostics/PresenceUtils.swift index b8acee29b73..bab06afe40c 100644 --- a/Sources/SwiftParserDiagnostics/PresenceUtils.swift +++ b/Sources/SwiftParserDiagnostics/PresenceUtils.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax import SwiftBasicFormat +@_spi(RawSyntax) import SwiftSyntax /// Walks a tree and checks whether the tree contained any present tokens. class PresentNodeChecker: SyntaxAnyVisitor { diff --git a/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift b/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift index 47f251add25..e5e14afcec9 100644 --- a/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift +++ b/Sources/SwiftParserDiagnostics/SyntaxExtensions.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(Diagnostics) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax extension UnexpectedNodesSyntax { func presentTokens(satisfying isIncluded: (TokenSyntax) -> Bool) -> [TokenSyntax] { diff --git a/Sources/SwiftRefactor/MigrateToNewIfLetSyntax.swift b/Sources/SwiftRefactor/MigrateToNewIfLetSyntax.swift index cfd4d12910f..022d65ac956 100644 --- a/Sources/SwiftRefactor/MigrateToNewIfLetSyntax.swift +++ b/Sources/SwiftRefactor/MigrateToNewIfLetSyntax.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax /// ``MigrateToNewIfLetSyntax`` will visit each if expression in the Syntax tree, and /// checks if there is an if condition which is of the pre Swift 5.7 "if-let-style" diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step10.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step10.swift index 734ea194a96..b4227242532 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step10.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step10.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step11.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step11.swift index 79dd9a109b3..85859238dcf 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step11.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step11.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step3.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step3.swift index b59201f533a..52ae726c33e 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step3.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step3.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step4.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step4.swift index 9b1c1a234a0..398323377c6 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step4.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step4.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step5.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step5.swift index 60084eb76d6..ecb399b1d1a 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step5.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step5.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step6.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step6.swift index 116fcdf6f1e..0145467d201 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step6.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step6.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step7.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step7.swift index ecb2c685b35..f1b69f749de 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step7.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step7.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step8.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step8.swift index 4ebf10da689..f14d5633b13 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step8.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step8.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step9.swift b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step9.swift index f796ee6f0e3..9cf549ec99d 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step9.swift +++ b/Sources/SwiftSyntax/Documentation.docc/Resources/Formatter.step9.swift @@ -1,6 +1,6 @@ -import SwiftSyntax -import SwiftParser import Foundation +import SwiftParser +import SwiftSyntax @main struct ImportFormatter { static func main() { diff --git a/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift b/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift index 9a8436b0b9f..7c3dddd83b1 100644 --- a/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift +++ b/Sources/SwiftSyntaxBuilder/Syntax+StringInterpolation.swift @@ -12,8 +12,8 @@ import SwiftBasicFormat import SwiftDiagnostics -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) @_spi(Testing) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax /// An individual interpolated syntax node. struct InterpolatedSyntaxNode { diff --git a/Sources/SwiftSyntaxBuilder/SyntaxParsable+ExpressibleByStringInterpolation.swift b/Sources/SwiftSyntaxBuilder/SyntaxParsable+ExpressibleByStringInterpolation.swift index 370d8a4a8c8..741d26bb0ba 100644 --- a/Sources/SwiftSyntaxBuilder/SyntaxParsable+ExpressibleByStringInterpolation.swift +++ b/Sources/SwiftSyntaxBuilder/SyntaxParsable+ExpressibleByStringInterpolation.swift @@ -11,9 +11,10 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics -import SwiftSyntax import SwiftParser import SwiftParserDiagnostics +import SwiftSyntax + // Don't introduce a dependency on OSLog when building SwiftSyntax using CMake // for the compiler. #if canImport(OSLog) && !SWIFTSYNTAX_NO_OSLOG_DEPENDENCY diff --git a/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift b/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift index 89bc57fb000..15fe31d55d5 100644 --- a/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift +++ b/Sources/SwiftSyntaxBuilder/ValidatingSyntaxNodes.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftDiagnostics import SwiftParserDiagnostics +import SwiftSyntax extension SyntaxProtocol { /// If `node` has contains no syntax errors, return `node`, otherwise diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift b/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift index a810d85b476..25050c4b912 100644 --- a/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift +++ b/Sources/SwiftSyntaxMacroExpansion/MacroExpansion.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftBasicFormat +import SwiftSyntax @_spi(MacroExpansion) import SwiftSyntaxMacros public enum MacroRole { diff --git a/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift b/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift index 33658be811e..44e1e087ac9 100644 --- a/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift +++ b/Sources/SwiftSyntaxMacroExpansion/MacroSystem.swift @@ -11,9 +11,9 @@ //===----------------------------------------------------------------------===// import SwiftDiagnostics +@_spi(MacroExpansion) import SwiftParser import SwiftSyntax import SwiftSyntaxBuilder -@_spi(MacroExpansion) import SwiftParser @_spi(MacroExpansion) import SwiftSyntaxMacros // MARK: - Public entry function diff --git a/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift b/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift index b38dc156e0d..402450dcce7 100644 --- a/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift +++ b/Sources/SwiftSyntaxMacrosTestSupport/Assertions.swift @@ -10,15 +10,15 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport import SwiftBasicFormat import SwiftDiagnostics import SwiftParser import SwiftParserDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import XCTest +import _SwiftSyntaxTestSupport // MARK: - Note diff --git a/Sources/_SwiftSyntaxTestSupport/IncrementalParseTestUtils.swift b/Sources/_SwiftSyntaxTestSupport/IncrementalParseTestUtils.swift index 5dafa577da1..d3bba1e5b4a 100644 --- a/Sources/_SwiftSyntaxTestSupport/IncrementalParseTestUtils.swift +++ b/Sources/_SwiftSyntaxTestSupport/IncrementalParseTestUtils.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest /// This function is used to verify the correctness of incremental parsing diff --git a/Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift b/Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift index 2097683b305..32b203787ca 100644 --- a/Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift +++ b/Sources/_SwiftSyntaxTestSupport/SyntaxProtocol+Initializer.swift @@ -11,9 +11,9 @@ //===----------------------------------------------------------------------===// import SwiftBasicFormat +@_spi(Testing) import SwiftParser @_spi(RawSyntax) import SwiftSyntax import SwiftSyntaxBuilder -@_spi(Testing) import SwiftParser private class InitializerExprFormat: BasicFormat { public init() { diff --git a/Sources/swift-parser-cli/BasicFormat.swift b/Sources/swift-parser-cli/BasicFormat.swift index 09f884d177a..3ff12c6d301 100644 --- a/Sources/swift-parser-cli/BasicFormat.swift +++ b/Sources/swift-parser-cli/BasicFormat.swift @@ -13,9 +13,9 @@ import ArgumentParser import SwiftBasicFormat import SwiftDiagnostics -import SwiftSyntax import SwiftParser import SwiftParserDiagnostics +import SwiftSyntax struct BasicFormat: ParsableCommand, ParseCommand { enum Error: Swift.Error, CustomStringConvertible { diff --git a/Sources/swift-parser-cli/Commands/PerformanceTest.swift b/Sources/swift-parser-cli/Commands/PerformanceTest.swift index 3463eda3a8c..300b175cbd0 100644 --- a/Sources/swift-parser-cli/Commands/PerformanceTest.swift +++ b/Sources/swift-parser-cli/Commands/PerformanceTest.swift @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// -import _InstructionCounter import ArgumentParser import Foundation import SwiftParser import SwiftSyntax +import _InstructionCounter struct PerformanceTest: ParsableCommand { static var configuration = CommandConfiguration( diff --git a/Sources/swift-parser-cli/Commands/PrintTree.swift b/Sources/swift-parser-cli/Commands/PrintTree.swift index 8b5d1206614..fa35da89b62 100644 --- a/Sources/swift-parser-cli/Commands/PrintTree.swift +++ b/Sources/swift-parser-cli/Commands/PrintTree.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import ArgumentParser -import SwiftSyntax import SwiftParser +import SwiftSyntax struct PrintTree: ParsableCommand, ParseCommand { static var configuration = CommandConfiguration( diff --git a/Sources/swift-parser-cli/Commands/Reduce.swift b/Sources/swift-parser-cli/Commands/Reduce.swift index ea2e8ac4c69..43921838359 100644 --- a/Sources/swift-parser-cli/Commands/Reduce.swift +++ b/Sources/swift-parser-cli/Commands/Reduce.swift @@ -12,6 +12,7 @@ import ArgumentParser import Foundation + #if os(Windows) import WinSDK #endif diff --git a/Sources/swift-parser-cli/Commands/VerifyRoundTrip.swift b/Sources/swift-parser-cli/Commands/VerifyRoundTrip.swift index 07ad00d6d3f..9503596fb09 100644 --- a/Sources/swift-parser-cli/Commands/VerifyRoundTrip.swift +++ b/Sources/swift-parser-cli/Commands/VerifyRoundTrip.swift @@ -12,9 +12,9 @@ import ArgumentParser import SwiftDiagnostics -import SwiftSyntax import SwiftParser import SwiftParserDiagnostics +import SwiftSyntax struct VerifyRoundTrip: ParsableCommand, ParseCommand { static var configuration = CommandConfiguration( diff --git a/Sources/swift-parser-cli/swift-parser-cli.swift b/Sources/swift-parser-cli/swift-parser-cli.swift index 91aaf46d793..d2b51ead174 100644 --- a/Sources/swift-parser-cli/swift-parser-cli.swift +++ b/Sources/swift-parser-cli/swift-parser-cli.swift @@ -10,14 +10,15 @@ // //===----------------------------------------------------------------------===// -import _InstructionCounter +import ArgumentParser +import Foundation import SwiftDiagnostics -import SwiftSyntax +import SwiftOperators import SwiftParser import SwiftParserDiagnostics -import SwiftOperators -import Foundation -import ArgumentParser +import SwiftSyntax +import _InstructionCounter + #if os(Windows) import WinSDK #endif diff --git a/SwiftSyntaxDevUtils/Package.swift b/SwiftSyntaxDevUtils/Package.swift index 58bc77abd4f..fc603fa0967 100644 --- a/SwiftSyntaxDevUtils/Package.swift +++ b/SwiftSyntaxDevUtils/Package.swift @@ -1,7 +1,7 @@ // swift-tools-version:5.7 -import PackageDescription import Foundation +import PackageDescription let package = Package( name: "swift-syntax-dev-utils", diff --git a/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift b/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift index 90c1f7ec392..912e4807e44 100644 --- a/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift +++ b/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift @@ -10,7 +10,6 @@ // //===----------------------------------------------------------------------===// -import Foundation import ArgumentParser import Dispatch import Foundation diff --git a/Tests/PerformanceTest/ParsingPerformanceTests.swift b/Tests/PerformanceTest/ParsingPerformanceTests.swift index 5db62d876f5..805c8d96f7c 100644 --- a/Tests/PerformanceTest/ParsingPerformanceTests.swift +++ b/Tests/PerformanceTest/ParsingPerformanceTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest public class ParsingPerformanceTests: XCTestCase { diff --git a/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift b/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift index ef1ddd8c599..70cea58a475 100644 --- a/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift +++ b/Tests/PerformanceTest/SyntaxClassifierPerformanceTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftIDEUtils -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest public class SyntaxClassifierPerformanceTests: XCTestCase { diff --git a/Tests/PerformanceTest/VisitorPerformanceTests.swift b/Tests/PerformanceTest/VisitorPerformanceTests.swift index 57a713539ca..796d0c0b5cb 100644 --- a/Tests/PerformanceTest/VisitorPerformanceTests.swift +++ b/Tests/PerformanceTest/VisitorPerformanceTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest public class VisitorPerformanceTests: XCTestCase { diff --git a/Tests/SwiftBasicFormatTest/BasicFormatTests.swift b/Tests/SwiftBasicFormatTest/BasicFormatTests.swift index 1cfd5bb3d4a..744cce1aa62 100644 --- a/Tests/SwiftBasicFormatTest/BasicFormatTests.swift +++ b/Tests/SwiftBasicFormatTest/BasicFormatTests.swift @@ -12,9 +12,8 @@ import SwiftBasicFormat import SwiftParser -@_spi(Testing) import SwiftSyntaxBuilder import SwiftSyntax - +@_spi(Testing) import SwiftSyntaxBuilder import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftCompilerPluginTest/CompilerPluginTests.swift b/Tests/SwiftCompilerPluginTest/CompilerPluginTests.swift index 2b201966ccb..1ccab7946c6 100644 --- a/Tests/SwiftCompilerPluginTest/CompilerPluginTests.swift +++ b/Tests/SwiftCompilerPluginTest/CompilerPluginTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftCompilerPlugin import SwiftSyntax import SwiftSyntaxMacros +import XCTest /// Dummy macro struct DummyMacro: ExpressionMacro { diff --git a/Tests/SwiftDiagnosticsTest/DiagnosticsFormatterTests.swift b/Tests/SwiftDiagnosticsTest/DiagnosticsFormatterTests.swift index e601a22afd1..a4a8ca139ce 100644 --- a/Tests/SwiftDiagnosticsTest/DiagnosticsFormatterTests.swift +++ b/Tests/SwiftDiagnosticsTest/DiagnosticsFormatterTests.swift @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport -import XCTest import SwiftDiagnostics import SwiftParser import SwiftParserDiagnostics +import XCTest +import _SwiftSyntaxTestSupport final class DiagnosticsFormatterTests: XCTestCase { diff --git a/Tests/SwiftDiagnosticsTest/GroupDiagnosticsFormatterTests.swift b/Tests/SwiftDiagnosticsTest/GroupDiagnosticsFormatterTests.swift index d1c8d99704b..60a38e2804d 100644 --- a/Tests/SwiftDiagnosticsTest/GroupDiagnosticsFormatterTests.swift +++ b/Tests/SwiftDiagnosticsTest/GroupDiagnosticsFormatterTests.swift @@ -10,12 +10,12 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport -import XCTest import SwiftDiagnostics import SwiftParser import SwiftParserDiagnostics import SwiftSyntax +import XCTest +import _SwiftSyntaxTestSupport struct SimpleDiagnosticMessage: DiagnosticMessage { let message: String diff --git a/Tests/SwiftIDEUtilsTest/Assertions.swift b/Tests/SwiftIDEUtilsTest/Assertions.swift index 90c427fd981..856b4f2b19d 100644 --- a/Tests/SwiftIDEUtilsTest/Assertions.swift +++ b/Tests/SwiftIDEUtilsTest/Assertions.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftIDEUtils import SwiftParser import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport /// Parse `source` and checks its `classifications` is the same as `expected`. diff --git a/Tests/SwiftIDEUtilsTest/ClassificationTests.swift b/Tests/SwiftIDEUtilsTest/ClassificationTests.swift index f39fb6352d5..0c4c4c6bb06 100644 --- a/Tests/SwiftIDEUtilsTest/ClassificationTests.swift +++ b/Tests/SwiftIDEUtilsTest/ClassificationTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftIDEUtils -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport public class ClassificationTests: XCTestCase { diff --git a/Tests/SwiftOperatorsTest/OperatorTableTests.swift b/Tests/SwiftOperatorsTest/OperatorTableTests.swift index 03e23cbe02c..b572c1d6329 100644 --- a/Tests/SwiftOperatorsTest/OperatorTableTests.swift +++ b/Tests/SwiftOperatorsTest/OperatorTableTests.swift @@ -1,3 +1,6 @@ +@_spi(Testing) import SwiftOperators +import SwiftParser +import SwiftSyntax //===----------------------------------------------------------------------===// // // This source file is part of the Swift.org open source project @@ -10,9 +13,6 @@ // //===----------------------------------------------------------------------===// import XCTest -import SwiftSyntax -import SwiftParser -@_spi(Testing) import SwiftOperators import _SwiftSyntaxTestSupport /// Visitor that looks for ExprSequenceSyntax nodes. diff --git a/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift b/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift index 6f04057dfa9..8c49705bf88 100644 --- a/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift +++ b/Tests/SwiftOperatorsTest/SyntaxSynthesisTests.swift @@ -1,3 +1,5 @@ +import SwiftOperators +import SwiftSyntax //===----------------------------------------------------------------------===// // // This source file is part of the Swift.org open source project @@ -10,8 +12,6 @@ // //===----------------------------------------------------------------------===// import XCTest -import SwiftSyntax -import SwiftOperators public class SyntaxSynthesisTests: XCTestCase { func testInfixOperator() { diff --git a/Tests/SwiftParserDiagnosticsTest/DiagnosticInfrastructureTests.swift b/Tests/SwiftParserDiagnosticsTest/DiagnosticInfrastructureTests.swift index f45306e82aa..0ee174ed709 100644 --- a/Tests/SwiftParserDiagnosticsTest/DiagnosticInfrastructureTests.swift +++ b/Tests/SwiftParserDiagnosticsTest/DiagnosticInfrastructureTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftDiagnostics import SwiftParserDiagnostics +import XCTest public class DiagnosticInfrastructureTests: XCTestCase { public func testDiagnosticID() { diff --git a/Tests/SwiftParserTest/AbsolutePositionTests.swift b/Tests/SwiftParserTest/AbsolutePositionTests.swift index 7181fd88f5d..2df49f24edf 100644 --- a/Tests/SwiftParserTest/AbsolutePositionTests.swift +++ b/Tests/SwiftParserTest/AbsolutePositionTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport public class AbsolutePositionTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/Assertions.swift b/Tests/SwiftParserTest/Assertions.swift index 411d05b1dd2..54f3536fa0a 100644 --- a/Tests/SwiftParserTest/Assertions.swift +++ b/Tests/SwiftParserTest/Assertions.swift @@ -10,11 +10,11 @@ // //===----------------------------------------------------------------------===// -import XCTest -@_spi(RawSyntax) import SwiftSyntax +import SwiftDiagnostics @_spi(Testing) @_spi(RawSyntax) @_spi(AlternateTokenIntrospection) @_spi(ExperimentalLanguageFeatures) import SwiftParser @_spi(RawSyntax) import SwiftParserDiagnostics -import SwiftDiagnostics +@_spi(RawSyntax) import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport // MARK: Lexing Assertions diff --git a/Tests/SwiftParserTest/AttributeTests.swift b/Tests/SwiftParserTest/AttributeTests.swift index d21067c9a82..4fcc8fa76d3 100644 --- a/Tests/SwiftParserTest/AttributeTests.swift +++ b/Tests/SwiftParserTest/AttributeTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class AttributeTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/AvailabilityTests.swift b/Tests/SwiftParserTest/AvailabilityTests.swift index 506699259fb..74c0e78e856 100644 --- a/Tests/SwiftParserTest/AvailabilityTests.swift +++ b/Tests/SwiftParserTest/AvailabilityTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class AvailabilityTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/DeclarationTests.swift b/Tests/SwiftParserTest/DeclarationTests.swift index 130a89586e7..190873659a1 100644 --- a/Tests/SwiftParserTest/DeclarationTests.swift +++ b/Tests/SwiftParserTest/DeclarationTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax +import SwiftBasicFormat @_spi(Testing) @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import SwiftSyntaxBuilder -import SwiftBasicFormat import XCTest final class DeclarationTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/DirectiveTests.swift b/Tests/SwiftParserTest/DirectiveTests.swift index f8bf2222234..d89d1431d1f 100644 --- a/Tests/SwiftParserTest/DirectiveTests.swift +++ b/Tests/SwiftParserTest/DirectiveTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class DirectiveTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/ExpressionTests.swift b/Tests/SwiftParserTest/ExpressionTests.swift index e679c0b5c51..24880439f82 100644 --- a/Tests/SwiftParserTest/ExpressionTests.swift +++ b/Tests/SwiftParserTest/ExpressionTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class ExpressionTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/IncrementalParsingTests.swift b/Tests/SwiftParserTest/IncrementalParsingTests.swift index 38faabbb246..9d460faeafe 100644 --- a/Tests/SwiftParserTest/IncrementalParsingTests.swift +++ b/Tests/SwiftParserTest/IncrementalParsingTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport public class IncrementalParsingTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/LexerTests.swift b/Tests/SwiftParserTest/LexerTests.swift index 6280890bced..f56a76f16a2 100644 --- a/Tests/SwiftParserTest/LexerTests.swift +++ b/Tests/SwiftParserTest/LexerTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) @_spi(Testing) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax +import XCTest fileprivate func lex(_ sourceBytes: [UInt8], body: ([Lexer.Lexeme]) throws -> Void) rethrows { let lookaheadTracker = UnsafeMutablePointer.allocate(capacity: 1) diff --git a/Tests/SwiftParserTest/Parser+EntryTests.swift b/Tests/SwiftParserTest/Parser+EntryTests.swift index 3a788c140bb..61346e1ab85 100644 --- a/Tests/SwiftParserTest/Parser+EntryTests.swift +++ b/Tests/SwiftParserTest/Parser+EntryTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest public class EntryTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/ParserTestCase.swift b/Tests/SwiftParserTest/ParserTestCase.swift index 1d593d19f48..287833b31f8 100644 --- a/Tests/SwiftParserTest/ParserTestCase.swift +++ b/Tests/SwiftParserTest/ParserTestCase.swift @@ -10,10 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax - @_spi(ExperimentalLanguageFeatures) import SwiftParser +import SwiftSyntax +import XCTest /// The base class for all parser test cases. public class ParserTestCase: XCTestCase { diff --git a/Tests/SwiftParserTest/ParserTests.swift b/Tests/SwiftParserTest/ParserTests.swift index 7e18a8756b2..a597aba827c 100644 --- a/Tests/SwiftParserTest/ParserTests.swift +++ b/Tests/SwiftParserTest/ParserTests.swift @@ -10,12 +10,12 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport import Dispatch -import XCTest -import SwiftSyntax import SwiftParser import SwiftParserDiagnostics +import SwiftSyntax +import XCTest +import _SwiftSyntaxTestSupport public class ParserTests: ParserTestCase { /// Run a single parse test. diff --git a/Tests/SwiftParserTest/PatternTests.swift b/Tests/SwiftParserTest/PatternTests.swift index 2ba1c39a709..250f63020d8 100644 --- a/Tests/SwiftParserTest/PatternTests.swift +++ b/Tests/SwiftParserTest/PatternTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class PatternTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/RegexLiteralTests.swift b/Tests/SwiftParserTest/RegexLiteralTests.swift index dabcbfff912..4e679860219 100644 --- a/Tests/SwiftParserTest/RegexLiteralTests.swift +++ b/Tests/SwiftParserTest/RegexLiteralTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class RegexLiteralTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift b/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift index 1b962d2ef46..b140e4caa27 100644 --- a/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift +++ b/Tests/SwiftParserTest/SequentialToConcurrentEditTranslationTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport let longString = """ diff --git a/Tests/SwiftParserTest/StatementTests.swift b/Tests/SwiftParserTest/StatementTests.swift index a01f70ed7be..a3b1c1cfc76 100644 --- a/Tests/SwiftParserTest/StatementTests.swift +++ b/Tests/SwiftParserTest/StatementTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class StatementTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/StringLiteralRepresentedLiteralValueTests.swift b/Tests/SwiftParserTest/StringLiteralRepresentedLiteralValueTests.swift index d1ba1fddadd..4d92f6eb977 100644 --- a/Tests/SwiftParserTest/StringLiteralRepresentedLiteralValueTests.swift +++ b/Tests/SwiftParserTest/StringLiteralRepresentedLiteralValueTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest -import SwiftSyntax import SwiftParser +import SwiftSyntax import SwiftSyntaxBuilder +import XCTest /// Test ``StringLiteralExprSyntax/representedLiteralValue``. /// diff --git a/Tests/SwiftParserTest/SyntaxTransformVisitorTest.swift b/Tests/SwiftParserTest/SyntaxTransformVisitorTest.swift index c59da8fe0d7..b011dc9c688 100644 --- a/Tests/SwiftParserTest/SyntaxTransformVisitorTest.swift +++ b/Tests/SwiftParserTest/SyntaxTransformVisitorTest.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftParser @_spi(SyntaxTransformVisitor) import SwiftSyntax +import XCTest final class SyntaxTransformVisitorTest: ParserTestCase { public func testFunctionCounter() { diff --git a/Tests/SwiftParserTest/ThenStatementTests.swift b/Tests/SwiftParserTest/ThenStatementTests.swift index b774248350f..6435b60a304 100644 --- a/Tests/SwiftParserTest/ThenStatementTests.swift +++ b/Tests/SwiftParserTest/ThenStatementTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftSyntax @_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftParser +@_spi(RawSyntax) @_spi(ExperimentalLanguageFeatures) import SwiftSyntax import XCTest final class ThenStatementTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/TriviaParserTests.swift b/Tests/SwiftParserTest/TriviaParserTests.swift index 0de0cc5e176..5ff85c8db8a 100644 --- a/Tests/SwiftParserTest/TriviaParserTests.swift +++ b/Tests/SwiftParserTest/TriviaParserTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) @_spi(Testing) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax +import XCTest final class TriviaParserTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/TypeCompositionTests.swift b/Tests/SwiftParserTest/TypeCompositionTests.swift index d0f9ce14e83..0e6adf5c657 100644 --- a/Tests/SwiftParserTest/TypeCompositionTests.swift +++ b/Tests/SwiftParserTest/TypeCompositionTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest final class TypeCompositionTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/TypeMemberTests.swift b/Tests/SwiftParserTest/TypeMemberTests.swift index a5681d92c3e..b839b60f10a 100644 --- a/Tests/SwiftParserTest/TypeMemberTests.swift +++ b/Tests/SwiftParserTest/TypeMemberTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest final class TypeMemberTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/TypeMetatypeTests.swift b/Tests/SwiftParserTest/TypeMetatypeTests.swift index 7cc024b016f..a5c506cd5fb 100644 --- a/Tests/SwiftParserTest/TypeMetatypeTests.swift +++ b/Tests/SwiftParserTest/TypeMetatypeTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest final class TypeMetatypeTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/TypeTests.swift b/Tests/SwiftParserTest/TypeTests.swift index 8571fb4f018..5be48f065fe 100644 --- a/Tests/SwiftParserTest/TypeTests.swift +++ b/Tests/SwiftParserTest/TypeTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class TypeTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/ErrorsTests.swift b/Tests/SwiftParserTest/translated/ErrorsTests.swift index 0a43fb9c238..3cdb753b354 100644 --- a/Tests/SwiftParserTest/translated/ErrorsTests.swift +++ b/Tests/SwiftParserTest/translated/ErrorsTests.swift @@ -13,7 +13,6 @@ // This test file has been translated from swift/test/Parse/errors.swift import SwiftSyntax - import XCTest final class ErrorsTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift b/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift index 11f45f1d34b..5b6a473a38a 100644 --- a/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift +++ b/Tests/SwiftParserTest/translated/ForwardSlashRegexTests.swift @@ -12,8 +12,8 @@ // This test file has been translated from swift/test/StringProcessing/Parse/forward-slash-regex.swift -@_spi(RawSyntax) import SwiftSyntax @_spi(RawSyntax) import SwiftParser +@_spi(RawSyntax) import SwiftSyntax import XCTest final class ForwardSlashRegexTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/GenericDisambiguationTests.swift b/Tests/SwiftParserTest/translated/GenericDisambiguationTests.swift index d9b916ecc6e..a429ce86707 100644 --- a/Tests/SwiftParserTest/translated/GenericDisambiguationTests.swift +++ b/Tests/SwiftParserTest/translated/GenericDisambiguationTests.swift @@ -13,7 +13,6 @@ // This test file has been translated from swift/test/Parse/generic_disambiguation.swift import SwiftSyntax - import XCTest final class GenericDisambiguationTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift b/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift index a49bbe06d0a..69b56b06e9f 100644 --- a/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift +++ b/Tests/SwiftParserTest/translated/HashbangLibraryTests.swift @@ -13,7 +13,6 @@ // This test file has been translated from swift/test/Parse/hashbang_library.swift import SwiftSyntax - import XCTest final class HashbangLibraryTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/IfconfigExprTests.swift b/Tests/SwiftParserTest/translated/IfconfigExprTests.swift index 312af3ae22d..24a60498c35 100644 --- a/Tests/SwiftParserTest/translated/IfconfigExprTests.swift +++ b/Tests/SwiftParserTest/translated/IfconfigExprTests.swift @@ -12,8 +12,8 @@ // This test file has been translated from swift/test/Parse/ifconfig_expr.swift -import XCTest import SwiftSyntax +import XCTest final class IfconfigExprTests: ParserTestCase { func testIfconfigExpr1() { diff --git a/Tests/SwiftParserTest/translated/InitDeinitTests.swift b/Tests/SwiftParserTest/translated/InitDeinitTests.swift index f87540f3129..e1b5690e0bd 100644 --- a/Tests/SwiftParserTest/translated/InitDeinitTests.swift +++ b/Tests/SwiftParserTest/translated/InitDeinitTests.swift @@ -13,7 +13,6 @@ // This test file has been translated from swift/test/Parse/init_deinit.swift import SwiftSyntax - import XCTest final class InitDeinitTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/MatchingPatternsTests.swift b/Tests/SwiftParserTest/translated/MatchingPatternsTests.swift index 2ad41ca2f8b..c0936baad35 100644 --- a/Tests/SwiftParserTest/translated/MatchingPatternsTests.swift +++ b/Tests/SwiftParserTest/translated/MatchingPatternsTests.swift @@ -12,9 +12,8 @@ // This test file has been translated from swift/test/Parse/matching_patterns.swift -import XCTest - @_spi(ExperimentalLanguageFeatures) import SwiftParser +import XCTest final class MatchingPatternsTests: ParserTestCase { func testMatchingPatterns1() { diff --git a/Tests/SwiftParserTest/translated/MultilineErrorsTests.swift b/Tests/SwiftParserTest/translated/MultilineErrorsTests.swift index 6ff03128790..507a4e51bd3 100644 --- a/Tests/SwiftParserTest/translated/MultilineErrorsTests.swift +++ b/Tests/SwiftParserTest/translated/MultilineErrorsTests.swift @@ -12,9 +12,8 @@ // This test file has been translated from swift/test/Parse/multiline_errors.swift -import XCTest - import SwiftSyntax +import XCTest extension ParserTestCase { fileprivate func assertParseWithAllNewlineEndings( diff --git a/Tests/SwiftParserTest/translated/MultilineStringTests.swift b/Tests/SwiftParserTest/translated/MultilineStringTests.swift index 5fa6cd9232d..62636a32f7c 100644 --- a/Tests/SwiftParserTest/translated/MultilineStringTests.swift +++ b/Tests/SwiftParserTest/translated/MultilineStringTests.swift @@ -13,7 +13,6 @@ // This test file has been translated from swift/test/StringProcessing/Parse/multiline_string.swift import SwiftSyntax - import XCTest final class MultilineStringTests: ParserTestCase { diff --git a/Tests/SwiftParserTest/translated/PatternWithoutVariablesTests.swift b/Tests/SwiftParserTest/translated/PatternWithoutVariablesTests.swift index 8bc1782aa90..b8a61b8dac5 100644 --- a/Tests/SwiftParserTest/translated/PatternWithoutVariablesTests.swift +++ b/Tests/SwiftParserTest/translated/PatternWithoutVariablesTests.swift @@ -12,9 +12,8 @@ // This test file has been translated from swift/test/Parse/pattern_without_variables.swift -import XCTest - @_spi(ExperimentalLanguageFeatures) import SwiftParser +import XCTest final class PatternWithoutVariablesTests: ParserTestCase { func testPatternWithoutVariables1() { diff --git a/Tests/SwiftParserTest/translated/TypeExprTests.swift b/Tests/SwiftParserTest/translated/TypeExprTests.swift index ec86cb09539..1f0405b6b17 100644 --- a/Tests/SwiftParserTest/translated/TypeExprTests.swift +++ b/Tests/SwiftParserTest/translated/TypeExprTests.swift @@ -12,8 +12,8 @@ // This test file has been translated from swift/test/Parse/type_expr.swift -import XCTest import SwiftSyntax +import XCTest // Types in expression contexts must be followed by a member access or // constructor call. diff --git a/Tests/SwiftRefactorTest/ExpandEditorPlaceholderTests.swift b/Tests/SwiftRefactorTest/ExpandEditorPlaceholderTests.swift index 13d6853210d..d85c9835465 100644 --- a/Tests/SwiftRefactorTest/ExpandEditorPlaceholderTests.swift +++ b/Tests/SwiftRefactorTest/ExpandEditorPlaceholderTests.swift @@ -11,8 +11,8 @@ //===----------------------------------------------------------------------===// import SwiftBasicFormat -import SwiftRefactor import SwiftParser +import SwiftRefactor import SwiftSyntax import SwiftSyntaxBuilder import XCTest diff --git a/Tests/SwiftRefactorTest/FormatRawStringLiteral.swift b/Tests/SwiftRefactorTest/FormatRawStringLiteral.swift index 72c2b53ad49..414c26263a6 100644 --- a/Tests/SwiftRefactorTest/FormatRawStringLiteral.swift +++ b/Tests/SwiftRefactorTest/FormatRawStringLiteral.swift @@ -12,9 +12,8 @@ import SwiftParser import SwiftRefactor -import SwiftSyntaxBuilder import SwiftSyntax - +import SwiftSyntaxBuilder import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftRefactorTest/IntegerLiteralUtilities.swift b/Tests/SwiftRefactorTest/IntegerLiteralUtilities.swift index 840bd4c12ec..4072517ed8d 100644 --- a/Tests/SwiftRefactorTest/IntegerLiteralUtilities.swift +++ b/Tests/SwiftRefactorTest/IntegerLiteralUtilities.swift @@ -13,7 +13,6 @@ import SwiftRefactor import SwiftSyntax import SwiftSyntaxBuilder - import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftRefactorTest/MigrateToNewIfLetSyntax.swift b/Tests/SwiftRefactorTest/MigrateToNewIfLetSyntax.swift index 2af5cd3424c..c44fdce80a4 100644 --- a/Tests/SwiftRefactorTest/MigrateToNewIfLetSyntax.swift +++ b/Tests/SwiftRefactorTest/MigrateToNewIfLetSyntax.swift @@ -13,7 +13,6 @@ import SwiftRefactor import SwiftSyntax import SwiftSyntaxBuilder - import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftRefactorTest/OpaqueParameterToGeneric.swift b/Tests/SwiftRefactorTest/OpaqueParameterToGeneric.swift index c78bba9ce75..4398e382256 100644 --- a/Tests/SwiftRefactorTest/OpaqueParameterToGeneric.swift +++ b/Tests/SwiftRefactorTest/OpaqueParameterToGeneric.swift @@ -13,7 +13,6 @@ import SwiftRefactor import SwiftSyntax import SwiftSyntaxBuilder - import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftRefactorTest/ReformatIntegerLiteral.swift b/Tests/SwiftRefactorTest/ReformatIntegerLiteral.swift index ed48f878582..011169d7033 100644 --- a/Tests/SwiftRefactorTest/ReformatIntegerLiteral.swift +++ b/Tests/SwiftRefactorTest/ReformatIntegerLiteral.swift @@ -13,7 +13,6 @@ import SwiftRefactor import SwiftSyntax import SwiftSyntaxBuilder - import XCTest import _SwiftSyntaxTestSupport diff --git a/Tests/SwiftSyntaxBuilderTest/ArrayExprTests.swift b/Tests/SwiftSyntaxBuilderTest/ArrayExprTests.swift index 4bdb98bec31..a8301db549f 100644 --- a/Tests/SwiftSyntaxBuilderTest/ArrayExprTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ArrayExprTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ArrayExprTests: XCTestCase { func testPlainArrayExpr() { diff --git a/Tests/SwiftSyntaxBuilderTest/Assertions.swift b/Tests/SwiftSyntaxBuilderTest/Assertions.swift index b548e78faac..da1af7c6eb8 100644 --- a/Tests/SwiftSyntaxBuilderTest/Assertions.swift +++ b/Tests/SwiftSyntaxBuilderTest/Assertions.swift @@ -12,9 +12,8 @@ import SwiftSyntax import SwiftSyntaxBuilder -import _SwiftSyntaxTestSupport - import XCTest +import _SwiftSyntaxTestSupport func assertBuildResult( _ buildable: T, diff --git a/Tests/SwiftSyntaxBuilderTest/AttributeListSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/AttributeListSyntaxTests.swift index c0dfb6732c1..01c7b4628f5 100644 --- a/Tests/SwiftSyntaxBuilderTest/AttributeListSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/AttributeListSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class AttributeListSyntaxTests: XCTestCase { func testAttributeListSyntaxSpacing() { diff --git a/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift index ca20119d5f2..974ebf7aeda 100644 --- a/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/BooleanLiteralTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class BooleanLiteralTests: XCTestCase { func testBooleanLiteral() { diff --git a/Tests/SwiftSyntaxBuilderTest/BreakStmtSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/BreakStmtSyntaxTests.swift index e378e3826c6..ccc945fa770 100644 --- a/Tests/SwiftSyntaxBuilderTest/BreakStmtSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/BreakStmtSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class BreakStmtSyntaxTests: XCTestCase { func testBreakStmtSyntax() { diff --git a/Tests/SwiftSyntaxBuilderTest/ClassDeclSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/ClassDeclSyntaxTests.swift index b85867fd8f8..1f217e35e31 100644 --- a/Tests/SwiftSyntaxBuilderTest/ClassDeclSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ClassDeclSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ClassDeclSyntaxTests: XCTestCase { func testThrowableClassWithStringInterpolation() throws { diff --git a/Tests/SwiftSyntaxBuilderTest/ClosureExprTests.swift b/Tests/SwiftSyntaxBuilderTest/ClosureExprTests.swift index bae37fe1591..2abfe584626 100644 --- a/Tests/SwiftSyntaxBuilderTest/ClosureExprTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ClosureExprTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ClosureExprTests: XCTestCase { func testClosureExpr() { diff --git a/Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift b/Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift index b35296c54cb..e279b895050 100644 --- a/Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/CollectionNodeFlatteningTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class CollectionNodeFlatteningTests: XCTestCase { func test_FlattenCodeBlockItemListWithBuilder() { diff --git a/Tests/SwiftSyntaxBuilderTest/CustomAttributeTests.swift b/Tests/SwiftSyntaxBuilderTest/CustomAttributeTests.swift index bcb2f3d65fb..c0d6cdcee2c 100644 --- a/Tests/SwiftSyntaxBuilderTest/CustomAttributeTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/CustomAttributeTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class CustomAttributeTests: XCTestCase { func testCustomAttributeConvenienceInitializer() { diff --git a/Tests/SwiftSyntaxBuilderTest/DictionaryExprTests.swift b/Tests/SwiftSyntaxBuilderTest/DictionaryExprTests.swift index f965e2c8967..964948e5fb7 100644 --- a/Tests/SwiftSyntaxBuilderTest/DictionaryExprTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/DictionaryExprTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class DictionaryExprTests: XCTestCase { func testPlainDictionaryExpr() { diff --git a/Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift b/Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift index 3def3a26cfb..a9b6d42080d 100644 --- a/Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/DoStmtTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class DoStmtTests: XCTestCase { func testDoStmt() { diff --git a/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift b/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift index 8d3c82089bd..7ebd79605f1 100644 --- a/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/EnumCaseElementTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class EnumCaseElementTests: XCTestCase { func testEnumInit() { diff --git a/Tests/SwiftSyntaxBuilderTest/ExprListTests.swift b/Tests/SwiftSyntaxBuilderTest/ExprListTests.swift index 77e974d4903..f2be2325798 100644 --- a/Tests/SwiftSyntaxBuilderTest/ExprListTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ExprListTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ExprListTests: XCTestCase { func testExprList() { diff --git a/Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift b/Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift index db2741c3d39..8cb9ea1a7e4 100644 --- a/Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ExtensionDeclTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ExtensionDeclTests: XCTestCase { func testExtensionDecl() { diff --git a/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift index 4273055a5ec..a714933e4bb 100644 --- a/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/FloatLiteralTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class FloatLiteralTests: XCTestCase { func testFloatLiteral() { diff --git a/Tests/SwiftSyntaxBuilderTest/ForInStmtTests.swift b/Tests/SwiftSyntaxBuilderTest/ForInStmtTests.swift index 565b407b03c..86fa6d7a406 100644 --- a/Tests/SwiftSyntaxBuilderTest/ForInStmtTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ForInStmtTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ForInStmtTests: XCTestCase { func testEmptyForInStmtSyntax() throws { diff --git a/Tests/SwiftSyntaxBuilderTest/FunctionParameterSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/FunctionParameterSyntaxTests.swift index 1cd98a3149b..b2194a914c2 100644 --- a/Tests/SwiftSyntaxBuilderTest/FunctionParameterSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/FunctionParameterSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class FunctionParameterSyntaxTests: XCTestCase { func testFunctionParameterSyntaxSpacing() { diff --git a/Tests/SwiftSyntaxBuilderTest/FunctionSignatureSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/FunctionSignatureSyntaxTests.swift index cf18bd25975..4398988656d 100644 --- a/Tests/SwiftSyntaxBuilderTest/FunctionSignatureSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/FunctionSignatureSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class FunctionSignatureSyntaxTests: XCTestCase { func testFunctionEffectSpecifiersSyntax() throws { diff --git a/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift b/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift index 024427e3814..c18f22f6d85 100644 --- a/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/FunctionTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest +import SwiftBasicFormat import SwiftSyntax import SwiftSyntaxBuilder -import SwiftBasicFormat +import XCTest import _SwiftSyntaxTestSupport final class FunctionTests: XCTestCase { diff --git a/Tests/SwiftSyntaxBuilderTest/FunctionTypeSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/FunctionTypeSyntaxTests.swift index fd6b0371aca..8dfe1f9fd0a 100644 --- a/Tests/SwiftSyntaxBuilderTest/FunctionTypeSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/FunctionTypeSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class FunctionTypeSyntaxTests: XCTestCase { func testFunctionEffectSpecifiersSyntax() throws { diff --git a/Tests/SwiftSyntaxBuilderTest/IfConfigDeclSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/IfConfigDeclSyntaxTests.swift index 2801f7b1954..1692ecd2f86 100644 --- a/Tests/SwiftSyntaxBuilderTest/IfConfigDeclSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/IfConfigDeclSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class IfConfigDeclSyntaxTests: XCTestCase { func testIfConfigClauseSyntax() { diff --git a/Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift b/Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift index 369ea8df2be..d85b07ae3e7 100644 --- a/Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/IfStmtTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class IfStmtTests: XCTestCase { func testEmptyIfExpr() { diff --git a/Tests/SwiftSyntaxBuilderTest/ImportDeclSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/ImportDeclSyntaxTests.swift index 1076c127f85..fe235a0895a 100644 --- a/Tests/SwiftSyntaxBuilderTest/ImportDeclSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ImportDeclSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ImportDeclSyntaxTests: XCTestCase { func testImportDeclSyntax() { diff --git a/Tests/SwiftSyntaxBuilderTest/InitializerDeclTests.swift b/Tests/SwiftSyntaxBuilderTest/InitializerDeclTests.swift index 8b8b17e6226..8646cb17e77 100644 --- a/Tests/SwiftSyntaxBuilderTest/InitializerDeclTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/InitializerDeclTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class InitializerDeclTests: XCTestCase { func testInitializerDecl() { diff --git a/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift b/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift index 814325f6567..27b6db3cd90 100644 --- a/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/IntegerLiteralTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class IntegerLiteralTests: XCTestCase { func testIntegerLiteral() { diff --git a/Tests/SwiftSyntaxBuilderTest/ProtocolDeclTests.swift b/Tests/SwiftSyntaxBuilderTest/ProtocolDeclTests.swift index 164ca330296..5ab2ee7a3ef 100644 --- a/Tests/SwiftSyntaxBuilderTest/ProtocolDeclTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ProtocolDeclTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ProtocolDeclTests: XCTestCase { func testProtocolDecl() throws { diff --git a/Tests/SwiftSyntaxBuilderTest/ReturnStmsTests.swift b/Tests/SwiftSyntaxBuilderTest/ReturnStmsTests.swift index b7bfd7fc956..1ed2aa268ac 100644 --- a/Tests/SwiftSyntaxBuilderTest/ReturnStmsTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/ReturnStmsTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class ReturnStmtTests: XCTestCase { func testReturnStmt() { diff --git a/Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift b/Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift index fab9191bab7..9e6b10c9835 100644 --- a/Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/SourceFileTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class SourceFileTests: XCTestCase { func testSourceFile() { diff --git a/Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift b/Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift index 5ec8234107c..72adb1b5e9a 100644 --- a/Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/StringInterpolationTests.swift @@ -10,13 +10,12 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport +import SwiftBasicFormat +import SwiftParser import SwiftSyntax @_spi(Testing) import SwiftSyntaxBuilder -import SwiftParser -import SwiftBasicFormat - import XCTest +import _SwiftSyntaxTestSupport class TwoSpacesFormat: BasicFormat { public init() { diff --git a/Tests/SwiftSyntaxBuilderTest/StringLiteralExprSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/StringLiteralExprSyntaxTests.swift index 61edafbecfd..3edeec0e47e 100644 --- a/Tests/SwiftSyntaxBuilderTest/StringLiteralExprSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/StringLiteralExprSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class StringLiteralExprSyntaxTests: XCTestCase { func testStringLiteral() { diff --git a/Tests/SwiftSyntaxBuilderTest/StructTests.swift b/Tests/SwiftSyntaxBuilderTest/StructTests.swift index 07882a777ca..94d2e09dc20 100644 --- a/Tests/SwiftSyntaxBuilderTest/StructTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/StructTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class StructTests: XCTestCase { func testEmptyStruct() { diff --git a/Tests/SwiftSyntaxBuilderTest/SwitchCaseLabelSyntaxTests.swift b/Tests/SwiftSyntaxBuilderTest/SwitchCaseLabelSyntaxTests.swift index 52d88915504..994a3e40277 100644 --- a/Tests/SwiftSyntaxBuilderTest/SwitchCaseLabelSyntaxTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/SwitchCaseLabelSyntaxTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class SwitchCaseLabelSyntaxTests: XCTestCase { func testSwitchCaseLabelSyntax() { diff --git a/Tests/SwiftSyntaxBuilderTest/SwitchTests.swift b/Tests/SwiftSyntaxBuilderTest/SwitchTests.swift index e8357074601..9645bfb7dca 100644 --- a/Tests/SwiftSyntaxBuilderTest/SwitchTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/SwitchTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class SwitchTests: XCTestCase { func testSwitch() { diff --git a/Tests/SwiftSyntaxBuilderTest/TernaryExprTests.swift b/Tests/SwiftSyntaxBuilderTest/TernaryExprTests.swift index 0484f598d5f..b4568d04700 100644 --- a/Tests/SwiftSyntaxBuilderTest/TernaryExprTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/TernaryExprTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class TernaryExprTests: XCTestCase { func testStringLiteralTernaryExpr() { diff --git a/Tests/SwiftSyntaxBuilderTest/TriviaTests.swift b/Tests/SwiftSyntaxBuilderTest/TriviaTests.swift index 0cd21fe1aaa..b7cdc9b1ac6 100644 --- a/Tests/SwiftSyntaxBuilderTest/TriviaTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/TriviaTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class TriviaTests: XCTestCase { func testLeadingTrivia() { diff --git a/Tests/SwiftSyntaxBuilderTest/TupleTests.swift b/Tests/SwiftSyntaxBuilderTest/TupleTests.swift index 5d4d36244af..b3bbbdb12c5 100644 --- a/Tests/SwiftSyntaxBuilderTest/TupleTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/TupleTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class TupleTests: XCTestCase { func testLabeledElementList() { diff --git a/Tests/SwiftSyntaxBuilderTest/VariableTests.swift b/Tests/SwiftSyntaxBuilderTest/VariableTests.swift index 97d931c32df..f0b5079eaaf 100644 --- a/Tests/SwiftSyntaxBuilderTest/VariableTests.swift +++ b/Tests/SwiftSyntaxBuilderTest/VariableTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest final class VariableTests: XCTestCase { func testVariableDecl() { diff --git a/Tests/SwiftSyntaxMacroExpansionTest/CodeItemMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/CodeItemMacroTests.swift index 6a29414859a..38d68917939 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/CodeItemMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/CodeItemMacroTests.swift @@ -20,8 +20,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/DeclarationMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/DeclarationMacroTests.swift index 3832cff8f87..a3d58adf8b7 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/DeclarationMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/DeclarationMacroTests.swift @@ -20,8 +20,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/ExpressionMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/ExpressionMacroTests.swift index 3bffc01ffd6..340397f1451 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/ExpressionMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/ExpressionMacroTests.swift @@ -19,8 +19,8 @@ //==========================================================================// import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/ExtensionMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/ExtensionMacroTests.swift index b9bec511dc8..d5343bfa2c0 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/ExtensionMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/ExtensionMacroTests.swift @@ -20,8 +20,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift index b8a983f6e56..d6a4d6e45a7 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/MacroReplacementTests.swift @@ -14,8 +14,8 @@ import SwiftDiagnostics import SwiftSyntax import SwiftSyntaxBuilder import SwiftSyntaxMacroExpansion -import _SwiftSyntaxTestSupport import XCTest +import _SwiftSyntaxTestSupport final class MacroReplacementTests: XCTestCase { func testMacroDefinitionGood() throws { diff --git a/Tests/SwiftSyntaxMacroExpansionTest/MemberAttributeMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/MemberAttributeMacroTests.swift index 52bfe94d284..223419b7453 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/MemberAttributeMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/MemberAttributeMacroTests.swift @@ -20,8 +20,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/MemberMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/MemberMacroTests.swift index 2045a376e03..359164ce612 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/MemberMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/MemberMacroTests.swift @@ -19,8 +19,8 @@ //==========================================================================// import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/MultiRoleMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/MultiRoleMacroTests.swift index 7166bcfec9d..bd73bb00cf9 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/MultiRoleMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/MultiRoleMacroTests.swift @@ -19,8 +19,8 @@ //==========================================================================// import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxMacroExpansionTest/PeerMacroTests.swift b/Tests/SwiftSyntaxMacroExpansionTest/PeerMacroTests.swift index df7ba74c976..258a4f7331a 100644 --- a/Tests/SwiftSyntaxMacroExpansionTest/PeerMacroTests.swift +++ b/Tests/SwiftSyntaxMacroExpansionTest/PeerMacroTests.swift @@ -20,8 +20,8 @@ import SwiftDiagnostics import SwiftSyntax -import SwiftSyntaxMacros import SwiftSyntaxMacroExpansion +import SwiftSyntaxMacros import SwiftSyntaxMacrosTestSupport import XCTest diff --git a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift index 474d03e0757..4ff3e79146b 100644 --- a/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift +++ b/Tests/SwiftSyntaxTest/AbsolutePositionTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport import SwiftSyntax import XCTest +import _SwiftSyntaxTestSupport public class AbsolutePositionTests: XCTestCase { public func testRecursion() { diff --git a/Tests/SwiftSyntaxTest/BumpPtrAllocatorTests.swift b/Tests/SwiftSyntaxTest/BumpPtrAllocatorTests.swift index 94425a82965..e9b9c06b03e 100644 --- a/Tests/SwiftSyntaxTest/BumpPtrAllocatorTests.swift +++ b/Tests/SwiftSyntaxTest/BumpPtrAllocatorTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest @_spi(Testing) import SwiftSyntax +import XCTest final class BumpPtrAllocatorTests: XCTestCase { diff --git a/Tests/SwiftSyntaxTest/DebugDescriptionTests.swift b/Tests/SwiftSyntaxTest/DebugDescriptionTests.swift index f92c75487ba..ab96756a868 100644 --- a/Tests/SwiftSyntaxTest/DebugDescriptionTests.swift +++ b/Tests/SwiftSyntaxTest/DebugDescriptionTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import XCTest +import SwiftParser import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport -import SwiftParser private extension String { // This implementation is really slow; to use it outside a test it should be optimized. diff --git a/Tests/SwiftSyntaxTest/MemoryLayoutTest.swift b/Tests/SwiftSyntaxTest/MemoryLayoutTest.swift index a4acd722ab2..69cd8fb528b 100644 --- a/Tests/SwiftSyntaxTest/MemoryLayoutTest.swift +++ b/Tests/SwiftSyntaxTest/MemoryLayoutTest.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest @_spi(Testing) import SwiftSyntax +import XCTest #if DEBUG final class MemoryLayoutTest: XCTestCase { diff --git a/Tests/SwiftSyntaxTest/MultithreadingTests.swift b/Tests/SwiftSyntaxTest/MultithreadingTests.swift index 373a961b6c4..3b867601cd4 100644 --- a/Tests/SwiftSyntaxTest/MultithreadingTests.swift +++ b/Tests/SwiftSyntaxTest/MultithreadingTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest @_spi(RawSyntax) import SwiftSyntax +import XCTest extension SyntaxProtocol { subscript(as type: S.Type) -> S { diff --git a/Tests/SwiftSyntaxTest/RawSyntaxTests.swift b/Tests/SwiftSyntaxTest/RawSyntaxTests.swift index 2bc87ed3c1e..dcec2884bd6 100644 --- a/Tests/SwiftSyntaxTest/RawSyntaxTests.swift +++ b/Tests/SwiftSyntaxTest/RawSyntaxTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest @_spi(RawSyntax) import SwiftSyntax +import XCTest fileprivate func cannedStructDecl(arena: SyntaxArena) -> RawStructDeclSyntax { let structKW = RawTokenSyntax( diff --git a/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift b/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift index c72ded3336e..6c024c24940 100644 --- a/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift +++ b/Tests/SwiftSyntaxTest/SourceLocationConverterTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport @_spi(RawSyntax) import SwiftSyntax import SwiftSyntaxBuilder import XCTest +import _SwiftSyntaxTestSupport fileprivate func assertPresumedSourceLocation( _ source: SourceFileSyntax, diff --git a/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift index 15976c45172..b89e7c48554 100644 --- a/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxChildrenTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport public class SyntaxChildrenTests: XCTestCase { diff --git a/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift index b1414a79be8..4b22e3ba6b9 100644 --- a/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxCollectionsTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport fileprivate func intElement(_ int: Int) -> ArrayElementSyntax { diff --git a/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift b/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift index b82e3f478f0..804e3935807 100644 --- a/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxCreationTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest fileprivate func cannedStructDecl() -> StructDeclSyntax { let structKW = TokenSyntax.keyword(.struct, trailingTrivia: .space) diff --git a/Tests/SwiftSyntaxTest/SyntaxTextTests.swift b/Tests/SwiftSyntaxTest/SyntaxTextTests.swift index 8f5509b8ca3..b7a4b281d46 100644 --- a/Tests/SwiftSyntaxTest/SyntaxTextTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxTextTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest @_spi(RawSyntax) import SwiftSyntax +import XCTest final class SyntaxTextTests: XCTestCase { func testLiteral() { diff --git a/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift index 456811c2789..8f90191883d 100644 --- a/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxTreeModifierTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest fileprivate func cannedVarDecl() -> VariableDeclSyntax { let identifierPattern = IdentifierPatternSyntax( diff --git a/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift index 0e3c8ef9bc6..08ba3174b6b 100644 --- a/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift +++ b/Tests/SwiftSyntaxTest/SyntaxVisitorTests.swift @@ -10,9 +10,9 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax import SwiftSyntaxBuilder +import XCTest import _SwiftSyntaxTestSupport public class SyntaxVisitorTests: XCTestCase { diff --git a/Tests/SwiftSyntaxTest/TriviaTests.swift b/Tests/SwiftSyntaxTest/TriviaTests.swift index c00863bf1ea..1a6aabf58cd 100644 --- a/Tests/SwiftSyntaxTest/TriviaTests.swift +++ b/Tests/SwiftSyntaxTest/TriviaTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest public class TriviaTests: XCTestCase { diff --git a/Tests/SwiftSyntaxTest/VisitorTests.swift b/Tests/SwiftSyntaxTest/VisitorTests.swift index 12e333e8d6d..acd8e88841f 100644 --- a/Tests/SwiftSyntaxTest/VisitorTests.swift +++ b/Tests/SwiftSyntaxTest/VisitorTests.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest public class VisitorTests: XCTestCase { public func testVisitMissingNodes() { diff --git a/Tests/SwiftSyntaxTestSupportTest/IncrementalParseTestUtilsTest.swift b/Tests/SwiftSyntaxTestSupportTest/IncrementalParseTestUtilsTest.swift index 6f6ddd1417f..c95fc56da21 100644 --- a/Tests/SwiftSyntaxTestSupportTest/IncrementalParseTestUtilsTest.swift +++ b/Tests/SwiftSyntaxTestSupportTest/IncrementalParseTestUtilsTest.swift @@ -10,8 +10,8 @@ // //===----------------------------------------------------------------------===// -import XCTest import SwiftSyntax +import XCTest import _SwiftSyntaxTestSupport public class IncrementalParseUtilTest: XCTestCase { diff --git a/Tests/SwiftSyntaxTestSupportTest/SyntaxComparisonTests.swift b/Tests/SwiftSyntaxTestSupportTest/SyntaxComparisonTests.swift index 9fee1992020..821b7efdbd2 100644 --- a/Tests/SwiftSyntaxTestSupportTest/SyntaxComparisonTests.swift +++ b/Tests/SwiftSyntaxTestSupportTest/SyntaxComparisonTests.swift @@ -10,10 +10,10 @@ // //===----------------------------------------------------------------------===// -import _SwiftSyntaxTestSupport -import SwiftSyntax import SwiftParser +import SwiftSyntax import XCTest +import _SwiftSyntaxTestSupport private func parse(source: String) -> Syntax { return Syntax(Parser.parse(source: source)) diff --git a/format.py b/format.py index b979efdc449..00fad55d14f 100755 --- a/format.py +++ b/format.py @@ -87,7 +87,7 @@ def find_swiftformat(swift_format: str) -> Path: def get_files_to_format() -> List[Path]: package_dir = Path(__file__).parent files_to_format = package_dir.glob('**/*.swift') - + def should_exclude(path: Path) -> bool: if 'lit_tests' in path.parts: return True