Merge pull request swiftlang#77226 from JanBaig/issue-macro-diag

[Diagnostics] Extend fix-it logic for misssing arguments without parenthesis

Author: xedin

lib/Sema/CSDiagnostics.cpp

@@ -5365,7 +5365,16 @@ bool MissingArgumentsFailure::diagnoseSingleMissingArgument() const {
     // fn(argX, argY):
     //   fn(argX, argY[, argMissing])
     if (args->empty()) {
-      insertLoc = args->getRParenLoc();
+      if (args->getRParenLoc().isInvalid()) { 
+        // Extend fix-it if no parenthesis and no args
+        insertBuf.insert(insertBuf.begin(), '(');
+        insertBuf.insert(insertBuf.end(), ')');
+        insertLoc =
+          Lexer::getLocForEndOfToken(ctx.SourceMgr, fnExpr->getEndLoc());
+        if (insertLoc.isInvalid()) 
+          return false;
+      } else 
+        insertLoc = args->getRParenLoc();
     } else if (position != 0) {
       auto argPos = std::min(args->size(), position) - 1;
       insertLoc = Lexer::getLocForEndOfToken(
@@ -5404,9 +5413,6 @@ bool MissingArgumentsFailure::diagnoseSingleMissingArgument() const {
     }
   }
 
-  if (insertLoc.isInvalid())
-    return false;
-
   // If we are trying to insert a trailing closure but the parameter
   // corresponding to the missing argument doesn't support a trailing closure,
   // don't provide a Fix-It.

test/Macros/attached_macros_diags.swift

@@ -7,22 +7,38 @@
 @attached(peer) macro m1() = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
 
 @attached(peer) macro m2(_: Int) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
-// expected-note@-1{{candidate has partially matching parameter list (Int)}}
+// expected-note@-1{{'m2' declared here}}
 // expected-note@-2{{candidate expects value of type 'Int' for parameter #1 (got 'String')}}
 
 @attached(peer) macro m2(_: Double) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
-// expected-note@-1{{candidate has partially matching parameter list (Double)}}
-// expected-note@-2{{candidate expects value of type 'Double' for parameter #1 (got 'String')}}
+// expected-note@-1{{candidate expects value of type 'Double' for parameter #1 (got 'String')}}
 
 @attached(peer) macro m3(message: String) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
+// expected-note@-1{{'m3(message:)' declared here}}
+
+@attached(peer) macro m4(_ param1: Int, label2 param2: String) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
+// expected-note@-1 3 {{'m4(_:label2:)' declared here}}
+
+@attached(peer) macro m5(label1: Int, label2: String) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
+// expected-note@-1{{'m5(label1:label2:)' declared here}}
+
+@attached(peer) macro m6(label: Int = 42) = #externalMacro(module: "MacroDefinition", type: "EmptyPeerMacro")
 
 @freestanding(expression) macro stringify<T>(_ value: T) -> (T, String) = #externalMacro(module: "MyMacros", type: "StringifyMacro")
 // expected-warning@-1{{external macro implementation type 'MyMacros.StringifyMacro' could not be found for macro 'stringify'}}
 // expected-note@-2{{'stringify' declared here}}
 
 @m1 struct X1 { }
 
-@m2 struct X2 { } // expected-error{{no exact matches in call to macro 'm2'}}
+@m2 struct X2 { } // expected-error{{missing argument for parameter #1 in macro expansion}}{{4-4=(<#Int#>)}}
+
+@m3 struct X3 { } // expected-error{{missing argument for parameter 'message' in macro expansion}}{{4-4=(message: <#String#>)}}
+
+@m4 struct X4 { } // expected-error{{missing arguments for parameters #1, 'label2' in macro expansion}}{{4-4=(<#Int#>, label2: <#String#>)}}
+
+@m5 struct X5 { } // expected-error{{missing arguments for parameters 'label1', 'label2' in macro expansion}}{{4-4=(label1: <#Int#>, label2: <#String#>)}}
+
+@m6 struct X6 { }
 
 // Check for nesting rules.
 struct SkipNestedType {
@@ -54,6 +70,10 @@ struct TestMacroArgs {
 
   @m2(Nested.x) struct Args5 {}
 
+  @m4(10) struct Args6 { } // expected-error{{missing argument for parameter 'label2' in macro expansion}}{{9-9=, label2: <#String#>}}
+
+  @m4(label2: "test") struct Args7 { } // expected-error{{missing argument for parameter #1 in macro expansion}}{{7-7=<#Int#>, }}
+
   struct Nested {
     static let x = 10
 
@@ -62,15 +82,15 @@ struct TestMacroArgs {
     @m2(Nested.x) struct Args2 {}
   }
 
-  @m3(message: stringify(Nested.x).1) struct Args6 {}
+  @m3(message: stringify(Nested.x).1) struct Args8 {}
   // expected-error@-1{{expansion of macro 'stringify' requires leading '#'}}
 
-  @m3(message: #stringify().1) struct Args7 {}
+  @m3(message: #stringify().1) struct Args9 {}
   // expected-error@-1{{missing argument for parameter #1 in macro expansion}}
 
-  @m3(message: #stringify(Nested.x).1) struct Args8 {}
+  @m3(message: #stringify(Nested.x).1) struct Args10 {}
 
   // Allow macros to have arbitrary generic specialization lists, but warn
   // https://github.com/swiftlang/swift/issues/75500
-  @m1<UInt> struct Args9 {} // expected-warning {{cannot specialize a non-generic external macro 'm1()'}}
+  @m1<UInt> struct Args11 {} // expected-warning {{cannot specialize a non-generic external macro 'm1()'}}
 }