Skip to content

Conversation

@ahoppen
Copy link
Member

@ahoppen ahoppen commented Dec 6, 2023

#70174 change swift-refactor and sourcekitd to not use NameMatcher from swift-syntax but it did not remove the link dependency from swiftRefactoring on swiftIDEUtilsBridging if SWIFT_BUILD_SWIFT_SYNTAX is false. Do so now.

…TAX` is set

swiftlang#70174 change swift-refactor and sourcekitd to not use `NameMatcher` from swift-syntax but it did not remove the link dependency from swiftRefactoring on `swiftIDEUtilsBridging` if `SWIFT_BUILD_SWIFT_SYNTAX` is false. Do so now.
@ahoppen
Copy link
Member Author

ahoppen commented Dec 6, 2023

@swift-ci Please smoke test

@ahoppen ahoppen enabled auto-merge December 6, 2023 17:33
@ahoppen ahoppen merged commit b781ef7 into swiftlang:main Dec 6, 2023
@ahoppen ahoppen deleted the ahoppen/dont-link-swiftideutilsbridging branch December 7, 2023 00:47
@finagolfin
Copy link
Member

Thanks, this briefly got the Android CI to go green again 🥳 before some other pull related to the same swift-syntax requirement broke it again:

tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp
/home/ubuntu/jenkins/workspace/oss-swift-RA-linux-ubuntu-16.04-android-arm64/swift/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp:2527:30: error: unknown type name 'RelatedIdentsInfo'; did you mean 'RelatedIdentInfo'?
      Receiver(RequestResult<RelatedIdentsInfo>::fromError("relatedidents is not supported because sourcekitd was built without swift-syntax"));
                             ^~~~~~~~~~~~~~~~~
                             RelatedIdentInfo
/home/ubuntu/jenkins/workspace/oss-swift-RA-linux-ubuntu-16.04-android-arm64/swift/tools/SourceKit/include/SourceKit/Core/LangSupport.h:786:8: note: 'RelatedIdentInfo' declared here
struct RelatedIdentInfo {
       ^
/home/ubuntu/jenkins/workspace/oss-swift-RA-linux-ubuntu-16.04-android-arm64/swift/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp:2527:7: error: no matching function for call to object of type 'std::function<void (const RequestResult<ArrayRef<RelatedIdentInfo>> &)>'
      Receiver(RequestResult<RelatedIdentsInfo>::fromError("relatedidents is not supported because sourcekitd was built without swift-syntax"));
      ^~~~~~~~
/usr/bin/../lib/gcc/x86_64-linux-gnu/11/../../../../include/c++/11/bits/std_function.h:586:7: note: candidate function not viable: no known conversion from 'RequestResult<SourceKit::RelatedIdentInfo>' to 'const RequestResult<llvm::ArrayRef<SourceKit::RelatedIdentInfo>>' for 1st argument
      operator()(_ArgTypes... __args) const
      ^
/home/ubuntu/jenkins/workspace/oss-swift-RA-linux-ubuntu-16.04-android-arm64/swift/tools/SourceKit/lib/SwiftLang/SwiftSourceDocInfo.cpp:2510:14: warning: private field 'Offset' is not used [-Wunused-private-field]
    unsigned Offset;
             ^
1 warning and 2 errors generated.

@ahoppen
Copy link
Member Author

ahoppen commented Dec 7, 2023

Here we go: #70300

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.

3 participants