Merge pull request #25590 from rintaro/5.1-ide-completion-customattr-func-rdar50352482

[5.1][CodeCompletion] Enable custom attribute completion for func decl

Author: akyrtzi

lib/IDE/CodeCompletion.cpp

@@ -5381,9 +5381,11 @@ void CodeCompletionCallbacksImpl::doneParsing() {
   case CompletionKind::AttributeBegin: {
     Lookup.getAttributeDeclCompletions(IsInSil, AttTargetDK);
 
-    // Provide any type name for property delegate.
+    // TypeName at attribute position after '@'.
+    // - VarDecl: Property Wrappers.
+    // - ParamDecl/VarDecl/FuncDecl: Function Buildres.
     if (!AttTargetDK || *AttTargetDK == DeclKind::Var ||
-        *AttTargetDK == DeclKind::Param)
+        *AttTargetDK == DeclKind::Param || *AttTargetDK == DeclKind::Func)
       Lookup.getTypeCompletionsInDeclContext(
           P.Context.SourceMgr.getCodeCompletionLoc());
     break;

test/IDE/complete_attributes.swift

@@ -2,7 +2,7 @@
 // RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=MEMBER_DECL_ATTR_1 -code-completion-keywords=false | %FileCheck %s -check-prefix=ERROR_COMMON
 
 // ERROR_COMMON: found code completion token
-// ERROR_COMMON-NOT: Begin completions
+// ERROR_COMMON-NOT: Keyword/
 
 @#^TOP_LEVEL_ATTR_1^# class TopLevelDeclAttr1 {}
 

test/IDE/complete_decl_attribute.swift

@@ -59,7 +59,9 @@ func method(){}
 // KEYWORD2-NEXT:             Keyword/None:                       usableFromInline[#Func Attribute#]; name=usableFromInline
 // KEYWORD2-NEXT:             Keyword/None:                       discardableResult[#Func Attribute#]; name=discardableResult
 // KEYWORD2-NEXT:             Keyword/None:                       IBSegueAction[#Func Attribute#]; name=IBSegueAction{{$}}
-// KEYWORD2-NEXT:             End completions
+// KEYWORD2-NOT:              Keyword
+// KEYWORD2:                  Decl[Struct]/CurrModule:            MyStruct[#MyStruct#]; name=MyStruct
+// KEYWORD2:                  End completions
 
 @#^KEYWORD3^#
 class C {}
@@ -171,6 +173,8 @@ struct _S {
 // ON_METHOD-DAG: Keyword/None:                       usableFromInline[#Func Attribute#]; name=usableFromInline
 // ON_METHOD-DAG: Keyword/None:                       discardableResult[#Func Attribute#]; name=discardableResult
 // ON_METHOD-DAG: Keyword/None:                       IBSegueAction[#Func Attribute#]; name=IBSegueAction
+// ON_METHOD-NOT: Keyword
+// ON_METHOD: Decl[Struct]/CurrModule:            MyStruct[#MyStruct#]; name=MyStruct
 // ON_METHOD: End completions
 
   func bar(@#^ON_PARAM^#)