Use DescriptiveDeclKind for better expected_keyword_in_decl diagnostic

Author: broadwaylamb

include/swift/AST/DiagnosticsParse.def

@@ -217,7 +217,7 @@ ERROR(expected_decl,none,
 ERROR(expected_identifier_in_decl,none,
       "expected identifier in %0 declaration", (StringRef))
 ERROR(expected_keyword_in_decl,none,
-      "expected '%0' keyword in %1 declaration", (StringRef, StringRef))
+      "expected '%0' keyword in %1 declaration", (StringRef, DescriptiveDeclKind))
 ERROR(number_cant_start_decl_name,none,
       "%0 name can only start with a letter or underscore, not a number",
       (StringRef))

lib/Parse/ParseDecl.cpp

@@ -3010,8 +3010,23 @@ Parser::parseDecl(ParseDeclOptions Flags,
           Tok.is(tok::l_paren) && peekToken().isIdentifierOrUnderscore();
 
       if (IsProbablyVarDecl || IsProbablyTupleDecl) {
+
+        DescriptiveDeclKind DescriptiveKind;
+
+        switch (StaticSpelling) {
+          case StaticSpellingKind::None:
+            DescriptiveKind = DescriptiveDeclKind::Property;
+            break;
+          case StaticSpellingKind::KeywordStatic:
+            DescriptiveKind = DescriptiveDeclKind::StaticProperty;
+            break;
+          case StaticSpellingKind::KeywordClass:
+            llvm_unreachable("kw_class is only parsed as a modifier if it's "
+                             "followed by a keyword");
+        }
+
         diagnose(Tok.getLoc(), diag::expected_keyword_in_decl, "var",
-                 "property")
+                 DescriptiveKind)
             .fixItInsert(Tok.getLoc(), "var ");
         parseLetOrVar(/*HasLetOrVarKeyword=*/false);
         break;
@@ -3021,8 +3036,27 @@ Parser::parseDecl(ParseDeclOptions Flags,
           Tok.isIdentifierOrUnderscore() || Tok.isAnyOperator();
 
       if (IsProbablyFuncDecl) {
+
+        DescriptiveDeclKind DescriptiveKind;
+
+        if (Tok.isAnyOperator()) {
+          DescriptiveKind = DescriptiveDeclKind::OperatorFunction;
+        } else {
+          switch (StaticSpelling) {
+            case StaticSpellingKind::None:
+              DescriptiveKind = DescriptiveDeclKind::Method;
+              break;
+            case StaticSpellingKind::KeywordStatic:
+              DescriptiveKind = DescriptiveDeclKind::StaticMethod;
+              break;
+            case StaticSpellingKind::KeywordClass:
+              llvm_unreachable("kw_class is only parsed as a modifier if it's "
+                               "followed by a keyword");
+          }
+        }
+
         diagnose(Tok.getLoc(), diag::expected_keyword_in_decl, "func",
-                 "function")
+                 DescriptiveKind)
             .fixItInsert(Tok.getLoc(), "func ");
         parseFunc(/*HasFuncKeyword=*/false);
         break;

test/Parse/ConditionalCompilation/stmt_in_type.swift

@@ -8,6 +8,6 @@ struct S1 { // expected-note {{in declaration of 'S1'}}
 #if FOO
   return 1; // expected-error {{expected declaration}}
 #elseif BAR
-  foo(); // expected-error {{expected 'func' keyword in function declaration}}
+  foo(); // expected-error {{expected 'func' keyword in instance method declaration}}
 #endif
 }

test/Parse/diagnostic_missing_func_keyword.swift

@@ -3,13 +3,13 @@
 // https://bugs.swift.org/browse/SR-10477
 
 protocol Brew { // expected-note {{in declaration of 'Brew'}}
-  tripel() -> Int // expected-error {{expected 'func' keyword in function declaration}} {{3-3=func }}
+  tripel() -> Int // expected-error {{expected 'func' keyword in instance method declaration}} {{3-3=func }}
 
   quadrupel: Int { get } // expected-error {{expected 'var' keyword in property declaration}} {{3-3=var }}
 
-  static + (lhs: Self, rhs: Self) -> Self // expected-error {{expected 'func' keyword in function declaration}} {{10-10=func }}
+  static + (lhs: Self, rhs: Self) -> Self // expected-error {{expected 'func' keyword in operator function declaration}} {{10-10=func }}
 
-  * (lhs: Self, rhs: Self) -> Self // expected-error {{expected 'func' keyword in function declaration}} {{3-3=func }}
+  * (lhs: Self, rhs: Self) -> Self // expected-error {{expected 'func' keyword in operator function declaration}} {{3-3=func }}
                                    // expected-error @-1 {{operator '*' declared in protocol must be 'static'}} {{3-3=static }}
 
   ipa: Int { get }; apa: Float { get }
@@ -27,7 +27,7 @@ infix operator %%
 struct Bar {
   fisr = 0x5F3759DF // expected-error {{expected 'var' keyword in property declaration}} {{3-3=var }}
 
-  %%<T: Brew> (lhs: T, rhs: T) -> T { // expected-error {{expected 'func' keyword in function declaration}} {{3-3=func }}
+  %%<T: Brew> (lhs: T, rhs: T) -> T { // expected-error {{expected 'func' keyword in operator function declaration}} {{3-3=func }}
                                       // expected-error @-1 {{operator '%%' declared in type 'Bar' must be 'static'}}
                                       // expected-error @-2 {{member operator '%%' must have at least one argument of type 'Bar'}}
     lhs + lhs + rhs + rhs
@@ -40,3 +40,14 @@ struct Bar {
 
   a, b: Int // expected-error {{expected 'var' keyword in property declaration}} {{3-3=var }}
 }
+
+class Baz {
+
+  instanceMethod() {} // expected-error {{expected 'func' keyword in instance method declaration}} {{3-3=func }}
+
+  static staticMethod() {} // expected-error {{expected 'func' keyword in static method declaration}} {{10-10=func }}
+
+  instanceProperty: Int { 0 } // expected-error {{expected 'var' keyword in property declaration}} {{3-3=var }}
+
+  static staticProperty: Int { 0 } // expected-error {{expected 'var' keyword in static property declaration}} {{10-10=var }}
+}

test/Parse/line-directive.swift

@@ -24,7 +24,7 @@ x x // expected-error{{consecutive statements}} {{2-2=;}}
 
 // rdar://19582475
 public struct S { // expected-note{{in declaration of 'S'}}
-// expected-error@+8{{expected 'func' keyword in function declaration}}
+// expected-error@+8{{expected 'func' keyword in operator function declaration}}
 // expected-error@+7{{operator '/' declared in type 'S' must be 'static'}}
 // expected-error@+6{{expected '(' in argument list of function declaration}}
 // expected-error@+5{{operators must have one or two arguments}}

test/Parse/recovery.swift

@@ -542,14 +542,14 @@ func use_BracesInsideNominalDecl1() {
 
 class SR771 {
     print("No one else was in the room where it happened") // expected-note {{'print()' previously declared here}}
-    // expected-error @-1 {{expected 'func' keyword in function declaration}}
+    // expected-error @-1 {{expected 'func' keyword in instance method declaration}}
     // expected-error @-2 {{expected '{' in body of function declaration}}
     // expected-error @-3 {{expected parameter name followed by ':'}}
 }
 
 extension SR771 {
     print("The room where it happened, the room where it happened")
-    // expected-error @-1 {{expected 'func' keyword in function declaration}}
+    // expected-error @-1 {{expected 'func' keyword in instance method declaration}}
     // expected-error @-2 {{invalid redeclaration of 'print()'}}
     // expected-error @-3 {{expected parameter name followed by ':'}}
 }
@@ -558,7 +558,7 @@ extension SR771 {
 //===--- Recovery for wrong decl introducer keyword.
 
 class WrongDeclIntroducerKeyword1 {
-  notAKeyword() {} // expected-error {{expected 'func' keyword in function declaration}}
+  notAKeyword() {} // expected-error {{expected 'func' keyword in instance method declaration}}
   func foo() {}
   class func bar() {}
 }

test/Sema/immutability.swift

@@ -511,7 +511,7 @@ struct StructWithDelegatingInit {
 struct F {
   mutating mutating mutating f() { // expected-error 2 {{duplicate modifier}}
                                    // expected-note@-1 2 {{modifier already specified here}}
-                                   // expected-error@-2 {{expected 'func' keyword in function declaration}}
+                                   // expected-error@-2 {{expected 'func' keyword in instance method declaration}}
   }
 
   mutating nonmutating func g() {}  // expected-error {{method must not be declared both 'mutating' and 'nonmutating'}}