[CodeCompletion] Remove ... and & from function filter names

The filter name of a function should match the spelling of the function
name according to the language except that we don't insert _ for unnamed
parameters because underscores are legal inside identifiers and we don't
want to introduce spurious matches (also, we keep the () on a
parameterless function for disambiguation).

rdar://problem/26118915

Author: benlangmuir

test/SourceKit/CodeComplete/complete_name.swift

@@ -4,8 +4,8 @@
 struct S {
   init(a: Int, b: Int, _ c: Int) {}
   init(_ a: Int, _ b: Int) {}
-  func foo1(_ a: Int, _ b: Int, _ c: Int) {}
-  func foo2(a a: Int, b: Int, c: Int) {}
+  func foo1(_ a: Int, _ b: Int, _ c: Int, _ d: Int..., _ e: inout Int) {}
+  func foo2(a a: Int, b: Int, c: Int, d: Int..., e: inout Int) {}
 }
 
 func test01() {
@@ -16,5 +16,5 @@ func test01() {
 func test02(_ x: S) {
   x.#^METHOD_NAME^#
 }
-// METHOD_NAME: key.name: "foo1(:::)"
-// METHOD_NAME: key.name: "foo2(a:b:c:)"
+// METHOD_NAME: key.name: "foo1(:::::)"
+// METHOD_NAME: key.name: "foo2(a:b:c:d:e:)"

test/SourceKit/CodeComplete/complete_popular_api.swift

@@ -10,6 +10,7 @@ func okay() {}
 struct Foo {
   func bad() { }
   func good() { }
+  func good(_ p1: Int, p2: Any..., p3: ()->(), p4: (Int, Int), p5: inout Int) { }
   func okay() {}
   var sad: Int
   var xhappy: Int
@@ -38,11 +39,13 @@ struct Foo {
 
 // NOPOP_FOO: key.name: "bad()
 // NOPOP_FOO: key.name: "good()
+// NOPOP_FOO: key.name: "good(:p2:p3:p4:p5:)
 // NOPOP_FOO: key.name: "okay()
 // NOPOP_FOO: key.name: "sad
 // NOPOP_FOO: key.name: "xhappy
 // NOPOP_FOO: key.name: "zmeh
 
+// POP_FOO: key.name: "good(:p2:p3:p4:p5:)
 // POP_FOO: key.name: "good()
 // POP_FOO: key.name: "xhappy
 // POP_FOO: key.name: "okay()

test/SourceKit/CodeComplete/complete_popular_api.swift.popular

@@ -1,3 +1,4 @@
+good(:p2:p3:p4:p5:)
 good()
 xhappy
 EEModuleColor

tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.cpp

@@ -1180,6 +1180,8 @@ void CompletionBuilder::getFilterName(CodeCompletionString *str,
       case ChunkKind::DeclAttrParamEqual:
       case ChunkKind::Comma:
       case ChunkKind::Whitespace:
+      case ChunkKind::Ellipsis:
+      case ChunkKind::Ampersand:
         continue;
       case ChunkKind::CallParameterColon:
         // Since we don't add the type, also don't add the space after ':'.