MagicFieldsUtil: refactored and optimized member accessibility check

nette-intellij · Jul 12, 2015 · da429c8 · da429c8
1 parent 48cd18b
commit da429c8
Showing 1 changed file with 65 additions and 39 deletions.
diff --git a/src/cz/juzna/intellij/nette/utils/MagicFieldsUtil.java b/src/cz/juzna/intellij/nette/utils/MagicFieldsUtil.java
@@ -1,11 +1,7 @@
 package cz.juzna.intellij.nette.utils;
 
-import com.intellij.codeInsight.lookup.LookupElement;
-import com.intellij.psi.PsiElement;
 import com.intellij.util.containers.HashMap;
 import com.jetbrains.php.PhpIndex;
-import com.jetbrains.php.completion.PhpVariantsUtil;
-import com.jetbrains.php.completion.UsageContext;
 import com.jetbrains.php.lang.psi.PhpPsiUtil;
 import com.jetbrains.php.lang.psi.elements.*;
 import com.jetbrains.php.lang.psi.resolve.types.PhpType;
@@ -65,15 +61,9 @@ public static Collection<Method> findGetters(FieldReference fieldReference) {
 			if (method == null) {
 				continue;
 			}
-			ArrayList<PhpNamedElement> elements = new ArrayList<PhpNamedElement>();
-//			elements.add(method); //todo: probably causes recursion, find better way to check visibility
 			Field field = cls.findFieldByName(fieldReference.getName(), false);
-			if (field != null) {
-				elements.add(field);
-			}
-			Collection<String> accessible = findAccessibleMembers(cls, fieldReference, elements);
-
-			if (!accessible.contains(fieldReference.getName())/* && accessible.contains(method.getName())*/) {
+			PhpClass containingClass = PhpPsiUtil.getParentByCondition(fieldReference, PhpClass.INSTANCEOF);
+			if ((field == null || !isAccessible(field, containingClass)) && isAccessible(method, containingClass)) {
 				methods.add(method);
 			}
 		}
@@ -85,12 +75,17 @@ public static HashMap<String, Collection<Method>> findMagicFields(MemberReferenc
 
 		HashMap<String, Collection<Method>> fields = new HashMap<String, Collection<Method>>();
 		Map<String, PhpClass> classesInFile = cz.juzna.intellij.nette.utils.PhpPsiUtil.getClassesInFile(reference);
+		PhpClass containingClass = PhpPsiUtil.getParentByCondition(reference, PhpClass.INSTANCEOF);
 		for (PhpClass cls : ClassFinder.getFromMemberReference(reference)) {
 			if (!isNetteObject(cls, classesInFile)) {
 				continue;
 			}
-			Collection<String> accessibleFields = null;
-			for (Method method : cls.getMethods()) {
+			Collection<Method> methods = cls.getMethods();
+			if (methods.isEmpty()) {
+				continue;
+			}
+			Collection<Field> classFields = null;
+			for (Method method : methods) {
 				String name = method.getName();
 				String fieldName;
 				if (name.startsWith("get") && name.length() > 3) {
@@ -102,10 +97,25 @@ public static HashMap<String, Collection<Method>> findMagicFields(MemberReferenc
 				} else {
 					continue;
 				}
-				if (accessibleFields == null) {
-					accessibleFields = findAccessibleFields(cls, reference);
+				if (!isAccessible(method, containingClass)) {
+					continue;
+				}
+				if (classFields == null) {
+					classFields = cls.getFields();
 				}
-				if (accessibleFields.contains(fieldName)) {
+				boolean isFieldAccessible = false;
+				for (Field field : classFields) {
+					if (!field.getName().equals(fieldName)) {
+						continue;
+					}
+					if (isAccessible(field, containingClass)) {
+						isFieldAccessible = true;
+					} else {
+						isFieldAccessible = false;
+						break; //there is at least one not accessible field
+					}
+				}
+				if (isFieldAccessible) {
 					continue;
 				}
 
@@ -122,28 +132,6 @@ public static HashMap<String, Collection<Method>> findMagicFields(MemberReferenc
 		return fields;
 	}
 
-	private static Collection<String> findAccessibleFields(PhpClass cls, MemberReference reference) {
-		return findAccessibleMembers(cls, reference, cls.getFields());
-	}
-
-	private static Collection<String> findAccessibleMembers(PhpClass cls, MemberReference reference, Collection<? extends PhpNamedElement> elements) {
-
-		PhpClass containingClass = PhpPsiUtil.getParentByCondition(reference, PhpClass.INSTANCEOF);
-		Collection<String> members = new ArrayList<String>();
-		UsageContext usageContext = new UsageContext(PhpModifier.State.PARENT);
-		usageContext.setTargetObjectClass(cls);
-		if (containingClass != null) {
-			usageContext.setClassForAccessFilter(containingClass);
-		}
-
-		for (LookupElement el : PhpVariantsUtil.getLookupItems(elements, false, usageContext)) {
-			PsiElement psiEl = el.getPsiElement();
-			if (psiEl instanceof PhpNamedElement) {
-				members.add(((PhpNamedElement) psiEl).getName());
-			}
-		}
-		return members;
-	}
 
 	@NotNull
 	public static HashMap<String, Field> findEventFields(PhpType type, PhpIndex phpIndex) {
@@ -166,4 +154,42 @@ private static boolean isNetteObject(PhpClass cls, Map<String, PhpClass> classMa
 		return cz.juzna.intellij.nette.utils.PhpPsiUtil.isTypeOf(cls, "Nette\\Object", classMap);
 	}
 
+	private static boolean isAccessible(PhpClassMember member, @Nullable PhpClass accessClass) {
+		PhpClass elementClass = member.getContainingClass();
+		if (classesEqual(elementClass, accessClass)) {
+			return true;
+		}
+		PhpModifier modifier = member.getModifier();
+		if (modifier.isPublic()) {
+			return true;
+		}
+		if (accessClass == null || elementClass == null) {
+			return false;
+		}
+		for (PhpClass contextClass = accessClass; contextClass != null; contextClass = contextClass.getSuperClass()) {
+			if (elementClass.isTrait()) {
+				for (PhpClass traitClass : contextClass.getTraits()) {
+					if (classesEqual(elementClass, traitClass)) {
+						return true;
+					}
+
+				}
+			} else if (classesEqual(elementClass, contextClass)) {
+				return true;
+			}
+			if (modifier.isPrivate()) {
+				break;
+			}
+		}
+
+		return false;
+	}
+
+
+	private static boolean classesEqual(@Nullable PhpClass one, @Nullable PhpClass another) {
+		return one != null && another != null
+				&& one.getFQN() != null && another.getFQN() != null
+				&& one.getFQN().equals(another.getFQN());
+	}
+
 }