Skip to content

Merge main into release/6.0 #1213

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 39 commits into from
May 3, 2024

Conversation

ahoppen and others added 30 commits April 24, 2024 09:35
…tore `.swiftmodule` files in a subdirectory

This fixes a test failure when running tests using Xcode 15.3.
…ed for a document

This is some fairly essential information for troubleshooting and should be logged at the same level as the build settings for a file.
…ndex

`SwiftPMBuildSystem.testFiles()` returned all source files in the package, including files of package dependencies. This caused us to index those files for tests in the syntactic test index, which we should not.

Make `SwiftPMBuildSystem.testFiles` only return files from the root package.

Also add test infrastructure to be able to test cross-package functionality.

rdar://126965614
Currently tags are only recognized when the tag is specified by string
literal, i.e: @tag("foo").

Support Tags added via the staticMember Tag.Kind.
When a tag is declared within a nested type on Tag include the types
name in the tags string representation.
Add a `components` property to MemberAccessExprSyntax that provides all
the base names and the member's name as an array. When resolving
swift-testing Tags check if they start with Tag or Testing.Tag and drop
that from the name.
One that tests string tags, and the other that tests static tags.
To remove namespacing ambiguity, support statically defined tags only.
Add a `components` property to MemberAccessExprSyntax that provides all
the base names and the member's name as an array. When resolving
swift-testing Tags check if they start with Tag or Testing.Tag and drop
that from the name.
One that tests string tags, and the other that tests static tags.
Skip new tests that use Swift modules if the host’s SwiftPM doesn’t store `.swiftmodule` files in a subdirectory
…ction-log-level

Elevate the log level for messages that record which toolchain was used for a document
Leverage the newly-introduced package manifest editing tools in SwiftPM
to create a package editing refactoring operation. This operation can
be triggered from the a target in the manifest itself, e.g.,

    .target(name: "MyLib")

and will add a test target to the package manifest that depends on
this target, i.e.,

    .testTarget(
      name: "MyLibTests",
      dependencies: [ "MyLib" ]
    )

It will also create a new source file `Tests/MyLibTests/MyLibTests.swift`
that that imports both MyLib and XCTest, and contains an XCTestCase subclass
with one test to get you started.
[SwiftPM PR](swiftlang/swift-package-manager#7496)
consolidates use of provided libraries around Workspace and PubGrub
dependency resolver.
xedin and others added 8 commits April 26, 2024 13:46
…es-parameter

Remove obsolete `availableLibraries` argument from `loadPackageGraph`
…actor

Add refactoring actions for adding a test targets and products to a package manifest
Test specified with anonymous arguments would produce an id with extra
whitespace, i.e: `funcWithArgument(_ x: Int)` would produce a TestItem
id of `funcWithArgument(_ :)`

This patch trims this extra whitespace to produce IDs that are
consistent with Swift's function ids, i.e: `funcWithArgument(_:)`
…trivia-trimming

Trim parameter names in SwiftTestingScanner
…dependencies

Don’t include files from package dependencies in the syntactic test index
@ahoppen ahoppen requested a review from bnbarham May 1, 2024 23:13
@ahoppen ahoppen requested a review from benlangmuir as a code owner May 1, 2024 23:13
@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@swift-ci Please test

@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@swift-ci Please test Windows

@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@ahoppen
Copy link
Member Author

ahoppen commented May 2, 2024

@ahoppen ahoppen merged commit cec098d into swiftlang:release/6.0 May 3, 2024
3 checks passed
ahoppen added a commit to swiftlang/swift-package-manager that referenced this pull request May 3, 2024
- **Explanation**: Cherry-pick the following to PRs which are companions
of swiftlang/sourcekit-lsp#1213
  - #7505
  - #7492
- **Scope**: CMake build and SourceKit-LSP API
- **Risk**: Low, the SourceKit-LSP API is only used by SourceKit-LSP and
the CMake build changes will all be caught at build-time
- **Testing**: n/a
- **Issue**: n/a
- **Reviewer**: @DougGregor and @MaxDesiatov on
#7505 and
#7492

---------

Co-authored-by: Ben Barham <[email protected]>
@ahoppen ahoppen deleted the 6.0/merge-main-2024-05-01 branch May 3, 2024 04:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants