Only emit warning for function and variable decl

Author: mininny

include/swift/AST/DiagnosticsSema.def

@@ -1515,8 +1515,8 @@ ERROR(access_control_open_bad_decl,none,
       "only classes and overridable class members can be declared 'open';"
       " use 'public'", ())
 WARNING(access_control_non_objc_open_member,none,
-      "non-'@objc' %select{properties|methods}0 in extensions cannot be overridden; use 'public' instead",
-      (bool))
+      "non-'@objc' %0 in extensions cannot be overridden; use 'public' instead",
+      (DescriptiveDeclKind))
 
 ERROR(invalid_decl_attribute,none,
       "'%0' attribute cannot be applied to this declaration", (DeclAttribute))

lib/Sema/TypeCheckAttr.cpp

@@ -874,13 +874,15 @@ void AttributeChecker::visitAccessControlAttr(AccessControlAttr *attr) {
       }
     } else {
       if (auto VD = dyn_cast<ValueDecl>(D)) {
-        // Emit warning when trying to declare non-@objc `open` member inside an
-        // extension.
-        if (!VD->isObjC() && attr->getAccess() == AccessLevel::Open) {
-          diagnose(attr->getLocation(),
-                   diag::access_control_non_objc_open_member,
-                   isa<AbstractFunctionDecl>(VD))
-              .fixItReplace(attr->getRange(), "public");
+        if (!isa<NominalTypeDecl>(VD)) {
+          // Emit warning when trying to declare non-@objc `open` member inside
+          // an extension.
+          if (!VD->isObjC() && attr->getAccess() == AccessLevel::Open) {
+            diagnose(attr->getLocation(),
+                     diag::access_control_non_objc_open_member,
+                     VD->getDescriptiveKind())
+                .fixItReplace(attr->getRange(), "public");
+          }
         }
       }
     }

test/attr/open_objc.swift

@@ -9,10 +9,17 @@ open class InvalidOpenExtension {
   open var openVar: Int { 3 } // No warning: Pure Swift properties can be open inside the class declaration.
 }
 extension InvalidOpenExtension {
-  open func nonObjcOpenMethod() { } // expected-warning {{non-'@objc' methods in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
-  open var nonObjcOpenVar: Int { 3 }  // expected-warning {{non-'@objc' properties in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
+  open func nonObjcOpenMethod() { } // expected-warning {{non-'@objc' instance method in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
+  open class func nonObjcOpenMethod() { } // expected-warning {{non-'@objc' class method in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
+  open var nonObjcOpenVar: Int { 3 }  // expected-warning {{non-'@objc' property in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
+  open subscript(_ index: Int) -> Int { 3 } // expected-warning {{non-'@objc' subscript in extensions cannot be overridden; use 'public' instead}} {{3-7=public}}
+  open convenience init(index: Int) { self.init() } // expected-error {{only classes and overridable class members can be declared 'open'; use 'public'}} // expected-warning {{non-'@objc' initializer in extensions cannot be overridden; use 'public' instead}}
+
   @objc open func objcOpenMethod() { } // No warning: @objc methods can be open inside extensions. 
   @objc open var objcOpenVar: Int { 3 } // No warning: @objc methods can be open inside extensions. 
+
+  open class nonObjcClassDecl  { }
+  open enum nonObjcEnumDecl { case one } // expected-error {{only classes and overridable class members can be declared 'open'; use 'public'}} {{3-7=public}}
 }
 
 // For extensions with access level less than open, '`open` modifier conflicts with...' warning will always precede the 'non-@objc member...' warning. 
@@ -28,7 +35,10 @@ public extension InvalidOpenExtension {
 open class ValidOpenExtension { }
 extension ValidOpenExtension {
     open func objcOpenMethod() { } // No warning: This declaration is implicitly @objc
+    open class func objcOpenMethod() { } // No warning: This declaration is implicitly @objc
     open var objcOpenVar: Int { 3 } // No warning: This declaration is implicitly @objc
+    open subscript(_ index: Int) -> Int { 3 } // No warning: This declaration is implicitly @objc
+    open convenience init(index: Int) { self.init() } // expected-error {{only classes and overridable class members can be declared 'open'; use 'public'}}
 }
 
 public extension ValidOpenExtension {