Merge pull request #195 from cedricziel/complete-extbase-foo

Cleanup Extbase completion contributors

Author: cedricziel

build.gradle

@@ -45,7 +45,7 @@ group 'com.cedricziel'
 version gitVersion()
 
 wrapper {
-    gradleVersion '4.3.1'
+    gradleVersion '4.8'
 }
 
 test.testLogging.exceptionFormat = TestExceptionFormat.FULL

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,6 @@
-#Sun Dec 03 10:58:46 CET 2017
+#Thu Jun 21 19:41:57 CEST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -4,18 +4,39 @@
 import com.intellij.psi.PsiElement;
 import com.jetbrains.php.PhpClassHierarchyUtils;
 import com.jetbrains.php.PhpIndex;
+import com.jetbrains.php.lang.psi.elements.Field;
+import com.jetbrains.php.lang.psi.elements.Method;
 import com.jetbrains.php.lang.psi.elements.PhpClass;
 import com.jetbrains.php.lang.psi.elements.PhpClassMember;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
 
-import static com.cedricziel.idea.typo3.extbase.persistence.ExtbasePersistenceCompletionContributor.ExtbaseRepositoryMagicMethodsCompletionProvider.TYPO3_CMS_EXTBASE_PERSISTENCE_REPOSITORY;
-
 public class ExtbaseUtils {
-    public static final String TYPO3_CMS_EXTBASE_DOMAIN_OBJECT_ABSTRACT_ENTITY = "TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity";
+    public static final String EXTBASE_ABSTRACT_ENTITY_FQN = "TYPO3\\CMS\\Extbase\\DomainObject\\AbstractEntity";
+
+    public static String EXTBASE_QUERY_INTERFACE_FQN = "TYPO3\\CMS\\Extbase\\Persistence\\QueryInterface";
+
+    public static String[] EXTBASE_QUERY_BUILDER_METHODS = {
+            "equals",
+            "like",
+            "contains",
+            "in",
+            "lessThan",
+            "lessThanOrEqual",
+            "greaterThan",
+            "greaterThanOrEqual",
+            "isEmpty",
+    };
+
+    public static final String OBJECT_STORAGE_FQN = "TYPO3\\CMS\\Extbase\\Persistence\\ObjectStorage";
+
+    public static final String TYPO3_CMS_EXTBASE_PERSISTENCE_REPOSITORY = "TYPO3\\CMS\\Extbase\\Persistence\\Repository";
+
+    public static final String QUERY_RESULT_INTERFACE = "TYPO3\\CMS\\Extbase\\Persistence\\QueryResultInterface";
 
     public static final String[] NON_QUERYABLE_ENTITY_FIELDS = {
             "_isClone",
@@ -46,13 +67,31 @@ public static boolean isRepositoryClass(@NotNull PhpClass phpClass) {
         return PhpClassHierarchyUtils.isSuperClass(baseRepositoryClass, phpClass, true);
     }
 
+    public static boolean isObjectStorage(@NotNull Field field) {
+        return field.getDeclaredType().toString().contains(OBJECT_STORAGE_FQN);
+    }
+
+    public static boolean isNonQueryableField(@NotNull String name) {
+        return Arrays.asList(ExtbaseUtils.NON_QUERYABLE_ENTITY_FIELDS).contains(name);
+    }
+
+    public static boolean fieldHasMagicFinders(@NotNull Field field) {
+        return !field.isConstant() && !field.isInternal() && !ExtbaseUtils.isNonQueryableField(field.getName()) && !ExtbaseUtils.isObjectStorage(field);
+    }
+
+    public static boolean methodInstanceOf(@NotNull String className, @NotNull Method method) {
+        PhpClass containingClass = method.getContainingClass();
+
+        return containingClass != null && containingClass.getPresentableFQN().equals(className);
+    }
+
     private boolean isEntityClass(PsiElement psiElement) {
         PhpClass containingClass = ((PhpClassMember) psiElement).getContainingClass();
         if (containingClass == null) {
             return false;
         }
 
-        Collection<PhpClass> classesByFQN = PhpIndex.getInstance(psiElement.getProject()).getClassesByFQN(TYPO3_CMS_EXTBASE_DOMAIN_OBJECT_ABSTRACT_ENTITY);
+        Collection<PhpClass> classesByFQN = PhpIndex.getInstance(psiElement.getProject()).getClassesByFQN(EXTBASE_ABSTRACT_ENTITY_FQN);
         if (classesByFQN.isEmpty()) {
             return false;
         }

src/main/java/com/cedricziel/idea/typo3/extbase/ExtbaseUtils.java

@@ -1,5 +1,6 @@
 package com.cedricziel.idea.typo3.extbase.persistence;
 
+import com.cedricziel.idea.typo3.extbase.ExtbaseUtils;
 import com.cedricziel.idea.typo3.psi.PhpElementsUtil;
 import com.cedricziel.idea.typo3.util.ExtbaseUtility;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -13,8 +14,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import static com.cedricziel.idea.typo3.extbase.persistence.ExtbasePersistenceCompletionContributor.ExtbaseRepositoryMagicMethodsCompletionProvider.TYPO3_CMS_EXTBASE_PERSISTENCE_REPOSITORY;
-
 public class ExtbasePersistenceReferenceResolver implements PhpReferenceResolver {
     @Override
     public Collection<? extends PhpNamedElement> resolve(PhpReference phpReference) {
@@ -45,7 +44,7 @@ public Collection<? extends PhpNamedElement> resolve(PhpReference phpReference)
         }
 
         classesByFQN.forEach(repositoryClass -> {
-            if (!PhpElementsUtil.hasSuperClass(repositoryClass, TYPO3_CMS_EXTBASE_PERSISTENCE_REPOSITORY)) {
+            if (!PhpElementsUtil.hasSuperClass(repositoryClass, ExtbaseUtils.TYPO3_CMS_EXTBASE_PERSISTENCE_REPOSITORY)) {
                 return;
             }