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

Fixing EA-50643 - NPE: PropertyCodegen.generateBackingField

Browse Source 
Do not return null as a method/field visitor
This commit is contained in:
Andrey Breslav
2013-10-10 14:02:28 +04:00
parent 31fa1383ba
commit 08a90ba7d4
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/StubClassBuilder.java
+4 -2
View File
@@ -96,6 +96,7 @@ public class StubClassBuilder extends ClassBuilder {
((StubBase) v.getResult()).putUserData(ClsWrapperStubPsiFactory.ORIGIN_ELEMENT, origin);
}
@NotNull
@Override
public MethodVisitor newMethod(
@Nullable PsiElement origin,
@@ -107,7 +108,7 @@ public class StubClassBuilder extends ClassBuilder {
) {
MethodVisitor internalVisitor = super.newMethod(origin, access, name, desc, signature, exceptions);
if (internalVisitor != null) {
if (internalVisitor != EMPTY_METHOD_VISITOR) {
// If stub for method generated
markLastChild(origin);
}
@@ -115,6 +116,7 @@ public class StubClassBuilder extends ClassBuilder {
return internalVisitor;
}
@NotNull
@Override
public FieldVisitor newField(
@Nullable PsiElement origin,
@@ -126,7 +128,7 @@ public class StubClassBuilder extends ClassBuilder {
) {
FieldVisitor internalVisitor = super.newField(origin, access, name, desc, signature, value);
if (internalVisitor != null) {
if (internalVisitor != EMPTY_FIELD_VISITOR) {
// If stub for field generated
markLastChild(origin);
}