[CodeComplete] Offer completion suggestions for default argument values inside the macro declaration + argument label inside #externalMacro
#65526
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ahoppen
requested review from
bnbarham,
hborla,
slavapestov and
xedin
as code owners
ahoppen
changed the title
#externalMacro
|
@swift-ci Please smoke test |
ahoppen
force-pushed
the
ahoppen/complete-in-macro-default-arg
branch
from
f17e5b9 to
057b42f
Compare
xedin
reviewed
May 1, 2023
lib/Sema/TypeCheckStmt.cpp
Outdated
| } else if (auto *MD = dyn_cast<MacroDecl>(defaultArg->getParent())) { | ||
| Param = MD->getParameterList()->get(defaultArg->getIndex()); | ||
| } else if (auto *SD = dyn_cast<SubscriptDecl>(defaultArg->getParent())) { | ||
| Param = SD->getIndices()->get(defaultArg->getIndex()); |
There was a problem hiding this comment.
Can this use getParameterAt instead? swift::getParameterList already handles MacroDecl too.
…es inside the macro declaration We were not type checking the default argument initializer because `MacroDecl` is not an `AbstractFucntionDecl`. Add `MacroDecl` to the list of nodes we know how to get parameters from. rdar://108163564
ahoppen
force-pushed
the
ahoppen/complete-in-macro-default-arg
branch
from
057b42f to
ce957a7
Compare
xedin
approved these changes
May 1, 2023
|
@swift-ci Please smoke test |
bnbarham
approved these changes
May 1, 2023
| @@ -3959,7 +3959,8 @@ TypeConverter::getLoweredLocalCaptures(SILDeclRef fn) { | |||
| fn.getAsRegularLocation(), Context); | |||
|
|
|||
| if (auto *afd = dyn_cast<AbstractFunctionDecl>(curFn.getDecl())) { | |||
| auto *param = getParameterAt(afd, curFn.defaultArgIndex); | |||
| auto *param = getParameterAt(static_cast<ValueDecl *>(afd), | |||
There was a problem hiding this comment.
Why's the static_cast needed?
There was a problem hiding this comment.
Because otherwise it’s ambiguous whether this should call getParameterAt(DeclContext *, …) or getParameterAt(ValueDecl *, …)
| // DEFAULT_ARG: Decl[GlobalVar]/CurrModule/TypeRelation[Convertible]: globalVar[#Int#]; name=globalVar | ||
|
|
||
| @freestanding(expression) | ||
| macro externalMacro() = ##^EXTERNAL_MACRO^#externalMacro |
There was a problem hiding this comment.
Given the test just below this one, I assume this isn't meant to have the trailing externalMacro?
|
|
||
| @freestanding(expression) | ||
| macro externalMacroCallPattern() = #externalMacro(#^EXTERNAL_MACRO_CALL_PATTERN^#) | ||
| // EXTERNAL_MACRO_CALL_PATTERN: Pattern/None/Flair[ArgLabels]/TypeRelation[Convertible]: ['(']{#module: String#}, {#type: String#}[')'][#Void#]; name=module:type: |
There was a problem hiding this comment.
What's module:type: there?
There was a problem hiding this comment.
That’s how the call pattern shows up in code completion, I think. It’s the same that shows up for normal function calls
$ cat /tmp/a.swift
func foo(module: String, type: String) {}
foo(#^COMPLETE^#)
$ swift-ide-complete /tmp/a.swift
+ /Users/alex/sbin/swift-ide-test -code-completion -source-filename /private/tmp/a.swift -code-completion-token COMPLETE
found code completion token COMPLETE at offset 47
Begin completions, 1 items
Decl[FreeFunction]/CurrModule/Flair[ArgLabels]: ['(']{#module: String#}, {#type: String#}[')'][#Void#]; name=module:type:
End completions
…Macro` rdar://108163809 rdar://108681394
ahoppen
force-pushed
the
ahoppen/complete-in-macro-default-arg
branch
from
ce957a7 to
7e4b88b
Compare
|
@swift-ci Please smoke test |
|
@swift-ci Please smoke test macOS |
1 similar comment
|
@swift-ci Please smoke test macOS |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We were not type checking the default argument initializer because
MacroDeclis not anAbstractFucntionDecl. AddMacroDeclto the list of nodes we know how to get parameters from.Pretty much unrelated, but also a small change in the same test file: Continue checking a
#externalMacrodeclaration in code completion mode even if the argument labels don’t match. This way we get completion results for#externalMacroargument labels and when competing after#whenexternalMacrois already specified.rdar://108163564
rdar://108163809
rdar://108681394