Merge pull request #17179 from CodaFi/just-out-of-reach

[4.2][CodeCompletion] Remove UserInaccessible DeclKeywords

Author: CodaFi

include/swift/AST/Attr.def

@@ -207,7 +207,7 @@ DECL_ATTR(_specialize, Specialize,
 SIMPLE_DECL_ATTR(objcMembers, ObjCMembers, OnClass, 34)
 
 CONTEXTUAL_SIMPLE_DECL_ATTR(__consuming, Consuming, DeclModifier |
-                            OnFunc |
+                            OnFunc | UserInaccessible |
                             NotSerialized, 40)
 
 CONTEXTUAL_SIMPLE_DECL_ATTR(mutating, Mutating, DeclModifier |

lib/IDE/CodeCompletion.cpp

@@ -4849,30 +4849,35 @@ static bool isClangSubModule(ModuleDecl *TheModule) {
 }
 
 static void addDeclKeywords(CodeCompletionResultSink &Sink) {
-  auto AddKeyword = [&](StringRef Name, CodeCompletionKeywordKind Kind) {
+  auto AddKeyword = [&](StringRef Name, CodeCompletionKeywordKind Kind,
+                        Optional<DeclAttrKind> DAK) {
     if (Name == "let" || Name == "var") {
       // Treat keywords that could be the start of a pattern specially.
       return;
     }
+
+    // Remove user inaccessible keywords.
+    if (DAK.hasValue() && DeclAttribute::isUserInaccessible(*DAK)) return;
+
     CodeCompletionResultBuilder Builder(
         Sink, CodeCompletionResult::ResultKind::Keyword,
         SemanticContextKind::None, {});
     Builder.setKeywordKind(Kind);
     Builder.addTextChunk(Name);
   };
 
-#define DECL_KEYWORD(kw) AddKeyword(#kw, CodeCompletionKeywordKind::kw_##kw);
+#define DECL_KEYWORD(kw) AddKeyword(#kw, CodeCompletionKeywordKind::kw_##kw, None);
 #include "swift/Syntax/TokenKinds.def"
 
   // Context-sensitive keywords.
-  auto AddCSKeyword = [&](StringRef Name) {
-    AddKeyword(Name, CodeCompletionKeywordKind::None);
+  auto AddCSKeyword = [&](StringRef Name, DeclAttrKind Kind) {
+    AddKeyword(Name, CodeCompletionKeywordKind::None, Kind);
   };
 
-#define CONTEXTUAL_CASE(KW) AddCSKeyword(#KW);
-#define CONTEXTUAL_DECL_ATTR(KW, ...) CONTEXTUAL_CASE(KW)
-#define CONTEXTUAL_DECL_ATTR_ALIAS(KW, ...) CONTEXTUAL_CASE(KW)
-#define CONTEXTUAL_SIMPLE_DECL_ATTR(KW, ...) CONTEXTUAL_CASE(KW)
+#define CONTEXTUAL_CASE(KW, CLASS) AddCSKeyword(#KW, DAK_##CLASS);
+#define CONTEXTUAL_DECL_ATTR(KW, CLASS, ...) CONTEXTUAL_CASE(KW, CLASS)
+#define CONTEXTUAL_DECL_ATTR_ALIAS(KW, CLASS) CONTEXTUAL_CASE(KW, CLASS)
+#define CONTEXTUAL_SIMPLE_DECL_ATTR(KW, CLASS, ...) CONTEXTUAL_CASE(KW, CLASS)
 #include <swift/AST/Attr.def>
 #undef CONTEXTUAL_CASE
 

test/SourceKit/CodeComplete/complete_override.swift.response

@@ -1,14 +1,5 @@
 {
   key.results: [
-    {
-      key.kind: source.lang.swift.keyword,
-      key.name: "__consuming",
-      key.sourcetext: "__consuming",
-      key.description: "__consuming",
-      key.typename: "",
-      key.context: source.codecompletion.context.none,
-      key.num_bytes_to_erase: 0
-    },
     {
       key.kind: source.lang.swift.keyword,
       key.name: "associatedtype",