Merge pull request #59518 from bnbarham/cherry-async-syntax

[5.7][Parse] Set missing contextual keyword token kind for `async`

Author: bnbarham

lib/Parse/ParsePattern.cpp

@@ -978,6 +978,7 @@ ParserStatus Parser::parseEffectsSpecifiers(SourceLoc existingArrowLoc,
             .fixItInsert(throwsLoc, isReasync ? "reasync " : "async ");
       }
       if (asyncLoc.isInvalid()) {
+        Tok.setKind(tok::contextual_keyword);
         if (reasync)
           *reasync = isReasync;
         asyncLoc = Tok.getLoc();

test/IDE/coloring.swift

@@ -174,6 +174,8 @@ protocol Prot {
   var protocolProperty1: Int { get }
   // CHECK: <kw>var</kw> protocolProperty2: <type>Int</type> { <kw>get</kw> <kw>set</kw> }
   var protocolProperty2: Int { get set }
+  // CHECK: <kw>var</kw> protoAsyncProp: <type>Int</type> { <kw>get</kw> <kw>async</kw> }
+  var protoAsyncProp: Int { get async }
 }
 
 // CHECK: <attr-builtin>infix</attr-builtin> <kw>operator</kw> *-* : FunnyPrecedence{{$}}

test/SourceKit/SyntaxMapData/Inputs/syntaxmap.swift

@@ -64,3 +64,7 @@ enum A {
     case namedArguments(param1: String, param2: Int)
     case mutedArguments(String, Int)
 }
+
+protocol AsyncPropTest {
+  var protoAsyncProp: Int { get async }
+}

test/SourceKit/SyntaxMapData/syntaxmap.swift.response

@@ -1,6 +1,6 @@
 {
   key.offset: 0,
-  key.length: 1325,
+  key.length: 1393,
   key.diagnostic_stage: source.diagnostic.stage.swift.parse,
   key.syntaxmap: [
     {
@@ -707,6 +707,41 @@
       key.kind: source.lang.swift.syntaxtype.typeidentifier,
       key.offset: 1318,
       key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1326,
+      key.length: 8
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1335,
+      key.length: 13
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1353,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.identifier,
+      key.offset: 1357,
+      key.length: 14
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.typeidentifier,
+      key.offset: 1373,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1379,
+      key.length: 3
+    },
+    {
+      key.kind: source.lang.swift.syntaxtype.keyword,
+      key.offset: 1383,
+      key.length: 5
     }
   ]
 }

unittests/Syntax/TypeSyntaxTests.cpp

@@ -494,7 +494,7 @@ TEST(TypeSyntaxTests, FunctionTypeMakeAPIs) {
   auto RightParen = Factory.makeRightParenToken("", " ");
   auto Int = Factory.makeTypeIdentifier("Int", "", "");
   auto IntArg = Factory.makeBlankTupleTypeElement().withType(Int);
-  auto Async = Factory.makeIdentifier("async", "", " ");
+  auto Async = Factory.makeContextualKeyword("async", "", " ");
   auto Throws = Factory.makeThrowsKeyword("", " ");
   auto Rethrows = Factory.makeRethrowsKeyword("", " ");
   auto Arrow = Factory.makeArrowToken("", " ");

utils/gyb_syntax_support/DeclNodes.py

@@ -76,8 +76,7 @@
     Node('FunctionSignature', kind='Syntax',
          children=[
              Child('Input', kind='ParameterClause'),
-             Child('AsyncOrReasyncKeyword', kind='IdentifierToken',
-                   classification='Keyword',
+             Child('AsyncOrReasyncKeyword', kind='ContextualKeywordToken',
                    text_choices=['async', 'reasync'], is_optional=True),
              Child('ThrowsOrRethrowsKeyword', kind='Token',
                    is_optional=True,
@@ -538,8 +537,7 @@
                       '_read', '_modify'
                    ]),
              Child('Parameter', kind='AccessorParameter', is_optional=True),
-             Child('AsyncKeyword', kind='IdentifierToken',
-                   classification='Keyword',
+             Child('AsyncKeyword', kind='ContextualKeywordToken',
                    text_choices=['async'], is_optional=True),
              Child('ThrowsKeyword', kind='Token',
                    is_optional=True,

utils/gyb_syntax_support/ExprNodes.py

@@ -193,8 +193,7 @@
     # NOTE: This appears only in SequenceExpr.
     Node('ArrowExpr', kind='Expr',
          children=[
-             Child('AsyncKeyword', kind='IdentifierToken',
-                   classification='Keyword',
+             Child('AsyncKeyword', kind='ContextualKeywordToken',
                    text_choices=['async'], is_optional=True),
              Child('ThrowsToken', kind='ThrowsToken',
                    is_optional=True),
@@ -394,8 +393,7 @@
                        Child('SimpleInput', kind='ClosureParamList'),
                        Child('Input', kind='ParameterClause'),
                    ]),
-             Child('AsyncKeyword', kind='IdentifierToken',
-                   classification='Keyword',
+             Child('AsyncKeyword', kind='ContextualKeywordToken',
                    text_choices=['async'], is_optional=True),
              Child('ThrowsTok', kind='ThrowsToken', is_optional=True),
              Child('Output', kind='ReturnClause', is_optional=True),

utils/gyb_syntax_support/TypeNodes.py

@@ -167,8 +167,7 @@
              Child('Arguments', kind='TupleTypeElementList',
                    collection_element_name='Argument'),
              Child('RightParen', kind='RightParenToken'),
-             Child('AsyncKeyword', kind='IdentifierToken',
-                   classification='Keyword',
+             Child('AsyncKeyword', kind='ContextualKeyworkToken',
                    text_choices=['async'], is_optional=True),
              Child('ThrowsOrRethrowsKeyword', kind='Token',
                    is_optional=True,