MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[groovy] cache base class reference created from stub (related to IDEA-156987)

Browse Source 
Before this change getBaseClassReferenceGroovy() returned new objects every time it was queried causing the check to fail within processDeclarations().
This commit is contained in:
Daniil Ovchinnikov
2016-09-27 19:28:02 +03:00
parent c49592e765
commit d64c5aebda
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrAnonymousClassDefinitionImpl.java
+12 -5
View File
@@ -17,6 +17,7 @@
package org.jetbrains.plugins.groovy.lang.psi.impl.statements.typedef;
import com.intellij.lang.ASTNode;
import com.intellij.openapi.util.NullableLazyValue;
import com.intellij.psi.*;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.reference.SoftReference;
@@ -43,8 +44,17 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
* @author Maxim.Medvedev
*/
public class GrAnonymousClassDefinitionImpl extends GrTypeDefinitionImpl implements GrAnonymousClassDefinition {
private SoftReference<PsiClassType> myCachedBaseType = null;
private NullableLazyValue<GrCodeReferenceElement> myStubBaseReference = NullableLazyValue.createValue(() -> {
GrTypeDefinitionStub stub = getStub();
if (stub == null) return null;
String baseClassName = stub.getBaseClassName();
assert baseClassName != null;
return GroovyPsiElementFactory.getInstance(getProject()).createReferenceElementFromText(baseClassName, this);
});
public GrAnonymousClassDefinitionImpl(@NotNull ASTNode node) {
super(node);
}
@@ -60,11 +70,8 @@ public class GrAnonymousClassDefinitionImpl extends GrTypeDefinitionImpl impleme
@Override
@NotNull
public GrCodeReferenceElement getBaseClassReferenceGroovy() {
GrTypeDefinitionStub stub = getStub();
if (stub != null) {
return GroovyPsiElementFactory.getInstance(getProject()).createReferenceElementFromText(stub.getBaseClassName(), this);
}
//noinspection ConstantConditions
GrCodeReferenceElement stubReference = myStubBaseReference.getValue();
if (stubReference != null) return stubReference;
return findNotNullChildByClass(GrCodeReferenceElement.class); //not null because of definition =)
}