Merge pull request #2145 from natikgadzhi/internal/swift-format/ordered-imports

Author: ahoppen

.swift-format

@@ -10,6 +10,7 @@
         "AlwaysUseLowerCamelCase": false,
         "AmbiguousTrailingClosureOverload": false,
         "NoBlockComments": false,
+        "OrderedImports": true,
         "UseLetInEveryBoundCaseVariable": false,
         "UseSynthesizedInitializer": false
     }

CodeGeneration/Package.swift

@@ -1,7 +1,7 @@
 // swift-tools-version:5.7
 
-import PackageDescription
 import Foundation
+import PackageDescription
 
 let package = Package(
   name: "CodeGeneration",

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) {

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) {

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 import SyntaxSupport
-
 import XCTest
 
 fileprivate func assertNoFailures(

EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import Darwin
-import MachO
 import Foundation
+import MachO
 import SwiftRefactor
 
 extension SourceEditorExtension {

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

EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import Foundation
-import XcodeKit
 import SwiftRefactor
+import XcodeKit
 
 final class SourceEditorExtension: NSObject, XCSourceEditorExtension {
   func extensionDidFinishLaunching() {

Examples/Package.swift

@@ -1,7 +1,7 @@
 // swift-tools-version: 5.9
 
-import PackageDescription
 import CompilerPluginSupport
+import PackageDescription
 
 let package = Package(
   name: "Examples",

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

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

Examples/Sources/MacroExamples/Implementation/Diagnostics.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftSyntax
 import SwiftDiagnostics
+import SwiftSyntax
 
 struct SimpleDiagnosticMessage: DiagnosticMessage, Error {
   let message: String

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

Examples/Sources/MacroExamples/Playground/main.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import MacroExamplesInterface
 import Foundation
+import MacroExamplesInterface
 
 let x = 1
 let y = 2

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] = [

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] = [

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 {

Package.swift

@@ -1,7 +1,7 @@
 // swift-tools-version:5.7
 
-import PackageDescription
 import Foundation
+import PackageDescription
 
 var swiftSyntaxSwiftSettings: [SwiftSetting] = []
 var swiftSyntaxBuilderSwiftSettings: [SwiftSetting] = []

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

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.

Sources/SwiftCompilerPluginMessageHandling/PluginMacroExpansionContext.swift

@@ -11,8 +11,8 @@
 //===----------------------------------------------------------------------===//
 
 import SwiftDiagnostics
-import SwiftParser
 import SwiftOperators
+import SwiftParser
 import SwiftSyntax
 import SwiftSyntaxMacros
 

Sources/SwiftParserDiagnostics/DiagnosticExtensions.swift

@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import SwiftDiagnostics
 import SwiftBasicFormat
+import SwiftDiagnostics
 @_spi(RawSyntax) import SwiftSyntax
 
 extension FixIt {

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"
 

Sources/SwiftParserDiagnostics/MissingNodesError.swift

@@ -10,9 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+import SwiftBasicFormat
 import SwiftDiagnostics
 @_spi(RawSyntax) import SwiftSyntax
-import SwiftBasicFormat
 
 // MARK: - Shared code
 

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) {

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"
 

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 {

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] {

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"

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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() {

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 {