Fixing create method intents so that private/public / static keywords are correct when the method created is in a different class.

Author: m0rkeulv

src/main/java/com/intellij/plugins/haxe/ide/inspections/intentions/HaxeIntroduceMethodIntention.java

@@ -67,12 +67,13 @@ private PsiElement generateDeclaration(@NotNull Project project) {
     String returnType = guessReturnElementType();
     String returnStatement = determineReturnStatement(returnType);
     String optionalStaticKeyword = needsToBeStatic() ? "static" : "";
+    String privateKeyword = needsToBePublic() ? "public" : "private";
     String function = """
-      private %s function %s (%s):%s {
+      %s %s function %s (%s):%s {
         %s
       }
       """
-      .formatted(optionalStaticKeyword, methodName, generateParameterList(), returnType, returnStatement);
+      .formatted(privateKeyword, optionalStaticKeyword, methodName, generateParameterList(), returnType, returnStatement);
 
     return HaxeElementGenerator.createMethodDeclaration(project, function);
   }

src/main/java/com/intellij/plugins/haxe/ide/inspections/intentions/HaxeUnresolvedSymbolIntentionBase.java

@@ -7,6 +7,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.plugins.haxe.HaxeFileType;
 import com.intellij.plugins.haxe.lang.psi.*;
+import com.intellij.plugins.haxe.lang.psi.impl.HaxeReferenceImpl;
 import com.intellij.plugins.haxe.model.HaxeFieldModel;
 import com.intellij.plugins.haxe.model.evaluator.HaxeExpressionEvaluator;
 import com.intellij.plugins.haxe.model.evaluator.HaxeExpressionEvaluatorContext;
@@ -23,6 +24,8 @@
 
 import java.util.List;
 
+import static com.intellij.plugins.haxe.util.HaxeResolveUtil.getLeftReference;
+
 public abstract class HaxeUnresolvedSymbolIntentionBase<T extends PsiElement> extends LocalQuickFixAndIntentionActionOnPsiElement {
 
   protected final @NotNull SmartPsiElementPointer<T> myPsiElementPointer;
@@ -98,6 +101,7 @@ public void invoke(@NotNull Project project,
 
 
   protected boolean needsToBeStatic() {
+    if(hasClassReferenceCallie()) return true;
     HaxeMethodDeclaration type = PsiTreeUtil.getParentOfType(myPsiElementPointer.getElement(), HaxeMethodDeclaration.class);
     if (type != null) {
       return type.getModel().isStatic();
@@ -110,6 +114,51 @@ protected boolean needsToBeStatic() {
     return false;
   }
 
+  protected  boolean needsToBePublic() {
+    return hasClassReferenceCallie() || callieIsDifferentClass();
+  }
+
+  private boolean hasClassReferenceCallie() {
+    if(myPsiElementPointer.getElement() instanceof  HaxeCallExpression callExpression) {
+      HaxeExpression expression = callExpression.getExpression();
+     if(expression != null)  {
+       HaxeReference leftReference = getLeftReference(expression);
+       if(leftReference instanceof HaxeReferenceImpl reference) {
+       ResultHolder result = HaxeExpressionEvaluator.evaluate(leftReference).result;
+         SpecificHaxeClassReference classType = result.getClassType();
+         if(!result.isUnknown() && classType != null) {
+           HaxeClass haxeClass = classType.getHaxeClass();
+           if(haxeClass != null) {
+             String name = haxeClass.getName();
+             return  name != null && reference.textMatches(name);
+           }
+         }
+         }
+       }
+     }
+    return false;
+  }
+  private boolean callieIsDifferentClass() {
+    if(myPsiElementPointer.getElement() instanceof  HaxeCallExpression callExpression) {
+      HaxeExpression expression = callExpression.getExpression();
+     if(expression != null)  {
+       HaxeReference leftReference = getLeftReference(expression);
+       if(leftReference != null) {
+       ResultHolder result = HaxeExpressionEvaluator.evaluate(leftReference).result;
+         SpecificHaxeClassReference classType = result.getClassType();
+         if(!result.isUnknown() && classType != null) {
+           HaxeClass haxeClass = classType.getHaxeClass();
+           if(haxeClass != null) {
+             HaxeClass currentClass = PsiTreeUtil.getParentOfType(callExpression, HaxeClass.class);
+             return currentClass != haxeClass;
+           }
+         }
+         }
+       }
+     }
+    return false;
+  }
+
   protected <T extends PsiElement> T copyFileAndReturnClonedPsiElement(T psiElement) {
     PsiFile originalFile = psiElement.getContainingFile();
     PsiFile fileCopy = (PsiFile)originalFile.copy();

src/test/java/com/intellij/plugins/haxe/ide/quickfix/unresolved/UnresolvedMethodQuickFixTest.java

@@ -11,15 +11,23 @@ public class UnresolvedMethodQuickFixTest extends HaxeQuickFixTestBase {
     return "/unresolved/method";
   }
 
-
   public void testCreateMethodAssign() {
     doSingleTest("_create_method_assign.hx");
   }
 
   public void testCreateMethodInIf() {
     doSingleTest("_create_method_if.hx");
   }
+
   public void testCreateMethodVoid() {
     doSingleTest("_create_method_void.hx");
   }
+
+  public void testCreateMethodOtherClass() {
+    doSingleTest("_create_method_other_class.hx");
+  }
+
+  public void testCreateMethodOtherClassRef() {
+    doSingleTest("_create_method_other_class_ref.hx");
+  }
 }

src/test/resources/testData/quickfix/unresolved/method/after_create_method_other_class.hx

@@ -0,0 +1,11 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {
+    public static function testMethod():Void {
+
+    }
+}
+class Test {
+    function test() {
+        OtherClass.testMethod(();
+    }
+}

src/test/resources/testData/quickfix/unresolved/method/after_create_method_other_class_ref.hx

@@ -0,0 +1,12 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {
+    public function testMethod():Void {
+
+    }
+}
+class Test {
+    function test() {
+        var ref:OtherClass = null;
+        ref.testMethod();
+    }
+}

src/test/resources/testData/quickfix/unresolved/method/before_create_method_other_class.hx

@@ -0,0 +1,7 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {}
+class Test {
+    function test() {
+        OtherClass.testMethod<caret>(();
+    }
+}

src/test/resources/testData/quickfix/unresolved/method/before_create_method_other_class_ref.hx

@@ -0,0 +1,8 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {}
+class Test {
+    function test() {
+        var ref:OtherClass = null;
+        ref.testMethod<caret>();
+    }
+}

src/test/resources/testData/quickfix/unresolved/method/preview_create_method_other_class.hx

@@ -0,0 +1,11 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {
+    public static function testMethod():Void {
+
+    }
+}
+class Test {
+    function test() {
+        OtherClass.testMethod(();
+    }
+}

src/test/resources/testData/quickfix/unresolved/method/preview_create_method_other_class_ref.hx

@@ -0,0 +1,12 @@
+// "Create method 'testMethod'" "true-preview"
+class OtherClass {
+    public function testMethod():Void {
+
+    }
+}
+class Test {
+    function test() {
+        var ref:OtherClass = null;
+        ref.testMethod();
+    }
+}