Skip to content

Order all imports lexicographically #2145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .swift-format
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"AlwaysUseLowerCamelCase": false,
"AmbiguousTrailingClosureOverload": false,
"NoBlockComments": false,
"OrderedImports": true,
"UseLetInEveryBoundCaseVariable": false,
"UseSynthesizedInitializer": false
}
Expand Down
2 changes: 1 addition & 1 deletion CodeGeneration/Package.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// swift-tools-version:5.7

import PackageDescription
import Foundation
import PackageDescription

let package = Package(
name: "CodeGeneration",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SyntaxSupport
import SwiftSyntaxBuilder
import SyntaxSupport
import Utils

let resultBuildersFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SyntaxSupport
import SwiftSyntaxBuilder
import SyntaxSupport
import Utils

let syntaxExpressibleByStringInterpolationConformancesFile = SourceFileSyntax(leadingTrivia: copyrightHeader) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
//===----------------------------------------------------------------------===//

import SyntaxSupport

import XCTest

fileprivate func assertNoFailures(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import Darwin
import MachO
import Foundation
import MachO
import SwiftRefactor

extension SourceEditorExtension {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
//===----------------------------------------------------------------------===//

import Foundation
import XcodeKit
import SwiftParser
import SwiftRefactor
import SwiftSyntax
import XcodeKit

enum ExtensionError: Error {
case unsupportedContentType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import Foundation
import XcodeKit
import SwiftRefactor
import XcodeKit

final class SourceEditorExtension: NSObject, XCSourceEditorExtension {
func extensionDidFinishLaunching() {
Expand Down
2 changes: 1 addition & 1 deletion Examples/Package.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// swift-tools-version: 5.9

import PackageDescription
import CompilerPluginSupport
import PackageDescription

let package = Package(
name: "Examples",
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

import SwiftSyntax
import SwiftDiagnostics
import SwiftSyntax

struct SimpleDiagnosticMessage: DiagnosticMessage, Error {
let message: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

import SwiftDiagnostics
import SwiftSyntax
import SwiftSyntaxMacros
import SwiftSyntaxBuilder
import SwiftSyntaxMacros

public struct MetaEnumMacro {
let parentTypeName: TokenSyntax
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sources/MacroExamples/Playground/main.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

import MacroExamplesInterface
import Foundation
import MacroExamplesInterface

let x = 1
let y = 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] = [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
//
//===----------------------------------------------------------------------===//

import MacroExamplesImplementation
import SwiftSyntax
import SwiftSyntaxBuilder
import SwiftSyntaxMacros
import MacroExamplesImplementation
import SwiftSyntaxMacroExpansion
import SwiftSyntaxMacros
import XCTest

final class NewTypePluginTests: XCTestCase {
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// swift-tools-version:5.7

import PackageDescription
import Foundation
import PackageDescription

var swiftSyntaxSwiftSettings: [SwiftSetting] = []
var swiftSyntaxBuilderSwiftSettings: [SwiftSetting] = []
Expand Down
4 changes: 2 additions & 2 deletions Sources/SwiftCompilerPlugin/CompilerPlugin.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftCompilerPluginMessageHandling/Macros.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftDiagnostics
import SwiftParser
import SwiftOperators
import SwiftParser
import SwiftSyntax
import SwiftSyntaxMacros

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
//
//===----------------------------------------------------------------------===//

import SwiftDiagnostics
import SwiftBasicFormat
import SwiftDiagnostics
@_spi(RawSyntax) import SwiftSyntax

extension FixIt {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftDiagnostics
@_spi(RawSyntax) import SwiftSyntax
@_spi(Diagnostics) import SwiftParser
@_spi(RawSyntax) import SwiftSyntax

fileprivate let diagnosticDomain: String = "SwiftLexer"

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParserDiagnostics/MissingNodesError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
//
//===----------------------------------------------------------------------===//

import SwiftBasicFormat
import SwiftDiagnostics
@_spi(RawSyntax) import SwiftSyntax
import SwiftBasicFormat

// MARK: - Shared code

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParserDiagnostics/MissingTokenError.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftDiagnostics
@_spi(RawSyntax) import SwiftSyntax
@_spi(Diagnostics) import SwiftParser
@_spi(RawSyntax) import SwiftSyntax

extension ParseDiagnosticsGenerator {
func handleMissingToken(_ missingToken: TokenSyntax) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
//===----------------------------------------------------------------------===//

import SwiftDiagnostics
@_spi(RawSyntax) import SwiftSyntax
@_spi(Diagnostics) import SwiftParser
@_spi(RawSyntax) import SwiftSyntax

fileprivate let diagnosticDomain: String = "SwiftParser"

Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParserDiagnostics/PresenceUtils.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftParserDiagnostics/SyntaxExtensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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] {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftRefactor/MigrateToNewIfLetSyntax.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax
import SwiftParser
import Foundation
import SwiftParser
import SwiftSyntax

@main struct ImportFormatter {
static func main() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading