Merge pull request swiftlang#132 from google/the-great-renaming

[The Great Renaming] Qualify module names with "SwiftFormat" prefix.

Author: dabelknap

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:4.1
+// swift-tools-version:4.2
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the Swift Formatter open source project.
@@ -16,47 +16,67 @@
 import PackageDescription
 
 let package = Package(
-  name: "swiftformat",
+  name: "swift-format",
+  products: [
+    .executable(name: "swift-format", targets: ["swift-format"]),
+  ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-package-manager.git", from: "0.1.0"),
     .package(url: "https://github.com/apple/swift-syntax", from: "0.40200.0"),
   ],
   targets: [
-    .target(
-      name: "swiftformat",
-      dependencies: ["Rules", "Core", "Configuration", "PrettyPrint", "SwiftSyntax", "Utility"]),
-    .target(
-      name: "generate-pipeline",
-      dependencies: ["SwiftSyntax"]),
-    .target(
-      name: "Rules",
-      dependencies: ["Core", "Configuration"]),
-    .target(
-      name: "PrettyPrint",
-      dependencies: ["Core", "Configuration"]),
-    .target(
-      name: "Core",
-      dependencies: ["Configuration", "SwiftSyntax"]),
-    .target(
-      name: "Configuration",
-      dependencies: []),
-    .target(name: "CommonMark", dependencies: ["CCommonMark"]),
     .target(
       name: "CCommonMark",
       exclude: [
         "cmark/api_test",
-        // We must exclude main.c or SwiftPM will treat this target as an
-        // executable target and we won't be able to import it from the
-        // CommonMark Swift module.
+        // We must exclude main.c or SwiftPM will treat this target as an executable target instead
+        // of a library, and we won't be able to import it from the CommonMark Swift module.
         "cmark/src/main.c",
       ]
     ),
+    .target(name: "CommonMark", dependencies: ["CCommonMark"]),
+    .target(name: "SwiftFormatConfiguration"),
+    .target(name: "SwiftFormatCore", dependencies: ["SwiftFormatConfiguration", "SwiftSyntax"]),
+    .target(
+      name: "SwiftFormatRules",
+      dependencies: ["SwiftFormatCore", "SwiftFormatConfiguration"]
+    ),
+    .target(
+      name: "SwiftFormatPrettyPrint",
+      dependencies: ["SwiftFormatCore", "SwiftFormatConfiguration"]
+    ),
+    .target(name: "generate-pipeline", dependencies: ["SwiftSyntax"]),
+    .target(
+      name: "swift-format",
+      dependencies: [
+        "SwiftFormatConfiguration",
+        "SwiftFormatCore",
+        "SwiftFormatPrettyPrint",
+        "SwiftFormatRules",
+        "SwiftSyntax",
+        "Utility",
+      ]
+    ),
+    .testTarget(name: "CommonMarkTests", dependencies: ["CommonMark"]),
     .testTarget(
-      name: "SwiftFormatTests",
-      dependencies: ["Core", "Configuration", "Rules", "PrettyPrint", "SwiftSyntax"]),
+      name: "SwiftFormatRulesTests",
+      dependencies: [
+        "SwiftFormatConfiguration",
+        "SwiftFormatCore",
+        "SwiftFormatPrettyPrint",
+        "SwiftFormatRules",
+        "SwiftSyntax",
+      ]
+    ),
     .testTarget(
-      name: "PrettyPrinterTests",
-      dependencies: ["Core", "Configuration", "Rules", "PrettyPrint", "SwiftSyntax"]),
-    .testTarget(name: "CommonMarkTests", dependencies: ["CommonMark"]),
+      name: "SwiftFormatPrettyPrintTests",
+      dependencies: [
+        "SwiftFormatConfiguration",
+        "SwiftFormatCore",
+        "SwiftFormatPrettyPrint",
+        "SwiftFormatRules",
+        "SwiftSyntax",
+      ]
+    ),
   ]
 )

README.md

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
 import Foundation
+import SwiftFormatConfiguration
 import SwiftSyntax
 
 /// Context contains the bits that each formatter and linter will need access to.

Sources/Configuration/Configuration.swift renamed to Sources/SwiftFormatConfiguration/Configuration.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
+import SwiftFormatConfiguration
 import SwiftSyntax
 
 /// A linting rule that does not parse the file, but instead runs analyses over the raw text of

Sources/Core/Context.swift renamed to Sources/SwiftFormatCore/Context.swift

@@ -12,7 +12,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
+import SwiftFormatConfiguration
 
 extension Indent {
   var character: Character {

Sources/Core/Diagnostic+Rule.swift renamed to Sources/SwiftFormatCore/Diagnostic+Rule.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
-import Core
+import SwiftFormatConfiguration
+import SwiftFormatCore
 import SwiftSyntax
 
 #if os(Linux)

Sources/Core/FileRule.swift renamed to Sources/SwiftFormatCore/FileRule.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
-import Core
+import SwiftFormatConfiguration
+import SwiftFormatCore
 import SwiftSyntax
 
 enum BreakStyle {

Sources/Core/FormatPipeline.swift renamed to Sources/SwiftFormatCore/FormatPipeline.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Configuration
-import Core
+import SwiftFormatConfiguration
+import SwiftFormatCore
 import SwiftSyntax
 
 private class FindChildScope: SyntaxVisitor {

Sources/Core/LintPipeline.swift renamed to Sources/SwiftFormatCore/LintPipeline.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 private final class AddModifierRewriter: SyntaxRewriter {

Sources/Core/Pipeline.swift renamed to Sources/SwiftFormatCore/Pipeline.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// All public or open declarations must have a top-level documentation comment.

Sources/Core/Rule.swift renamed to Sources/SwiftFormatCore/Rule.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// All values should be written in lower camel-case (`lowerCamelCase`).

Sources/Core/Syntax+Convenience.swift renamed to Sources/SwiftFormatCore/Syntax+Convenience.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Overloads with only a closure argument should not be disambiguated by parameter labels.

Sources/Core/SyntaxFormatRule.swift renamed to Sources/SwiftFormatCore/SyntaxFormatRule.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 fileprivate let intSizes = ["", "8", "16", "32", "64"]

Sources/Core/SyntaxLintRule.swift renamed to Sources/SwiftFormatCore/SyntaxLintRule.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// All documentation comments must begin with a one-line summary of the declaration.

Sources/Core/SyntaxType.swift renamed to Sources/SwiftFormatCore/SyntaxType.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// At least one blank line between each member of a type.

Sources/Core/Trivia+Convenience.swift renamed to Sources/SwiftFormatCore/Trivia+Convenience.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Each `case` of a `switch` statement must be indented the same as the `switch` keyword.

Sources/Core/Workarounds.swift renamed to Sources/SwiftFormatCore/Workarounds.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 // TODO(abl): "right brace" to be consistent with SwiftSyntax?

Sources/PrettyPrint/Comment.swift renamed to Sources/SwiftFormatPrettyPrint/Comment.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Enforces whitespace requirements for array literals, tuples, and dictionary literals.

Sources/PrettyPrint/Indent+Length.swift renamed to Sources/SwiftFormatPrettyPrint/Indent+Length.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Enforces restrictions on whitespace before and after colons.

Sources/PrettyPrint/PrettyPrint.swift renamed to Sources/SwiftFormatPrettyPrint/PrettyPrint.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Enforces restrictions on whitespace before and after commas.

Sources/PrettyPrint/Token.swift renamed to Sources/SwiftFormatPrettyPrint/Token.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// At least two spaces before, and exactly one space after the `//` that begins a line comment.

Sources/PrettyPrint/TokenStreamCreator.swift renamed to Sources/SwiftFormatPrettyPrint/TokenStreamCreator.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Semicolons should not be present in Swift code.

Sources/Rules/AddModifierRewriter.swift renamed to Sources/SwiftFormatRules/AddModifierRewriter.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Static properties of a type that return that type should not include a reference to their type.

Sources/Rules/AllPublicDeclarationsHaveDocumentation.swift renamed to Sources/SwiftFormatRules/AllPublicDeclarationsHaveDocumentation.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// If all cases of an enum are `indirect`, the entire enum should be marked `indirect`.

Sources/Rules/AlwaysUseLowerCamelCase.swift renamed to Sources/SwiftFormatRules/AlwaysUseLowerCamelCase.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Numeric literals should be grouped with `_`s to delimit common separators.

Sources/Rules/AmbiguousTrailingClosureOverload.swift renamed to Sources/SwiftFormatRules/AmbiguousTrailingClosureOverload.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Overloads, subscripts, and initializers should be grouped if they appear in the same scope.

Sources/Rules/AvoidInitializersForLiterals.swift renamed to Sources/SwiftFormatRules/AvoidInitializersForLiterals.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// All identifiers must be ASCII.

Sources/Rules/BeginDocumentationCommentWithOneLineSummary.swift renamed to Sources/SwiftFormatRules/BeginDocumentationCommentWithOneLineSummary.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Visitor that determines if the target source file imports XCTest

Sources/Rules/BlankLineBetweenMembers.swift renamed to Sources/SwiftFormatRules/BlankLineBetweenMembers.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Enforces line length limits.

Sources/Rules/CaseIndentLevelEqualsSwitch.swift renamed to Sources/SwiftFormatRules/CaseIndentLevelEqualsSwitch.swift

@@ -12,8 +12,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-import Core
 import Foundation
+import SwiftFormatCore
 import SwiftSyntax
 
 /// Enforce a maximum number of consecutive blank lines.