---

yaml
---
r: 340799
b: refs/heads/rxwei-patch-1
c: 2872210
h: refs/heads/master
i:
  340797: 8316c2a
  340795: 04f92bf
  340791: 4d8283d
  340783: a62d797
  340767: ed21a6b
  340735: 86ac3b2

Author: hamishknight

[refs]

@@ -1015,7 +1015,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-08-18-a: b10b1fce14385faa6d44f6b933e95
 refs/heads/rdar-43033749-fix-batch-mode-no-diags-swift-5.0-branch: a14e64eaad30de89f0f5f0b2a782eed7ecdcb255
 refs/heads/revert-19006-error-bridging-integer-type: 8a9065a3696535305ea53fe9b71f91cbe6702019
 refs/heads/revert-19050-revert-19006-error-bridging-integer-type: ecf752d54b05dd0a20f510f0bfa54a3fec3bcaca
-refs/heads/rxwei-patch-1: dcabcb36b4189a87ed4924b1669a51ebc86ce283
+refs/heads/rxwei-patch-1: 28722107352981c0472723a5ec26afafcdd7b54c
 refs/heads/shahmishal-patch-1: e58ec0f7488258d42bef51bc3e6d7b3dc74d7b2a
 refs/heads/typelist-existential: 4046359efd541fb5c72d69a92eefc0a784df8f5e
 refs/tags/swift-4.2-DEVELOPMENT-SNAPSHOT-2018-08-20-a: 4319ba09e4fb8650ee86061075c74a016b6baab9

branches/rxwei-patch-1/lib/IDE/CodeCompletion.cpp

@@ -1457,9 +1457,8 @@ protocolForLiteralKind(CodeCompletionLiteralKind kind) {
 /// that is of type () -> ().
 static bool hasTrivialTrailingClosure(const FuncDecl *FD,
                                       AnyFunctionType *funcType) {
-  SmallBitVector defaultMap =
-    computeDefaultMap(funcType->getParams(), FD,
-                      /*level*/ FD->isInstanceMember() ? 1 : 0);
+  auto defaultMap = computeDefaultMap(funcType->getParams(), FD,
+                                      /*skipCurriedSelf*/ FD->hasCurriedSelf());
 
   if (defaultMap.size() - defaultMap.count() == 1) {
     auto param = funcType->getParams().back();

branches/rxwei-patch-1/test/IDE/complete_trailing_closure.swift

@@ -56,6 +56,7 @@ func test1() {
 struct S {
   func method1(_: ()->()) {}
   static func method2(_: ()->()) {}
+  static func method3(_ a: Int = 0, _: ()->()) {}
   func nonTrivial1(_: (Int)->()) {}
   func nonTrivial2(_: @autoclosure ()->()) {}
   func test2() {
@@ -81,6 +82,7 @@ func test5() {
 }
 // STATIC_METHOD_1-NOT: {|}
 // STATIC_METHOD_1: Decl[StaticMethod]/CurrNominal:     method2 {|}[#Void#]
+// STATIC_METHOD_1: Decl[StaticMethod]/CurrNominal:     method3 {|}[#Void#]
 // STATIC_METHOD_1-NOT: {|}
 
 class C {