Fix failing test cases for expected_keyword_in_decl diagnostic

Author: broadwaylamb

lib/Parse/ParseDecl.cpp

@@ -3014,15 +3014,15 @@ Parser::parseDecl(ParseDeclOptions Flags,
         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");
+        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",
@@ -3043,15 +3043,15 @@ Parser::parseDecl(ParseDeclOptions Flags,
           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");
+          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");
           }
         }
 

test/Parse/diagnostic_missing_func_keyword.swift

@@ -51,3 +51,13 @@ class Baz {
 
   static staticProperty: Int { 0 } // expected-error {{expected 'var' keyword in static property declaration}} {{10-10=var }}
 }
+
+class C1 {
+  class classMethod() {} // expected-error {{expected '{' in class}}
+}
+
+class C2 {
+  class classProperty: Int { 0 } // expected-error {{inheritance from non-protocol, non-class type 'Int'}}
+                                 // expected-note @-1 {{in declaration of 'classProperty'}}
+                                 // expected-error @-2 {{expected declaration}}
+}

test/SourceKit/DocumentStructure/structure.swift.empty.response

@@ -1450,7 +1450,7 @@
       key.line: 116,
       key.column: 1,
       key.severity: source.diagnostic.severity.error,
-      key.description: "expected 'func' keyword in function declaration",
+      key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
         {

test/SourceKit/DocumentStructure/structure.swift.foobar.response

@@ -1453,7 +1453,7 @@
       key.column: 1,
       key.filepath: "-foobar",
       key.severity: source.diagnostic.severity.error,
-      key.description: "expected 'func' keyword in function declaration",
+      key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
         {

test/SourceKit/DocumentStructure/structure.swift.response

@@ -1453,7 +1453,7 @@
       key.column: 1,
       key.filepath: main.swift,
       key.severity: source.diagnostic.severity.error,
-      key.description: "expected 'func' keyword in function declaration",
+      key.description: "expected 'func' keyword in instance method declaration",
       key.diagnostic_stage: source.diagnostic.stage.swift.parse,
       key.fixits: [
         {