Drop 'OBJECT$' field deprecated in M11

2015-06-26 21:55:13 +03:00
parent 0bad4e0137
commit feb4dd7b8f
23 changed files with 3 additions and 128 deletions
@@ -154,9 +154,8 @@ public class LightClassUtil {
        PsiClass outerPsiClass = getWrappingClass(companionObject);
        if (outerPsiClass != null) {
            for (PsiField fieldOfParent : outerPsiClass.getFields()) {
-                if (!(fieldOfParent instanceof KotlinLightElement)) continue;
-                if (((KotlinLightElement<?, ?>) fieldOfParent).getOrigin() == companionObject &&
-                    fieldOfParent.getName().equals(companionObject.getName())) { // TODO this check is relevant while light class has deprecated OBJECT$ field
+                if ((fieldOfParent instanceof KotlinLightElement) &&
+                    ((KotlinLightElement<?, ?>) fieldOfParent).getOrigin() == companionObject) {
                    return fieldOfParent;
                }
            }