fixed PY-13884 "Override Methods" loses @staticmethod decorator from parent

python/src/com/jetbrains/python/codeInsight/override/PyOverrideImplementUtil.java

@@ -183,8 +183,11 @@ public class PyOverrideImplementUtil {
   private static PyFunctionBuilder buildOverriddenFunction(PyClass pyClass, PyFunction baseFunction, boolean implement) {
     PyFunctionBuilder pyFunctionBuilder = new PyFunctionBuilder(baseFunction.getName());
     final PyDecoratorList decorators = baseFunction.getDecoratorList();
-    if (decorators != null && decorators.findDecorator(PyNames.CLASSMETHOD) != null) {
-      pyFunctionBuilder.decorate(PyNames.CLASSMETHOD);
+    if (decorators != null) {
+      if (decorators.findDecorator(PyNames.CLASSMETHOD) != null)
+        pyFunctionBuilder.decorate(PyNames.CLASSMETHOD);
+      else if (decorators.findDecorator(PyNames.STATICMETHOD) != null)
+        pyFunctionBuilder.decorate(PyNames.STATICMETHOD);
     }
     PyAnnotation anno = baseFunction.getAnnotation();
     if (anno != null) {

python/testData/override/staticMethod.py

@@ -0,0 +1,7 @@
+class A:
+    @staticmethod
+    def foo(cls):
+        cls.k = 3
+
+class B(A):
+    <caret>pass

python/testData/override/staticMethod_after.py

@@ -0,0 +1,9 @@
+class A:
+    @staticmethod
+    def foo(cls):
+        cls.k = 3
+
+class B(A):
+    @staticmethod
+    def foo(cls):
+        <selection>A.foo(cls)</selection>

python/testSrc/com/jetbrains/python/PyOverrideTest.java

@@ -64,6 +64,10 @@ public class PyOverrideTest extends PyTestCase {
     doTest();
   }
 
+  public void testStaticMethod() {
+    doTest();
+  }
+
   public void testNewStyle() {
     doTest();
   }