Skip to content

[IDE] Better handle macro trailing closures #81673

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.

Sign up for GitHub

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

Jump to bottom
Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

[IDE] Better handle macro trailing closures #81673

wants to merge 4 commits into from
+235 −50

Conversation

hamishknight
Copy link
Contributor

  • Allow placeholder expansion to turn macro closure arguments into trailing closures
  • Allow placeholder expansion to work for CustomAttr arguments
  • Introduce a separate trailing closure completion for trivial trailing closure cases, matching the function declaration logic.

rdar://150550747

@hamishknight
[SourceKit] Handle macro arguments in placeholder expansion
6095278 
Allow macro argument placeholders to expand into trailing closures.

rdar://150550747
@hamishknight
[SourceKit] Handle CustomAttrs arguments for placeholder expansion
7522a3e 
Introduce a new ASTWalker option for walking CustomAttrs and use it
for the placeholder scanner to ensure we can expand placeholders in
attribute arguments.
@hamishknight
[Completion] NFC: Factor out addMacroCallArguments
352caa4
@hamishknight
[Completion] Suggest trivial trailing closures for macros
157c997 
Follow the same logic as function decl completion and suggest a
trailing closure for trivial cases.

rdar://150550747
@hamishknight
Copy link
Contributor Author

@swift-ci please test

rintaro
rintaro reviewed May 21, 2025
View reviewed changes
lib/IDE/CompletionLookup.cpp
if (!VD->hasParameterList())
return false;

auto *funcType = type->castTo<AnyFunctionType>();
Copy link
Member

Choose a reason for hiding this comment

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

Does anything guarantee that MacroDecl->getInterfaceType() is always AnyFunctionType here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rintaro rintaro rintaro left review comments

@bnbarham bnbarham Awaiting requested review from bnbarham bnbarham is a code owner

@hborla hborla Awaiting requested review from hborla hborla is a code owner

@slavapestov slavapestov Awaiting requested review from slavapestov slavapestov is a code owner

@xedin xedin Awaiting requested review from xedin xedin is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@hamishknight @rintaro