Merge branch 'main' into main

Author: MAJKFL

.editorconfig

@@ -0,0 +1,9 @@
+# editorconfig.org
+
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+insert_final_newline = true

.github/ISSUE_TEMPLATE/BASICFORMAT_BUG.yml

@@ -4,7 +4,7 @@ labels: [bug, BasicFormat]
 body:
  - type: markdown
    attributes:
-     value: Thanks for taking the time to fill out this bug report! We would really appreciate if you could take the time to reduce the issue as described in [Filing BasicFormat Bug Reports](https://swiftpackageindex.com/apple/swift-syntax/main/documentation/swiftbasicformat/filingbugreports).
+     value: Thanks for taking the time to fill out this bug report! We would really appreciate if you could take the time to reduce the issue as described in [Filing BasicFormat Bug Reports](https://swiftpackageindex.com/swiftlang/swift-syntax/main/documentation/swiftbasicformat/filingbugreports).
  - type: textarea
    id: source
    attributes:

.github/ISSUE_TEMPLATE/PARSER_BUG.yml

@@ -4,12 +4,12 @@ labels: [bug, SwiftParser]
 body:
  - type: markdown
    attributes:
-     value: Thanks for taking the time to fill out this bug report! We would really appreciate if you could take the time to reduce the issue as described in [Filing Parser Bug Reports](https://swiftpackageindex.com/apple/swift-syntax/main/documentation/swiftparser/filingbugreports).
+     value: Thanks for taking the time to fill out this bug report! We would really appreciate if you could take the time to reduce the issue as described in [Filing Parser Bug Reports](https://swiftpackageindex.com/swiftlang/swift-syntax/main/documentation/swiftparser/filingbugreports).
  - type: dropdown
    id: issue-type
    attributes:
      label: Issue Kind
-     description: What kind of issue is this? See [Filing Parser Bug Reports](https://swiftpackageindex.com/apple/swift-syntax/main/documentation/swiftparser/filingbugreports) for more details.
+     description: What kind of issue is this? See [Filing Parser Bug Reports](https://swiftpackageindex.com/swiftlang/swift-syntax/main/documentation/swiftparser/filingbugreports) for more details.
      options:
        - Round-Trip Failure
        - Parser Crash

.github/ISSUE_TEMPLATE/config.yml

@@ -11,5 +11,5 @@
      url: https://forums.swift.org/tags/c/development/tooling/39/swift-syntax
      about: Ask and answer questions about SwiftSyntax
    - name: SwiftSyntax Documentation
-     url: https://swiftpackageindex.com/apple/swift-syntax/documentation/swiftsyntax
+     url: https://swiftpackageindex.com/swiftlang/swift-syntax/documentation/swiftsyntax
      about: Learn about how to use the SwiftSyntax in your projects

.github/PULL_REQUEST_TEMPLATE/release_branch.md

@@ -10,16 +10,15 @@ builder:
       - SwiftSyntax
       - SwiftBasicFormat
       - SwiftCompilerPlugin
-      - SwiftCompilerPluginMessageHandling
       - SwiftDiagnostics
       - SwiftIDEUtils
-      - SwiftLibraryPluginProvider
       - SwiftOperators
       - SwiftParser
       - SwiftParserDiagnostics
       - SwiftRefactor
       - SwiftSyntaxBuilder
       - SwiftSyntaxMacros
       - SwiftSyntaxMacroExpansion
+      - SwiftSyntaxMacrosGenericTestSupport
       - SwiftSyntaxMacrosTestSupport
       custom_documentation_parameters: [--experimental-skip-synthesized-symbols]

.spi.yml

@@ -6,6 +6,7 @@
     },
     "lineBreakBeforeEachArgument": true,
     "indentConditionalCompilationBlocks": false,
+    "prioritizeKeepingFunctionOutputTogether": true,
     "rules": {
         "AlwaysUseLowerCamelCase": false,
         "AmbiguousTrailingClosureOverload": false,

.swift-format

@@ -88,6 +88,7 @@ swift_syntax_library(
     deps = [
         ":SwiftCompilerPluginMessageHandling",
         ":SwiftSyntaxMacros",
+        ":_SwiftLibraryPluginProviderCShims",
     ],
 )
 
@@ -251,15 +252,26 @@ swift_syntax_library(
 )
 
 swift_syntax_library(
-    name = "SwiftSyntaxMacrosTestSupport",
+    name = "SwiftSyntaxMacrosGenericTestSupport",
     testonly = True,
     deps = [
         ":SwiftDiagnostics",
         ":SwiftIDEUtils",
         ":SwiftParser",
         ":SwiftSyntaxMacroExpansion",
         ":SwiftSyntaxMacros",
-        ":_SwiftSyntaxTestSupport",
+        ":_SwiftSyntaxGenericTestSupport",
+    ],
+)
+
+swift_syntax_library(
+    name = "SwiftSyntaxMacrosTestSupport",
+    testonly = True,
+    deps = [
+        ":SwiftSyntax",
+        ":SwiftSyntaxMacroExpansion",
+        ":SwiftSyntaxMacros",
+        ":SwiftSyntaxMacrosGenericTestSupport",
     ],
 )
 
@@ -299,6 +311,14 @@ cc_library(
     visibility = ["//visibility:private"],
 )
 
+cc_library(
+    name = "_SwiftLibraryPluginProviderCShims",
+    hdrs = glob(["Sources/_SwiftLibraryPluginProviderCShims/include/*.h"]),
+    includes = ["Sources/_SwiftLibraryPluginProviderCShims/include"],
+    tags = ["swift_module=_SwiftLibraryPluginProviderCShims"],
+    visibility = ["//visibility:private"],
+)
+
 cc_library(
     name = "_SwiftSyntaxCShims",
     hdrs = glob(["Sources/_SwiftSyntaxCShims/include/*.h"]),
@@ -307,6 +327,13 @@ cc_library(
     visibility = ["//visibility:private"],
 )
 
+swift_syntax_library(
+    name = "_SwiftSyntaxGenericTestSupport",
+    testonly = True,
+    deps = [
+    ],
+)
+
 swift_syntax_library(
     name = "_SwiftSyntaxTestSupport",
     testonly = True,
@@ -315,6 +342,7 @@ swift_syntax_library(
         ":SwiftSyntax",
         ":SwiftSyntaxBuilder",
         ":SwiftSyntaxMacroExpansion",
+        ":_SwiftSyntaxGenericTestSupport",
     ],
 )
 

BUILD.bazel

@@ -19,7 +19,7 @@ swift-syntax is a SwiftPM package, so you can build and test it using anything t
 
 ## Formatting
 
-swift-syntax is formatted using [swift-format](http://github.com/apple/swift-format) to ensure a consistent style.
+swift-syntax is formatted using [swift-format](http://github.com/swiftlang/swift-format) to ensure a consistent style.
 
 To format your changes run the formatter using the following command
 ```bash
@@ -79,34 +79,28 @@ For more information and instructions, read the GitHub docs on [forking a repo](
 
 Once you've pushed your branch, you should see an option on this repository's page to create a PR from a branch in your fork.
 
+> [!TIP]
+> If you are stuck, it’s encouraged to submit a PR that describes the issue you’re having, e.g. if there are tests that are failing, build failures you can’t resolve, or if you have architectural questions. We’re happy to work with you to resolve those issue.
+
 ## Opening a PR for Release Branch
 
 In order for a pull request to be considered for inclusion in a release branch (e.g. `release/6.0`) after it has been cut, it must meet the following requirements:
 
 1. The title of the PR should start with the tag `[{swift version number}]`. For example, `[6.0]` for the Swift 6.0 release branch.
 
-1. The PR description must include the following information:
-
-    ```md
-    * **Explanation**: A description of the issue being fixed or enhancement being made. This can be brief, but it should be clear.
-    * **Scope**: An assessment of the impact/importance of the change. For example, is the change a source-breaking language change, etc.
-    * **Issue**: The GitHub Issue link if the change fixes/implements an issue/enhancement.
-    * **Original PR**: Pull Request link from the `main` branch.
-    * **Risk**: What is the (specific) risk to the release for taking this change?
-    * **Testing**: What specific testing has been done or needs to be done to further validate any impact of this change?
-    * **Reviewer**: One or more code owners for the impacted components should review the change. Technical review can be delegated by a code owner or otherwise requested as deemed appropriate or useful.
-    ```
-
-> [!TIP]
-> The PR description can be generated using the [release_branch.md](https://github.com/apple/swift-syntax/blob/main/.github/PULL_REQUEST_TEMPLATE/release_branch.md) [pull request template](https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/about-issue-and-pull-request-templates). To use this template when creating a PR, you need to add the query parameter:
-> ```
-> ?expand=1&template=release_branch.md
-> ```
-> to the PR URL, as described in the [GitHub documentation on using query parameters to create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/using-query-parameters-to-create-a-pull-request). 
-> This is necessary because GitHub does not currently provide a UI to choose a PR template.
+1. [This][form] should be filled out in the description of the PR.
+   To use this template when creating a PR, append the `template=release.md`
+   query parameter to the current URL and refresh.
+   For example:
+   ```diff
+   -https://github.com/swiftlang/swift-syntax/compare/main...my-branch?quick_pull=1
+   +https://github.com/swiftlang/swift-syntax/compare/main...my-branch?quick_pull=1&template=release.md
+   ```
 
 All changes going into a release branch must go through pull requests that are approved and merged by the corresponding release manager.
 
+[form]: https://github.com/swiftlang/.github/blob/main/PULL_REQUEST_TEMPLATE/release.md?plain=1
+
 ## Review and CI Testing
 
 After you opened your PR, a maintainer will review it and test your changes in CI (*Continuous Integration*) by adding a `@swift-ci Please test` comment on the pull request. Once your PR is approved and CI has passed, the maintainer will merge your pull request.

CODE_OF_CONDUCT.md

@@ -12,7 +12,7 @@ let package = Package(
     .executable(name: "generate-swift-syntax", targets: ["generate-swift-syntax"])
   ],
   dependencies: [
-    .package(url: "https://github.com/apple/swift-syntax", from: "510.0.0"),
+    .package(url: "https://github.com/swiftlang/swift-syntax", from: "510.0.0"),
     .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
   ],
   targets: [

CONTRIBUTING.md

@@ -197,7 +197,7 @@ public class Child {
        The old string-based implementation returned "Token" to ensure that `tokenKind` is not nil
        and that `isToken` computed-property will return true, but the value "Token" had never been
        used in other cases. We should try to remove this computed property altogether in the issue:
-       https://github.com/apple/swift-syntax/issues/2010
+       https://github.com/swiftlang/swift-syntax/issues/2010
        */
         return .unknown
       }