Skip to content

Commit c6ff153

Browse files
committed
[AST] Unmark consuming and borrowing as UserInaccessible
These are official features now (SE-0377). This allows them to show up in code completion.
1 parent 85c0555 commit c6ff153

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

include/swift/AST/DeclAttr.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,10 @@ CONTEXTUAL_SIMPLE_DECL_ATTR(_local, KnownToBeLocal,
453453
DeclModifier | OnFunc | OnParam | OnVar | UserInaccessible | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
454454
130)
455455
CONTEXTUAL_SIMPLE_DECL_ATTR(consuming, Consuming,
456-
OnFunc | OnAccessor | DeclModifier | UserInaccessible | NotSerialized | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
456+
OnFunc | OnAccessor | DeclModifier | NotSerialized | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
457457
140)
458458
CONTEXTUAL_SIMPLE_DECL_ATTR(borrowing, Borrowing,
459-
OnFunc | OnAccessor | DeclModifier | UserInaccessible | NotSerialized | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
459+
OnFunc | OnAccessor | DeclModifier | NotSerialized | ABIBreakingToAdd | ABIBreakingToRemove | APIStableToAdd | APIStableToRemove,
460460
141)
461461
DECL_ATTR(attached, MacroRole,
462462
OnMacro | AllowMultipleAttributes | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIBreakingToRemove,

test/IDE/complete_keywords.swift

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
// KW_DECL-DAG: Keyword[let]/None: let{{; name=.+$}}
2424
// KW_DECL-DAG: Keyword/None: mutating{{; name=.+$}}
2525
// KW_DECL-DAG: Keyword/None: nonmutating{{; name=.+$}}
26+
// KW_DECL-DAG: Keyword/None: consuming{{; name=.+$}}
27+
// KW_DECL-DAG: Keyword/None: borrowing{{; name=.+$}}
2628
// KW_DECL-DAG: Keyword[operator]/None: operator{{; name=.+$}}
2729
// KW_DECL-DAG: Keyword/None: optional{{; name=.+$}}
2830
// KW_DECL-DAG: Keyword/None: override{{; name=.+$}}
@@ -58,6 +60,8 @@
5860
// KW_DECL_PROTOCOL-DAG: Keyword[let]/None: let{{; name=.+$}}
5961
// KW_DECL_PROTOCOL-DAG: Keyword/None: mutating{{; name=.+$}}
6062
// KW_DECL_PROTOCOL-DAG: Keyword/None: nonmutating{{; name=.+$}}
63+
// KW_DECL_PROTOCOL-DAG: Keyword/None: consuming{{; name=.+$}}
64+
// KW_DECL_PROTOCOL-DAG: Keyword/None: borrowing{{; name=.+$}}
6165
// KW_DECL_PROTOCOL-DAG: Keyword[operator]/None/Flair[RareKeyword]: operator{{; name=.+$}}
6266
// KW_DECL_PROTOCOL-DAG: Keyword/None: optional{{; name=.+$}}
6367
// KW_DECL_PROTOCOL-DAG: Keyword/None: override{{; name=.+$}}
@@ -93,6 +97,8 @@
9397
// KW_DECL_TYPECONTEXT-DAG: Keyword[let]/None: let{{; name=.+$}}
9498
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: mutating{{; name=.+$}}
9599
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: nonmutating{{; name=.+$}}
100+
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: consuming{{; name=.+$}}
101+
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: borrowing{{; name=.+$}}
96102
// KW_DECL_TYPECONTEXT-DAG: Keyword[operator]/None/Flair[RareKeyword]: operator{{; name=.+$}}
97103
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: optional{{; name=.+$}}
98104
// KW_DECL_TYPECONTEXT-DAG: Keyword/None: override{{; name=.+$}}
@@ -132,6 +138,8 @@
132138
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[let]/None: let{{; name=.+$}}
133139
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: mutating{{; name=.+$}}
134140
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: nonmutating{{; name=.+$}}
141+
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: consuming{{; name=.+$}}
142+
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: borrowing{{; name=.+$}}
135143
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword[operator]/None: operator{{; name=.+$}}
136144
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: optional{{; name=.+$}}
137145
// KW_DECL_STMT_TOPLEVEL-DAG: Keyword/None: override{{; name=.+$}}
@@ -198,6 +206,8 @@
198206
// KW_DECL_STMT-DAG: Keyword[let]/None: let{{; name=.+$}}
199207
// KW_DECL_STMT-DAG: Keyword/None: mutating{{; name=.+$}}
200208
// KW_DECL_STMT-DAG: Keyword/None: nonmutating{{; name=.+$}}
209+
// KW_DECL_STMT-DAG: Keyword/None: consuming{{; name=.+$}}
210+
// KW_DECL_STMT-DAG: Keyword/None: borrowing{{; name=.+$}}
201211
// KW_DECL_STMT-DAG: Keyword[operator]/None/Flair[RareKeyword]: operator{{; name=.+$}}
202212
// KW_DECL_STMT-DAG: Keyword/None/Flair[RareKeyword]: optional{{; name=.+$}}
203213
// KW_DECL_STMT-DAG: Keyword/None/Flair[RareKeyword]: override{{; name=.+$}}

0 commit comments

Comments
 (0)