Merge pull request swiftlang#22710 from davezarzycki/fewer_ide_complete_decl_attribute_merge_conflicts

[Testing] Minimize merge conflicts in IDE/complete_decl_attribute.swift

Author: davezarzycki

test/IDE/complete_decl_attribute.swift

@@ -9,7 +9,12 @@
 
 @available(#^AVAILABILITY1^#)
 
-// AVAILABILITY1: Begin completions, 9 items
+// NOTE: Please do not include the ", N items" after "Begin completions". The
+// item count creates needless merge conflicts given that we use the "-NEXT"
+// feature of FileCheck and because an "End completions" line exists for each
+// test.
+
+// AVAILABILITY1: Begin completions
 // AVAILABILITY1-NEXT: Keyword/None:                       *[#Platform#]; name=*{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       iOS[#Platform#]; name=iOS{{$}}
 // AVAILABILITY1-NEXT: Keyword/None:                       tvOS[#Platform#]; name=tvOS{{$}}
@@ -23,7 +28,7 @@
 
 @available(*, #^AVAILABILITY2^#)
 
-// AVAILABILITY2:             Begin completions, 5 items
+// AVAILABILITY2:             Begin completions
 // AVAILABILITY2-NEXT:        Keyword/None:                       unavailable; name=unavailable{{$}}
 // AVAILABILITY2-NEXT:        Keyword/None:                       message: [#Specify message#]; name=message{{$}}
 // AVAILABILITY2-NEXT:        Keyword/None:                       renamed: [#Specify replacing name#]; name=renamed{{$}}
@@ -34,7 +39,7 @@
 @#^KEYWORD2^#
 func method(){}
 
-// KEYWORD2:                  Begin completions, 10 items
+// KEYWORD2:                  Begin completions
 // KEYWORD2-NEXT:             Keyword/None:                       available[#Func Attribute#]; name=available{{$}}
 // KEYWORD2-NEXT:             Keyword/None:                       objc[#Func Attribute#]; name=objc{{$}}
 // KEYWORD2-NEXT:             Keyword/None:                       IBAction[#Func Attribute#]; name=IBAction{{$}}
@@ -50,7 +55,7 @@ func method(){}
 @#^KEYWORD3^#
 class C {}
 
-// KEYWORD3:                  Begin completions, 10 items
+// KEYWORD3:                  Begin completions
 // KEYWORD3-NEXT:             Keyword/None:                       available[#Class Attribute#]; name=available{{$}}
 // KEYWORD3-NEXT:             Keyword/None:                       objc[#Class Attribute#]; name=objc{{$}}
 // KEYWORD3-NEXT:             Keyword/None:                       dynamicCallable[#Class Attribute#]; name=dynamicCallable{{$}}
@@ -69,7 +74,7 @@ class C2 {}
 
 @#^KEYWORD4^#
 enum E {}
-// KEYWORD4:                  Begin completions, 5 items
+// KEYWORD4:                  Begin completions
 // KEYWORD4-NEXT:             Keyword/None:                       available[#Enum Attribute#]; name=available{{$}}
 // KEYWORD4-NEXT:             Keyword/None:                       objc[#Enum Attribute#]; name=objc{{$}}
 // KEYWORD4-NEXT:             Keyword/None:                       dynamicCallable[#Enum Attribute#]; name=dynamicCallable
@@ -80,7 +85,7 @@ enum E {}
 
 @#^KEYWORD5^#
 struct S{}
-// KEYWORD5:                  Begin completions, 4 items
+// KEYWORD5:                  Begin completions
 // KEYWORD5-NEXT:             Keyword/None:                       available[#Struct Attribute#]; name=available{{$}}
 // KEYWORD5-NEXT:             Keyword/None:                       dynamicCallable[#Struct Attribute#]; name=dynamicCallable
 // KEYWORD5-NEXT:             Keyword/None:                       dynamicMemberLookup[#Struct Attribute#]; name=dynamicMemberLookup
@@ -90,7 +95,7 @@ struct S{}
 
 @#^KEYWORD_LAST^#
 
-// KEYWORD_LAST:                  Begin completions, 21 items
+// KEYWORD_LAST:                  Begin completions
 // KEYWORD_LAST-NEXT:             Keyword/None:                       available[#Declaration Attribute#]; name=available{{$}}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       objc[#Declaration Attribute#]; name=objc{{$}}
 // KEYWORD_LAST-NEXT:             Keyword/None:                       dynamicCallable[#Declaration Attribute#]; name=dynamicCallable