Skip to content

Commit 56bf3df

Browse files
DougGregorDougGregor
committed
Update tests
1 parent 7fc7040 commit 56bf3df

File tree

5 files changed

+2
-43
lines changed

5 files changed

+2
-43
lines changed

‎test/IDE/complete_annotation.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ func testGlobal() {
3939
// GLOBAL_EXPR-DAG: Literal[_Color]/None: <name>#colorLiteral</name>(<callarg><callarg.label>red</callarg.label>: <callarg.type><typeid.sys>Float</typeid.sys></callarg.type></callarg>, <callarg><callarg.label>green</callarg.label>: <callarg.type><typeid.sys>Float</typeid.sys></callarg.type></callarg>, <callarg><callarg.label>blue</callarg.label>: <callarg.type><typeid.sys>Float</typeid.sys></callarg.type></callarg>, <callarg><callarg.label>alpha</callarg.label>: <callarg.type><typeid.sys>Float</typeid.sys></callarg.type></callarg>); typename=;
4040
// GLOBAL_EXPR-DAG: Literal[_Image]/None: <name>#imageLiteral</name>(<callarg><callarg.label>resourceName</callarg.label>: <callarg.type><typeid.sys>String</typeid.sys></callarg.type></callarg>); typename=;
4141
// GLOBAL_EXPR-DAG: Literal[Tuple]/None: (<callarg><callarg.param>values</callarg.param></callarg>); typename=;
42-
// GLOBAL_EXPR-DAG: Keyword[#function]/None: <name>#function</name>; typename=<typeid.sys>String</typeid.sys>;
4342
// GLOBAL_EXPR-DAG: Decl[Module]/None/IsSystem: <name>Swift</name>; typename=Module;
4443
// GLOBAL_EXPR-DAG: Decl[Struct]/OtherModule[Swift]/IsSystem: <name>Int</name>; typename=<typeid.sys>Int</typeid.sys>;
4544
// GLOBAL_EXPR-DAG: Decl[FreeFunction]/OtherModule[Swift]/IsSystem: <name>print</name>(<callarg><callarg.label>_</callarg.label> <callarg.param>items</callarg.param>: <callarg.type><keyword>Any</keyword></callarg.type>...</callarg>, <callarg><callarg.label>to</callarg.label> <callarg.param>output</callarg.param>: &amp;<callarg.type><typeid.sys>TextOutputStream</typeid.sys></callarg.type></callarg>); typename=<typeid.sys>Void</typeid.sys>;

‎test/IDE/complete_at_top_level_library.swift

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ protocol MyProtocol {}
7575
// LIBRARY-DAG: Literal[Array]/None/Flair[ExprAtFileScope]: [{#(values)#}][#Array#]; name=[]
7676
// LIBRARY-DAG: Literal[Dictionary]/None/Flair[ExprAtFileScope]: [{#(key)#}: {#(value)#}][#Dictionary#]; name=[: ]
7777
// LIBRARY-DAG: Literal[Tuple]/None/Flair[ExprAtFileScope]: ({#(values)#}); name=()
78-
// LIBRARY-DAG: Keyword[#fileID]/None/Flair[ExprAtFileScope]: #fileID[#String#]; name=#fileID
79-
// LIBRARY-DAG: Keyword[#file]/None/Flair[ExprAtFileScope]: #file[#String#]; name=#file
80-
// LIBRARY-DAG: Keyword[#filePath]/None/Flair[ExprAtFileScope]: #filePath[#String#]; name=#filePath
81-
// LIBRARY-DAG: Keyword[#function]/None/Flair[ExprAtFileScope]: #function[#String#]; name=#function
82-
// LIBRARY-DAG: Keyword[#line]/None/Flair[ExprAtFileScope]: #line[#Int#]; name=#line
83-
// LIBRARY-DAG: Keyword[#column]/None/Flair[ExprAtFileScope]: #column[#Int#]; name=#column
84-
// LIBRARY-DAG: Keyword[#dsohandle]/None/Flair[ExprAtFileScope]: #dsohandle[#UnsafeRawPointer#]; name=#dsohandle
8578
// LIBRARY-DAG: Decl[Struct]/CurrModule/Flair[ExprAtFileScope]: MyStruct[#MyStruct#]; name=MyStruct
8679
// LIBRARY-DAG: Decl[Protocol]/CurrModule/Flair[RareType,ExprAtFileScope]: MyProtocol[#MyProtocol#]; name=MyProtocol
8780
// LIBRARY-DAG: Decl[Struct]/OtherModule[Swift]/Flair[ExprAtFileScope]/IsSystem: Int[#Int#]; name=Int
@@ -151,13 +144,6 @@ protocol MyProtocol {}
151144
// SCRIPT-DAG: Literal[Array]/None: [{#(values)#}][#Array#]; name=[]
152145
// SCRIPT-DAG: Literal[Dictionary]/None: [{#(key)#}: {#(value)#}][#Dictionary#]; name=[: ]
153146
// SCRIPT-DAG: Literal[Tuple]/None: ({#(values)#}); name=()
154-
// SCRIPT-DAG: Keyword[#fileID]/None: #fileID[#String#]; name=#fileID
155-
// SCRIPT-DAG: Keyword[#file]/None: #file[#String#]; name=#file
156-
// SCRIPT-DAG: Keyword[#filePath]/None: #filePath[#String#]; name=#filePath
157-
// SCRIPT-DAG: Keyword[#function]/None: #function[#String#]; name=#function
158-
// SCRIPT-DAG: Keyword[#line]/None: #line[#Int#]; name=#line
159-
// SCRIPT-DAG: Keyword[#column]/None: #column[#Int#]; name=#column
160-
// SCRIPT-DAG: Keyword[#dsohandle]/None: #dsohandle[#UnsafeRawPointer#]; name=#dsohandle
161147
// SCRIPT-DAG: Decl[Struct]/CurrModule: MyStruct[#MyStruct#]; name=MyStruct
162148
// SCRIPT-DAG: Decl[Protocol]/CurrModule/Flair[RareType]: MyProtocol[#MyProtocol#]; name=MyProtocol
163149
// SCRIPT-DAG: Decl[Struct]/OtherModule[Swift]/IsSystem: Int[#Int#]; name=Int

‎test/IDE/complete_expr_postfix_begin.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ typealias FooTypealias = Int
4545
// COMMON-DAG: Decl[Struct]/OtherModule[Swift]/IsSystem: Int32[#Int32#]{{; name=.+$}}
4646
// COMMON-DAG: Decl[Struct]/OtherModule[Swift]/IsSystem: Int64[#Int64#]{{; name=.+$}}
4747
// COMMON-DAG: Decl[Struct]/OtherModule[Swift]/IsSystem: Bool[#Bool#]{{; name=.+$}}
48-
// COMMON-DAG: Keyword[#function]/None{{(/TypeRelation\[Convertible\])?}}: #function[#String#]{{; name=.+$}}
49-
// COMMON-DAG: Keyword[#file]/None{{(/TypeRelation\[Convertible\])?}}: #file[#String#]{{; name=.+$}}
50-
// COMMON-DAG: Keyword[#line]/None{{(/TypeRelation\[Convertible\])?}}: #line[#Int#]{{; name=.+$}}
51-
// COMMON-DAG: Keyword[#column]/None{{(/TypeRelation\[Convertible\])?}}: #column[#Int#]{{; name=.+$}}
5248
// COMMON: End completions
5349

5450
// NO_SELF-NOT: {{[[:<:]][Ss]elf[[:>:]]}}

‎test/IDE/complete_keywords.swift

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,6 @@
180180
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[try]/None: try{{; name=.+$}}
181181
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[try]/None: try!{{; name=.+$}}
182182
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[try]/None: try?{{; name=.+$}}
183-
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[#function]/None{{(/TypeRelation\[Convertible\])?}}: #function[#String#]{{; name=.+$}}
184-
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[#file]/None{{(/TypeRelation\[Convertible\])?}}: #file[#String#]{{; name=.+$}}
185-
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[#line]/None{{(/TypeRelation\[Convertible\])?}}: #line[#Int#]{{; name=.+$}}
186-
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[#column]/None{{(/TypeRelation\[Convertible\])?}}: #column[#Int#]{{; name=.+$}}
187183
//
188184
// Literals
189185
//
@@ -252,10 +248,6 @@
252248
// KW_DECL_STMT-DAG: Keyword[try]/None: try{{; name=.+$}}
253249
// KW_DECL_STMT-DAG: Keyword[try]/None: try!{{; name=.+$}}
254250
// KW_DECL_STMT-DAG: Keyword[try]/None: try?{{; name=.+$}}
255-
// KW_DECL_STMT-DAG: Keyword[#function]/None{{(/TypeRelation\[Convertible\])?}}: #function[#String#]{{; name=.+$}}
256-
// KW_DECL_STMT-DAG: Keyword[#file]/None{{(/TypeRelation\[Convertible\])?}}: #file[#String#]{{; name=.+$}}
257-
// KW_DECL_STMT-DAG: Keyword[#line]/None{{(/TypeRelation\[Convertible\])?}}: #line[#Int#]{{; name=.+$}}
258-
// KW_DECL_STMT-DAG: Keyword[#column]/None{{(/TypeRelation\[Convertible\])?}}: #column[#Int#]{{; name=.+$}}
259251
//
260252
// Literals
261253
//
@@ -272,10 +264,6 @@
272264
// KW_EXPR-DAG: Keyword[try]/None: try{{; name=.+$}}
273265
// KW_EXPR-DAG: Keyword[try]/None: try!{{; name=.+$}}
274266
// KW_EXPR-DAG: Keyword[try]/None: try?{{; name=.+$}}
275-
// KW_EXPR-DAG: Keyword[#function]/None{{(/TypeRelation\[Convertible\])?}}: #function[#String#]{{; name=.+$}}
276-
// KW_EXPR-DAG: Keyword[#file]/None{{(/TypeRelation\[Convertible\])?}}: #file[#String#]{{; name=.+$}}
277-
// KW_EXPR-DAG: Keyword[#line]/None{{(/TypeRelation\[Convertible\])?}}: #line[#Int#]{{; name=.+$}}
278-
// KW_EXPR-DAG: Keyword[#column]/None{{(/TypeRelation\[Convertible\])?}}: #column[#Int#]{{; name=.+$}}
279267
//
280268
// let and var
281269
//
@@ -484,20 +472,10 @@ func inSwitch(val: Int) {
484472
func testContextualType() {
485473
let _: UInt32 = #^CONTEXT_UINT32^#
486474
// CONTEXT_UINT32: Begin completions
487-
// CONTEXT_UINT32-DAG: Keyword[#function]/None: #function[#String#]; name=#function
488-
// CONTEXT_UINT32-DAG: Keyword[#file]/None: #file[#String#]; name=#file
489-
// CONTEXT_UINT32-DAG: Keyword[#line]/None/TypeRelation[Convertible]: #line[#UInt32#]; name=#line
490-
// CONTEXT_UINT32-DAG: Keyword[#column]/None/TypeRelation[Convertible]: #column[#UInt32#]; name=#column
491-
// CONTEXT_UINT32-DAG: Keyword[#dsohandle]/None: #dsohandle[#UnsafeRawPointer#]; name=#dsohandle
492475
// CONTEXT_UINT32: End completions
493476

494477
let _: StaticString = #^CONTEXT_STATICSTRING^#
495478
// CONTEXT_STATICSTRING: Begin completions
496-
// CONTEXT_STATICSTRING-DAG: Keyword[#function]/None/TypeRelation[Convertible]: #function[#StaticString#]; name=#function
497-
// CONTEXT_STATICSTRING-DAG: Keyword[#file]/None/TypeRelation[Convertible]: #file[#StaticString#]; name=#file
498-
// CONTEXT_STATICSTRING-DAG: Keyword[#line]/None: #line[#Int#]; name=#line
499-
// CONTEXT_STATICSTRING-DAG: Keyword[#column]/None: #column[#Int#]; name=#column
500-
// CONTEXT_STATICSTRING-DAG: Keyword[#dsohandle]/None: #dsohandle[#UnsafeRawPointer#]; name=#dsohandle
501479
// CONTEXT_STATICSTRING: End completions
502480
}
503481

‎test/SourceKit/CodeComplete/complete_sort_order.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ func test() {
1313
// RUN: %FileCheck -check-prefix=NAME_UNSORTED %s < %t.orig.off
1414
// RUN: not %diff -u %t.orig %t.orig.off
1515

16-
// NAME_SORTED: key.name: "#column"
16+
// NAME_SORTED: key.name: "column"
1717
// NAME_SORTED: key.name: "foo(a:)"
1818
// NAME_SORTED-NOT: key.name:
1919
// NAME_SORTED: key.name: "foo(a:)"
@@ -46,7 +46,7 @@ func test() {
4646
// CONTEXT: key.name: "foo(b:)"
4747
// CONTEXT-NOT: key.name:
4848
// CONTEXT: key.name: "test()"
49-
// CONTEXT: key.name: "#column"
49+
// CONTEXT: key.name: "column"
5050
// CONTEXT: key.name: "complete_sort_order"
5151

5252
// RUN: %complete-test -tok=STMT_0 %s | %FileCheck %s -check-prefix=STMT

0 commit comments

Comments
 (0)