[CodeCompletion] Tweak literal suggestion text
For rdar://problem/23865118
diff --git a/lib/IDE/CodeCompletion.cpp b/lib/IDE/CodeCompletion.cpp
index f30d965..1d7c641 100644
--- a/lib/IDE/CodeCompletion.cpp
+++ b/lib/IDE/CodeCompletion.cpp
@@ -3113,12 +3113,12 @@
}, /*isKeyword=*/true);
addFromProto(LK::StringLiteral, "String", [&](Builder &builder) {
builder.addTextChunk("\"");
- builder.addSimpleNamedParameter("text");
+ builder.addSimpleNamedParameter("abc");
builder.addTextChunk("\"");
});
addFromProto(LK::ArrayLiteral, "Array", [&](Builder &builder) {
builder.addLeftBracket();
- builder.addSimpleNamedParameter("item");
+ builder.addSimpleNamedParameter("values");
builder.addRightBracket();
});
addFromProto(LK::DictionaryLiteral, "Dictionary", [&](Builder &builder) {
@@ -3157,9 +3157,7 @@
builder.setLiteralKind(LK::Tuple);
builder.addLeftParen();
- builder.addSimpleNamedParameter("item");
- builder.addComma();
- builder.addSimpleNamedParameter("item");
+ builder.addSimpleNamedParameter("values");
builder.addRightParen();
for (auto T : ExpectedTypes) {
if (!T)
diff --git a/test/IDE/complete_value_literals.swift b/test/IDE/complete_value_literals.swift
index 8baf88f..955a43b 100644
--- a/test/IDE/complete_value_literals.swift
+++ b/test/IDE/complete_value_literals.swift
@@ -108,32 +108,32 @@
func testString0() {
let x: Int = #^STRING_0^#
}
-// STRING_0: Literal[String]/None: "{#(text)#}"[#String#];
+// STRING_0: Literal[String]/None: "{#(abc)#}"[#String#];
func testString1() {
let x: MyString1 = #^STRING_1^#
}
-// STRING_1: Literal[String]/None/TypeRelation[Identical]: "{#(text)#}"[#MyString1#];
+// STRING_1: Literal[String]/None/TypeRelation[Identical]: "{#(abc)#}"[#MyString1#];
func testString2() {
let x: String = #^STRING_2^#
}
-// STRING_2: Literal[String]/None/TypeRelation[Identical]: "{#(text)#}"[#String#];
+// STRING_2: Literal[String]/None/TypeRelation[Identical]: "{#(abc)#}"[#String#];
func testArray0() {
let x: Int = #^ARRAY_0^#
}
-// ARRAY_0: Literal[Array]/None: [{#(item)#}][#Array#];
+// ARRAY_0: Literal[Array]/None: [{#(values)#}][#Array#];
func testArray1() {
let x: MyArray1<MyInt1> = #^ARRAY_1^#
}
-// ARRAY_1: Literal[Array]/None/TypeRelation[Identical]: [{#(item)#}][#MyArray1<MyInt1>#];
+// ARRAY_1: Literal[Array]/None/TypeRelation[Identical]: [{#(values)#}][#MyArray1<MyInt1>#];
func testArray2() {
let x: [MyInt1] = #^ARRAY_2^#
}
-// ARRAY_2: Literal[Array]/None/TypeRelation[Identical]: [{#(item)#}][#[MyInt1]#];
+// ARRAY_2: Literal[Array]/None/TypeRelation[Identical]: [{#(values)#}][#[MyInt1]#];
func testDict0() {
let x: Int = #^DICT_0^#
@@ -153,18 +153,18 @@
func testTuple0() {
let x: Int = #^TUPLE_0^#
}
-// TUPLE_0: Literal[Tuple]/None: ({#(item)#}, {#(item)#});
+// TUPLE_0: Literal[Tuple]/None: ({#(values)#});
func testTuple1() {
let x: (MyInt1, MyString1) = #^TUPLE_1^#
}
-// TUPLE_1: Literal[Tuple]/None/TypeRelation[Identical]: ({#(item)#}, {#(item)#})[#(MyInt1, MyString1)#];
+// TUPLE_1: Literal[Tuple]/None/TypeRelation[Identical]: ({#(values)#})[#(MyInt1, MyString1)#];
func testTuple2() {
let x: (MyInt1, MyString1, MyDouble1) = #^TUPLE_2^#
}
// FIXME: should we extend the tuple to have the right number of elements?
-// TUPLE_2: Literal[Tuple]/None/TypeRelation[Identical]: ({#(item)#}, {#(item)#})[#(MyInt1, MyString1, MyDouble1)#];
+// TUPLE_2: Literal[Tuple]/None/TypeRelation[Identical]: ({#(values)#})[#(MyInt1, MyString1, MyDouble1)#];
struct MyColor1: _ColorLiteralConvertible {
init(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float) {}
diff --git a/test/SourceKit/CodeComplete/complete_filter_rules.swift b/test/SourceKit/CodeComplete/complete_filter_rules.swift
index 47819e4..f88679e 100644
--- a/test/SourceKit/CodeComplete/complete_filter_rules.swift
+++ b/test/SourceKit/CodeComplete/complete_filter_rules.swift
@@ -55,7 +55,7 @@
let x = #^HIDE_LITERALS_2^#
// SHOW_STRING-NOT: [
// SHOW_STRING-NOT: nil
-// SHOW_STRING: "text"
+// SHOW_STRING: "abc"
// SHOW_STRING-NOT: nil
// SHOW_STRING-NOT: [
}
diff --git a/test/SourceKit/CodeComplete/complete_literals.swift b/test/SourceKit/CodeComplete/complete_literals.swift
index e538692..91d13fa 100644
--- a/test/SourceKit/CodeComplete/complete_literals.swift
+++ b/test/SourceKit/CodeComplete/complete_literals.swift
@@ -13,7 +13,7 @@
// LITERALS: key.kind: source.lang.swift.literal.dictionary
// LITERALS: key.sourcetext: "[<#{{.*}}#>: <#{{.*}}#>]"
// LITERALS: key.kind: source.lang.swift.literal.tuple
-// LITERALS: key.sourcetext: "(<#{{.*}}#>, <#{{.*}}#>)"
+// LITERALS: key.sourcetext: "(<#{{.*}}#>)"
// LITERALS: key.kind: source.lang.swift.literal.nil
// RUN: %complete-test -tok=STMT1 %s -raw | FileCheck %s -check-prefix=STMT
diff --git a/test/SourceKit/CodeComplete/complete_sort_order.swift b/test/SourceKit/CodeComplete/complete_sort_order.swift
index e6c7e14..ac59064 100644
--- a/test/SourceKit/CodeComplete/complete_sort_order.swift
+++ b/test/SourceKit/CodeComplete/complete_sort_order.swift
@@ -62,10 +62,10 @@
// EXPR: 0
// EXPR: false
// EXPR: true
-// EXPR: "text"
-// EXPR: [item]
+// EXPR: "abc"
+// EXPR: [values]
// EXPR: [key: value]
-// EXPR: (item, item)
+// EXPR: (values)
// EXPR: nil
// EXPR: [#Color(colorLiteralRed: Float, green: Float, blue: Float, alpha: Float)#]
// EXPR: foo(a: Int)
