Merge pull request #41688 from etcwilde/ewilde/replace-await-with-async

Fix await in effect with async

Author: etcwilde

include/swift/AST/DiagnosticsParse.def

@@ -804,6 +804,8 @@ ERROR(expected_dynamic_func_attr,none,
 ERROR(async_after_throws,none,
       "%select{'async'|'reasync'}0 must precede %select{'throws'|'rethrows'}1",
       (bool, bool))
+ERROR(await_in_function_type,none,
+      "expected async specifier; did you mean 'async'?", ())
 ERROR(duplicate_effects_specifier,none,
       "'%0' has already been specified", (StringRef))
 

lib/Parse/ParsePattern.cpp

@@ -926,6 +926,7 @@ bool Parser::isEffectsSpecifier(const Token &T) {
   //       'parseEffectsSpecifiers()'.
 
   if (T.isContextualKeyword("async") ||
+      (T.isContextualKeyword("await") && !T.isAtStartOfLine()) ||
       T.isContextualKeyword("reasync"))
     return true;
 
@@ -984,6 +985,13 @@ ParserStatus Parser::parseEffectsSpecifiers(SourceLoc existingArrowLoc,
       consumeToken();
       continue;
     }
+    // diagnose 'await'
+    if (Tok.isContextualKeyword("await") && !Tok.isAtStartOfLine()) {
+      diagnose(Tok, diag::await_in_function_type)
+        .fixItReplace(Tok.getLoc(), "async");
+      consumeToken();
+      continue;
+    }
 
     // 'throws'/'rethrows', or diagnose 'throw'/'try'.
     if (Tok.isAny(tok::kw_throws, tok::kw_rethrows) ||

test/Parse/errors.swift

@@ -160,3 +160,7 @@ func fixitTry0<T>(a: T) try where T:ExpressibleByStringLiteral {} // expected-er
 func fixitTry1<T>(a: T) try {} // expected-error{{expected throwing specifier; did you mean 'throws'?}} {{25-28=throws}}
 func fixitTry2() try {} // expected-error{{expected throwing specifier; did you mean 'throws'?}} {{18-21=throws}}
 let fixitTry3 : () try -> Int // expected-error{{expected throwing specifier; did you mean 'throws'?}} {{20-23=throws}}
+
+func fixitAwait0() await { } // expected-error{{expected async specifier; did you mean 'async'?}}{{20-25=async}}
+func fixitAwait1() await -> Int { } // expected-error{{expected async specifier; did you mean 'async'?}}{{20-25=async}}
+func fixitAwait2() throws await -> Int { } // expected-error{{expected async specifier; did you mean 'async'?}}{{27-32=async}}