[CodeCompletion] Do not include decl in own default argument

Similar to 4cf7426 but for the case
when the completion is in a default argument expression rather than
initializer. Fixed to grab either the initializer or default argument if
there is one.

Author: bnbarham

lib/AST/NameLookup.cpp

@@ -149,9 +149,14 @@ void UsableFilteringDeclConsumer::foundDecl(ValueDecl *D,
     DeclVisibilityKind reason, DynamicLookupInfo dynamicLookupInfo) {
   // Skip when Loc is within the decl's own initializer
   if (auto *VD = dyn_cast<VarDecl>(D)) {
+    Expr *init = VD->getParentInitializer();
+    if (auto *PD = dyn_cast<ParamDecl>(D)) {
+      init = PD->getStructuralDefaultExpr();
+    }
+
     // Only check if the VarDecl has the same (or parent) context to avoid
-    // grabbing the end location for every decl
-    if (auto *init = VD->getParentInitializer()) {
+    // grabbing the end location for every decl with an initializer
+    if (init != nullptr) {
       auto *varContext = VD->getDeclContext();
       if (DC == varContext || DC->isChildContextOf(varContext)) {
         auto initRange = Lexer::getCharSourceRangeFromSourceRange(

test/IDE/complete_expr_postfix_begin.swift

@@ -75,8 +75,8 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TUPLE_1 | %FileCheck %s -check-prefix=IN_TUPLE_1
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=IN_TUPLE_2 | %FileCheck %s -check-prefix=IN_TUPLE_2
 
-// RUN-FIXME(rdar56755598): %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_1 | %FileCheck %s -check-prefix=OWN_INIT_1
-// RUN-FIXME(rdar56755598): %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_2 | %FileCheck %s -check-prefix=OWN_INIT_2
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_1 | %FileCheck %s -check-prefix=OWN_INIT_1
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_2 | %FileCheck %s -check-prefix=OWN_INIT_2
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_3 | %FileCheck %s -check-prefix=OWN_INIT_3
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_4 | %FileCheck %s -check-prefix=OWN_INIT_4
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_5 | %FileCheck %s -check-prefix=OWN_INIT_5
@@ -85,6 +85,8 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_8 | %FileCheck %s -check-prefix=OWN_INIT_8
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_9 | %FileCheck %s -check-prefix=OWN_INIT_9
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_10 | %FileCheck %s -check-prefix=OWN_INIT_10
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_11 | %FileCheck %s -check-prefix=OWN_INIT_11
+// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_INIT_12 | %FileCheck %s -check-prefix=OWN_INIT_12
 
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_ACCESSOR_1 | %FileCheck %s -check-prefix=OWN_ACCESSOR_1
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=OWN_ACCESSOR_2 | %FileCheck %s -check-prefix=OWN_ACCESSOR_2
@@ -612,6 +614,14 @@ func ownInitTesting() {
   // OWN_INIT_10: Begin completions
   // OWN_INIT_10-NOT: ownInit10
 }
+func ownInitTestingParam(ownInit11: Int = #^OWN_INIT_11^#) {
+  // OWN_INIT_11: Begin completions
+  // OWN_INIT_11-NOT: Decl[LocalVar]{{.*}}ownInit11
+}
+func ownInitTestingParamInterp(ownInit12: String = "\(#^OWN_INIT_12^#)") {
+  // OWN_INIT_12: Begin completions
+  // OWN_INIT_12-NOT: Decl[LocalVar]{{.*}}ownInit12
+}
 func ownInitTestingShadow(ownInit7: Int) {
   var ownInit7: Int = #^OWN_INIT_7^#
   // OWN_INIT_7: Begin completions