Skip to content

[ASTPrinter] Restore printing generic requirement contexts #7675

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 2 commits into from
Feb 22, 2017
Merged

[ASTPrinter] Restore printing generic requirement contexts #7675

merged 2 commits into from
Feb 22, 2017

Conversation

bitjammer
Copy link
Contributor

@bitjammer bitjammer commented Feb 21, 2017

cfe9e6a removed calls to pre/post
printing of PrintStructureKind::GenericRequirement, so SourceKit DocInfo
requests started dropping the markers for generic requirements, causing
some weirdness with documentation rendering and post-processing.

Restore the calls to printStructPre/Post when printing generic
requirements.

rdar://problem/30561880

@bitjammer
Copy link
Contributor Author

@swift-ci Please test

1 similar comment
@bitjammer
Copy link
Contributor Author

@swift-ci Please test

@akyrtzi
Copy link
Contributor

akyrtzi commented Feb 22, 2017

LGTM!

@bitjammer
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - ceafe90ce255e53fa8d4159c45bbc42b8267658e
Test requested by - @bitjammer


// RUN: %sourcekitd-test -req=cursor -pos=81:8 %s -- -F %S/../Inputs/libIDE-mock-sdk -I %t.tmp %mcp_opt %s | %FileCheck %s -check-prefix=CHECK34
// CHECK34: source.lang.swift.decl.function.method.instance (81:8-81:50)
// CHECK34-NEXT: foo(_:)
// CHECK34-NEXT: s:FV11cursor_info2S23foou0_Rd_0_zqd__rFFT_T_FT_T_
// CHECK34-NEXT: <T, U, V, W where U == T, W == V> (S2<T, U>) -> (() -> ()) -> () -> ()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to delete these other lines? Also in other changes below.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, I sure didn't. Sigh.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this was a conflict resolution when I cherry-picked the original commit. I'll fix it.

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - ceafe90ce255e53fa8d4159c45bbc42b8267658e
Test requested by - @bitjammer

cfe9e6a removed calls to pre/post
printing of PrintStructureKind::GenericRequirement, so SourceKit DocInfo
requests started droping the markers for generic requirements, causing
some weirdness with documentation rendering and post-processing.

Restore the calls to printStructPre/Post when printing generic
requirements.

rdar://problem/30561880
@bitjammer
Copy link
Contributor Author

@swift-ci Please test

1 similar comment
@bitjammer
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 1517892f770f7fa37a2c21c5b3307a6c5f2bf459
Test requested by - @bitjammer

@benlangmuir
Copy link
Contributor

Thanks, LGTM!

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 84f6318524965af1374bf929e0947641a79c29b8
Test requested by - @bitjammer

- Remove a test file that made its way in to the original commit.
- Don't need a newline forcing wrapper for printStructurePost

rdar://problem/30404063
@bitjammer
Copy link
Contributor Author

@swift-ci Please test

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test OS X Platform
Git Commit - 84f6318524965af1374bf929e0947641a79c29b8
Test requested by - @bitjammer

@swift-ci
Copy link
Contributor

Build failed
Jenkins build - Swift Test Linux Platform
Git Commit - 84f6318524965af1374bf929e0947641a79c29b8
Test requested by - @bitjammer

@bitjammer
Copy link
Contributor Author

@shahmishal, I feel like the bot shouldn't be posting notifications that say "Build failed" for automatically restarted builds due to a different SHA.

@bitjammer
Copy link
Contributor Author

(Especially since the build actually successfully starts)

@tkremenek tkremenek merged commit 4f93035 into swiftlang:swift-3.1-branch Feb 22, 2017
@bitjammer bitjammer deleted the rdar-30561880-missing-constraint-annotation-swift-3.1 branch February 22, 2017 23:06
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