Skip to content

Commit f4fa6e7

Browse files
authored
Merge pull request #2145 from natikgadzhi/internal/swift-format/ordered-imports
2 parents abcc952 + 6ddd715 commit f4fa6e7

File tree

171 files changed

+210
-225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

171 files changed

+210
-225
lines changed

.swift-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"AlwaysUseLowerCamelCase": false,
1111
"AmbiguousTrailingClosureOverload": false,
1212
"NoBlockComments": false,
13+
"OrderedImports": true,
1314
"UseLetInEveryBoundCaseVariable": false,
1415
"UseSynthesizedInitializer": false
1516
}

CodeGeneration/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// swift-tools-version:5.7
22

3-
import PackageDescription
43
import Foundation
4+
import PackageDescription
55

66
let package = Package(
77
name: "CodeGeneration",

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftSyntax
14-
import SyntaxSupport
1514
import SwiftSyntaxBuilder
15+
import SyntaxSupport
1616
import Utils
1717

1818
let resultBuildersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {

CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SwiftSyntax
14-
import SyntaxSupport
1514
import SwiftSyntaxBuilder
15+
import SyntaxSupport
1616
import Utils
1717

1818
let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {

CodeGeneration/Tests/ValidateSyntaxNodes/ValidateSyntaxNodes.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import SyntaxSupport
14-
1514
import XCTest
1615

1716
fileprivate func assertNoFailures(

EditorExtension/SwiftRefactorExtension/CommandDiscovery.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Darwin
14-
import MachO
1514
import Foundation
15+
import MachO
1616
import SwiftRefactor
1717

1818
extension SourceEditorExtension {

EditorExtension/SwiftRefactorExtension/SourceEditorCommand.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Foundation
14-
import XcodeKit
1514
import SwiftParser
1615
import SwiftRefactor
1716
import SwiftSyntax
17+
import XcodeKit
1818

1919
enum ExtensionError: Error {
2020
case unsupportedContentType

EditorExtension/SwiftRefactorExtension/SourceEditorExtension.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
//===----------------------------------------------------------------------===//
1212

1313
import Foundation
14-
import XcodeKit
1514
import SwiftRefactor
15+
import XcodeKit
1616

1717
final class SourceEditorExtension: NSObject, XCSourceEditorExtension {
1818
func extensionDidFinishLaunching() {

Examples/Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// swift-tools-version: 5.9
22

3-
import PackageDescription
43
import CompilerPluginSupport
4+
import PackageDescription
55

66
let package = Package(
77
name: "Examples",

Examples/Sources/AddOneToIntegerLiterals/AddOneToIntegerLiterals.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import SwiftSyntax
2-
import SwiftParser
31
import Foundation
2+
import SwiftParser
3+
import SwiftSyntax
44

55
/// AddOneToIntegerLiterals will visit each token in the Syntax tree, and
66
/// (if it is an integer literal token) add 1 to the integer and return the

0 commit comments

Comments
 (0)