[java] static modifier of created method should depend on containing class (IDEA-203737)

java/java-impl/src/com/intellij/lang/java/request/createFromUsageUtils.kt

@@ -16,6 +16,20 @@ internal fun PsiExpression.isInStaticContext(): Boolean {
   return isWithinStaticMember() || isWithinConstructorCall()
 }
 
+internal fun PsiExpression.isWithinStaticMemberOf(clazz: PsiClass): Boolean {
+  var currentPlace: PsiElement = this
+  while (true) {
+    val enclosingMember = currentPlace.parentOfType<PsiMember>() ?: return false
+    val enclosingClass = enclosingMember.containingClass ?: return false
+    if (enclosingClass == clazz) {
+      return enclosingMember.hasModifierProperty(PsiModifier.STATIC)
+    }
+    else {
+      currentPlace = enclosingClass.parent ?: return false
+    }
+  }
+}
+
 internal fun PsiExpression.isWithinStaticMember(): Boolean {
   return parentOfType<PsiMember>()?.hasModifierProperty(PsiModifier.STATIC) ?: false
 }

java/java-impl/src/com/intellij/lang/java/request/createMethodFromUsage.kt

@@ -61,17 +61,17 @@ private class CreateMethodRequests(val myCall: PsiMethodCallExpression) {
       }
     }
     else {
-      val inStaticContext = myCall.isInStaticContext()
       for (outerClass in collectOuterClasses(myCall)) {
-        processClass(outerClass, inStaticContext)
+        processClass(outerClass, null)
       }
     }
   }
 
-  private fun processClass(clazz: PsiClass, staticContext: Boolean) {
+  private fun processClass(clazz: PsiClass, inStaticContext: Boolean?) {
     if (isMethodSignatureExists(myCall, clazz)) return // TODO generic check
     val visibility = computeVisibility(myCall.project, myCall.parentOfType(), clazz)
     val modifiers = mutableSetOf<JvmModifier>()
+    val staticContext = inStaticContext ?: (myCall.isWithinConstructorCall() || myCall.isWithinStaticMemberOf(clazz))
     if (staticContext) modifiers += JvmModifier.STATIC
     if (visibility != null) modifiers += visibility
     myRequests[clazz] = CreateMethodFromJavaUsageRequest(myCall, modifiers)

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/afterInsideAnonymousClassInStaticMethod.java

@@ -0,0 +1,16 @@
+// "Create method 'doSomething' in 'Test'" "true"
+public class Test {
+    public static void main(String[] args) {
+        blaat(new Runnable() {
+            public void run() {
+                doSomething();
+            }
+        });
+    }
+
+    private static void doSomething() {
+        <caret>
+    }
+
+    public static void blaat(Runnable o) {}
+}

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createMethodFromUsage/beforeInsideAnonymousClassInStaticMethod.java

@@ -0,0 +1,12 @@
+// "Create method 'doSomething' in 'Test'" "true"
+public class Test {
+    public static void main(String[] args) {
+        blaat(new Runnable() {
+            public void run() {
+                <caret>doSomething();
+            }
+        });
+    }
+
+    public static void blaat(Runnable o) {}
+}