azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default -> companion: replace all mentions of default and default object

Browse Source
This commit is contained in:
Pavel V. Talanov
2015-03-16 14:56:06 +03:00
parent a0783757e8
commit 06916d98c6
1019 changed files with 2468 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.java
+4 -4
View File
@@ -150,12 +150,12 @@ public class LightClassUtil {
}
@Nullable
public static PsiField getLightFieldForDefaultObject(@NotNull JetClassOrObject defaultObject) {
PsiClass outerPsiClass = getWrappingClass(defaultObject);
public static PsiField getLightFieldForCompanionObject(@NotNull JetClassOrObject companionObject) {
PsiClass outerPsiClass = getWrappingClass(companionObject);
if (outerPsiClass != null) {
for (PsiField fieldOfParent : outerPsiClass.getFields()) {
if (((KotlinLightElement<?, ?>) fieldOfParent).getOrigin() == defaultObject &&
fieldOfParent.getName().equals(defaultObject.getName())) { // TODO this check is relevant while light class has deprecated OBJECT$ field
if (((KotlinLightElement<?, ?>) fieldOfParent).getOrigin() == companionObject &&
fieldOfParent.getName().equals(companionObject.getName())) { // TODO this check is relevant while light class has deprecated OBJECT$ field
return fieldOfParent;
}
}