averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Macros] Make macro expansions always have an argument list. If an explicit

Browse Source 
argument list isn't written, an implicit, empty list is created.
This commit is contained in:
Holly Borla
2023-01-31 17:04:35 -08:00
parent 7c50f95e1b
commit 26786c1e09
6 changed files with 30 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Sema/CSDiagnostics.cpp
View File

@@ -4634,7 +4634,8 @@ ASTNode MissingArgumentsFailure::getAnchor() const {
}
SourceLoc MissingArgumentsFailure::getLoc() const {
if (auto *argList = getArgumentListFor(getLocator()))
auto *argList = getArgumentListFor(getLocator());
if (argList && !argList->isImplicit())
return argList->getLoc();
return FailureDiagnostic::getLoc();
}
@@ -4729,17 +4730,25 @@ bool MissingArgumentsFailure::diagnoseAsError() {
// TODO(diagnostics): We should be able to suggest this fix-it
// unconditionally.
if (args && args->empty()) {
SmallString<32> scratch;
llvm::raw_svector_ostream fixIt(scratch);
SmallString<32> scratch;
llvm::raw_svector_ostream fixIt(scratch);
auto appendMissingArgsToFix = [&]() {
interleave(
SynthesizedArgs,
[&](const SynthesizedArg &arg) {
forFixIt(fixIt, arg.param);
},
[&] { fixIt << ", "; });
};
if (args && args->empty() && !args->isImplicit()) {
appendMissingArgsToFix();
diag.fixItInsertAfter(args->getLParenLoc(), fixIt.str());
} else if (isExpr<MacroExpansionExpr>(getRawAnchor())) {
fixIt << "(";
appendMissingArgsToFix();
fixIt << ")";
diag.fixItInsertAfter(getRawAnchor().getEndLoc(), fixIt.str());
}
diag.flush();