diff --git a/CodeGeneration/Package.swift b/CodeGeneration/Package.swift index a497b898e00..c537d705ca8 100644 --- a/CodeGeneration/Package.swift +++ b/CodeGeneration/Package.swift @@ -9,7 +9,7 @@ let package = Package( .macOS(.v10_15) ], products: [ - .executable(name: "generate-swiftsyntax", targets: ["generate-swiftsyntax"]) + .executable(name: "generate-swift-syntax", targets: ["generate-swift-syntax"]) ], dependencies: [ // This directory is a standalone package that uses swift-syntax from the @@ -26,7 +26,7 @@ let package = Package( ], targets: [ .executableTarget( - name: "generate-swiftsyntax", + name: "generate-swift-syntax", dependencies: [ .product(name: "SwiftSyntax", package: "swift-syntax"), .product(name: "SwiftSyntaxBuilder", package: "swift-syntax"), diff --git a/CodeGeneration/README.md b/CodeGeneration/README.md index f67a68c9487..b7e7b561f24 100644 --- a/CodeGeneration/README.md +++ b/CodeGeneration/README.md @@ -15,12 +15,12 @@ to ``` That way `CodeGeneration` has its own checkout of swift-syntax that is unaffected by the newly generated files. Be sure to revert the change before committing your changes. -To re-generate the files after changing `CodeGeneration` run the `generate-swiftsyntax` +To re-generate the files after changing `CodeGeneration` run the `generate-swift-syntax` target of `CodeGeneration` and pass `path/to/swift-syntax/Sources` as the argument. On the command line, this would be ```bash -swift run --package-path CodeGeneration generate-swiftsyntax Sources +swift run --package-path CodeGeneration generate-swift-syntax Sources ``` Or if you open the `CodeGeneration` package in Xcode, you can add the diff --git a/CodeGeneration/Sources/Utils/CopyrightHeader.swift b/CodeGeneration/Sources/Utils/CopyrightHeader.swift index 35360c2da3c..25dd003c743 100644 --- a/CodeGeneration/Sources/Utils/CopyrightHeader.swift +++ b/CodeGeneration/Sources/Utils/CopyrightHeader.swift @@ -14,7 +14,7 @@ import SwiftSyntax public var copyrightHeader: Trivia = """ - //// Automatically generated by generate-swiftsyntax + //// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift b/CodeGeneration/Sources/generate-swift-syntax/GenerateSwiftSyntax.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/GenerateSwiftSyntax.swift rename to CodeGeneration/Sources/generate-swift-syntax/GenerateSwiftSyntax.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift b/CodeGeneration/Sources/generate-swift-syntax/LayoutNode+Extensions.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/LayoutNode+Extensions.swift rename to CodeGeneration/Sources/generate-swift-syntax/LayoutNode+Extensions.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/Array+Child.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/Array+Child.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/Array+Child.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/Array+Child.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/IsLexerClassifiedFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/IsLexerClassifiedFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/IsLexerClassifiedFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/IsLexerClassifiedFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/ParserEntryFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserEntryFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/ParserEntryFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserTokenSpecSetFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/ParserTokenSpecSetFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/ParserTokenSpecSetFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/ParserTokenSpecSetFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TokenSpecStaticMembersFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/TokenSpecStaticMembersFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparser/TokenSpecStaticMembersFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparser/TokenSpecStaticMembersFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/ChildNameForDiagnosticsFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/SyntaxKindNameForDiagnosticsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/SyntaxKindNameForDiagnosticsFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/SyntaxKindNameForDiagnosticsFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/SyntaxKindNameForDiagnosticsFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftparserdiagnostics/TokenNameForDiagnosticsFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/ChildNameForKeyPathFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/KeywordFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/KeywordFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/KeywordFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/KeywordFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxNodesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxNodesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxNodesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxValidationFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RawSyntaxValidationFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RawSyntaxValidationFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RenamedChildrenCompatibilityFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedSyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RenamedSyntaxNodesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/RenamedSyntaxNodesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/RenamedSyntaxNodesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SwiftSyntaxDoccIndex.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SwiftSyntaxDoccIndex.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SwiftSyntaxDoccIndex.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SwiftSyntaxDoccIndex.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SwiftSyntaxDoccIndexTemplate.md b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SwiftSyntaxDoccIndexTemplate.md similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SwiftSyntaxDoccIndexTemplate.md rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SwiftSyntaxDoccIndexTemplate.md diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxAnyVisitorFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxBaseNodesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxCollectionsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxCollectionsFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxCollectionsFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxCollectionsFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxEnumFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxEnumFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxEnumFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxEnumFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxKindFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxKindFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxKindFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxKindFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxNodesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxNodesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxNodesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxRewriterFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxRewriterFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxRewriterFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTraitsFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxTraitsFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTraitsFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxTraitsFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTransformFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxTransformFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxTransformFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxTransformFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxVisitorFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxVisitorFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/SyntaxVisitorFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/SyntaxVisitorFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TokenKindFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokenKindFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TokenKindFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TokensFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TokensFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TokensFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TriviaPiecesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TriviaPiecesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntax/TriviaPiecesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntax/TriviaPiecesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/BuildableNodesFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/RenamedChildrenBuilderCompatibilityFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/ResultBuildersFile.swift diff --git a/CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift b/CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift similarity index 100% rename from CodeGeneration/Sources/generate-swiftsyntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift rename to CodeGeneration/Sources/generate-swift-syntax/templates/swiftsyntaxbuilder/SyntaxExpressibleByStringInterpolationConformancesFile.swift diff --git a/Sources/SwiftParser/generated/IsLexerClassified.swift b/Sources/SwiftParser/generated/IsLexerClassified.swift index 5beadf94802..309c49d58cc 100644 --- a/Sources/SwiftParser/generated/IsLexerClassified.swift +++ b/Sources/SwiftParser/generated/IsLexerClassified.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParser/generated/LayoutNodes+Parsable.swift b/Sources/SwiftParser/generated/LayoutNodes+Parsable.swift index 81cc422106e..6d85fce7971 100644 --- a/Sources/SwiftParser/generated/LayoutNodes+Parsable.swift +++ b/Sources/SwiftParser/generated/LayoutNodes+Parsable.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParser/generated/Parser+TokenSpecSet.swift b/Sources/SwiftParser/generated/Parser+TokenSpecSet.swift index 731685bfe29..492b4085f01 100644 --- a/Sources/SwiftParser/generated/Parser+TokenSpecSet.swift +++ b/Sources/SwiftParser/generated/Parser+TokenSpecSet.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParser/generated/TokenSpecStaticMembers.swift b/Sources/SwiftParser/generated/TokenSpecStaticMembers.swift index 6df8195bd1a..7f0f81a9ba7 100644 --- a/Sources/SwiftParser/generated/TokenSpecStaticMembers.swift +++ b/Sources/SwiftParser/generated/TokenSpecStaticMembers.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift index 0822411e14d..2644f78ef3e 100644 --- a/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift +++ b/Sources/SwiftParserDiagnostics/generated/ChildNameForDiagnostics.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift index 7e566689464..a53c595a569 100644 --- a/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift +++ b/Sources/SwiftParserDiagnostics/generated/SyntaxKindNameForDiagnostics.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift b/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift index 08e7f6ffde7..48e229bafb4 100644 --- a/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift +++ b/Sources/SwiftParserDiagnostics/generated/TokenNameForDiagnostics.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/Documentation.docc/Contributing/ChangingSwiftSyntax.md b/Sources/SwiftSyntax/Documentation.docc/Contributing/ChangingSwiftSyntax.md index fab11e6a1f9..dfeabbfe5d4 100644 --- a/Sources/SwiftSyntax/Documentation.docc/Contributing/ChangingSwiftSyntax.md +++ b/Sources/SwiftSyntax/Documentation.docc/Contributing/ChangingSwiftSyntax.md @@ -11,12 +11,12 @@ structures in sync, this project generates code using the Swift package ## Regenerating Files -To re-generate the files after changing `CodeGeneration` run the `generate-swiftsyntax` +To re-generate the files after changing `CodeGeneration` run the `generate-swift-syntax` target of `CodeGeneration`. On the command line, this would be ```bash -swift run --package-path CodeGeneration generate-swiftsyntax +swift run --package-path CodeGeneration generate-swift-syntax ``` ## Adding and Removing Syntax Nodes diff --git a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift index d24377695b0..e30fc7f2924 100644 --- a/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift +++ b/Sources/SwiftSyntax/generated/ChildNameForKeyPath.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/Keyword.swift b/Sources/SwiftSyntax/generated/Keyword.swift index 01a32f31370..7d1b0927114 100644 --- a/Sources/SwiftSyntax/generated/Keyword.swift +++ b/Sources/SwiftSyntax/generated/Keyword.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift b/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift index bb5d1af7b40..8046f48d3a2 100644 --- a/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift +++ b/Sources/SwiftSyntax/generated/RenamedChildrenCompatibility.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift b/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift index 6da4dd3138f..1d28a95519a 100644 --- a/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift +++ b/Sources/SwiftSyntax/generated/RenamedNodesCompatibility.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift index 1db7d6a5398..28044024525 100644 --- a/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift +++ b/Sources/SwiftSyntax/generated/SyntaxAnyVisitor.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift index a4a70e3ed76..500f478c827 100644 --- a/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift +++ b/Sources/SwiftSyntax/generated/SyntaxBaseNodes.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxCollections.swift b/Sources/SwiftSyntax/generated/SyntaxCollections.swift index 2e3bae9600a..44055d3db14 100644 --- a/Sources/SwiftSyntax/generated/SyntaxCollections.swift +++ b/Sources/SwiftSyntax/generated/SyntaxCollections.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxEnum.swift b/Sources/SwiftSyntax/generated/SyntaxEnum.swift index 5c4e916165f..f85889c3216 100644 --- a/Sources/SwiftSyntax/generated/SyntaxEnum.swift +++ b/Sources/SwiftSyntax/generated/SyntaxEnum.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxKind.swift b/Sources/SwiftSyntax/generated/SyntaxKind.swift index 0e88a337662..54bd33b28d0 100644 --- a/Sources/SwiftSyntax/generated/SyntaxKind.swift +++ b/Sources/SwiftSyntax/generated/SyntaxKind.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift index 7a8f5b154c0..3589db93a3c 100644 --- a/Sources/SwiftSyntax/generated/SyntaxRewriter.swift +++ b/Sources/SwiftSyntax/generated/SyntaxRewriter.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxTraits.swift b/Sources/SwiftSyntax/generated/SyntaxTraits.swift index 56d2259f51a..ac625a859de 100644 --- a/Sources/SwiftSyntax/generated/SyntaxTraits.swift +++ b/Sources/SwiftSyntax/generated/SyntaxTraits.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxTransform.swift b/Sources/SwiftSyntax/generated/SyntaxTransform.swift index 0c2ff101660..f249d3e3587 100644 --- a/Sources/SwiftSyntax/generated/SyntaxTransform.swift +++ b/Sources/SwiftSyntax/generated/SyntaxTransform.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift index 3f7faa3716a..b297d7abb25 100644 --- a/Sources/SwiftSyntax/generated/SyntaxVisitor.swift +++ b/Sources/SwiftSyntax/generated/SyntaxVisitor.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/TokenKind.swift b/Sources/SwiftSyntax/generated/TokenKind.swift index 5c049fcc823..d4c0e30a8e8 100644 --- a/Sources/SwiftSyntax/generated/TokenKind.swift +++ b/Sources/SwiftSyntax/generated/TokenKind.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/Tokens.swift b/Sources/SwiftSyntax/generated/Tokens.swift index 35d0e19ea09..2e703556120 100644 --- a/Sources/SwiftSyntax/generated/Tokens.swift +++ b/Sources/SwiftSyntax/generated/Tokens.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/TriviaPieces.swift b/Sources/SwiftSyntax/generated/TriviaPieces.swift index 9e8e4ec4bfb..44d83e69265 100644 --- a/Sources/SwiftSyntax/generated/TriviaPieces.swift +++ b/Sources/SwiftSyntax/generated/TriviaPieces.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift index 932858397df..93e184955ad 100644 --- a/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift +++ b/Sources/SwiftSyntax/generated/raw/RawSyntaxValidation.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift index c566c34dcec..6b590224dc5 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesAB.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift index 1e8a259d75b..52239b19e75 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesC.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift index d17d283258b..ceddef526b0 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesD.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift index 7ff41fc2a22..cf27f9a296b 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesEF.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesGHI.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesGHI.swift index 46647f8ad59..3365abfae0b 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesGHI.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesGHI.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesJKLMN.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesJKLMN.swift index 79586bbd16b..82eba2ab903 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesJKLMN.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesJKLMN.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift index 8d19562bf92..8217bac5dde 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesOP.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift index 3b1f22c40af..d5c19b991db 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesQRS.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift index d7ee6d106b4..cf66a130e67 100644 --- a/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift +++ b/Sources/SwiftSyntax/generated/syntaxNodes/SyntaxNodesTUVWXYZ.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift index aba990eb121..78c163ce7d3 100644 --- a/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift +++ b/Sources/SwiftSyntaxBuilder/generated/BuildableNodes.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift b/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift index 3bf72501a9c..47b8759a5b9 100644 --- a/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift +++ b/Sources/SwiftSyntaxBuilder/generated/RenamedChildrenBuilderCompatibility.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntaxBuilder/generated/ResultBuilders.swift b/Sources/SwiftSyntaxBuilder/generated/ResultBuilders.swift index dfb706efbea..ad23a569c42 100644 --- a/Sources/SwiftSyntaxBuilder/generated/ResultBuilders.swift +++ b/Sources/SwiftSyntaxBuilder/generated/ResultBuilders.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift b/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift index 3c5386c1cf6..32c185bf318 100644 --- a/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift +++ b/Sources/SwiftSyntaxBuilder/generated/SyntaxExpressibleByStringInterpolationConformances.swift @@ -1,4 +1,4 @@ -//// Automatically generated by generate-swiftsyntax +//// Automatically generated by generate-swift-syntax //// Do not edit directly! //===----------------------------------------------------------------------===// // diff --git a/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift b/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift index 44bacb934d7..90c1f7ec392 100644 --- a/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift +++ b/SwiftSyntaxDevUtils/Sources/swift-syntax-dev-utils/common/SourceCodeGeneratorCommand.swift @@ -26,7 +26,7 @@ extension SourceCodeGeneratorCommand { var args = [ "run", "--package-path", Paths.codeGenerationDir.relativePath, - "generate-swiftsyntax", sourceDir.relativePath, + "generate-swift-syntax", sourceDir.relativePath, ] if arguments.verbose {