Merge pull request #13696 from benlangmuir/cc-autoclosure-trailing-closure

[code-complete] Don't suggest trailing closure for autoclosure

Author: benlangmuir

lib/IDE/CodeCompletion.cpp

@@ -1546,9 +1546,14 @@ static bool hasTrivialTrailingClosure(const FuncDecl *FD,
     OneArg = (NonDefault == 0);
   }
 
-  if (OneArg)
-    if (auto Fn = funcType->getParams().back().getType()->getAs<AnyFunctionType>())
-      return Fn->getInput()->isVoid() && Fn->getResult()->isVoid();
+  if (OneArg) {
+    auto param = funcType->getParams().back();
+    if (!param.isAutoClosure()) {
+      if (auto Fn = param.getType()->getAs<AnyFunctionType>()) {
+        return Fn->getInput()->isVoid() && Fn->getResult()->isVoid();
+      }
+    }
+  }
 
   return false;
 }

test/IDE/complete_trailing_closure.swift

@@ -57,13 +57,15 @@ struct S {
   func method1(_: ()->()) {}
   static func method2(_: ()->()) {}
   func nonTrivial1(_: (Int)->()) {}
+  func nonTrivial2(_: @autoclosure ()->()) {}
   func test2() {
     self.#^METHOD_1^#
   }
 // METHOD_1: Begin completions
 // METHOD_1: Decl[InstanceMethod]/CurrNominal:   method1 {|}[#Void#]
 // METHOD_1: Decl[InstanceMethod]/CurrNominal:   method1({#() -> ()##() -> ()#})[#Void#]
 // METHOD_1: Decl[InstanceMethod]/CurrNominal:   nonTrivial1({#(Int) -> ()##(Int) -> ()#})[#Void#]
+// METHOD_1: Decl[InstanceMethod]/CurrNominal:   nonTrivial2({#()#})[#Void#]
 // METHOD_1: End completions
 
   func test3() {
@@ -85,6 +87,7 @@ class C {
   func method1(_: ()->()) {}
   class func method2(_: ()->()) {}
   func nonTrivial1(_: (Int)->()) {}
+  func nonTrivial2(_: @autoclosure ()->()) {}
   func test6() {
     self.#^METHOD_4^#
   }