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

clear closure internal caches

Browse Source
This commit is contained in:
peter
2011-08-08 22:52:22 +02:00
parent 47ddf2fef5
commit a04366418c
3 changed files with 42 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/blocks/GrClosableBlockImpl.java
+35 -25
View File
@@ -20,6 +20,9 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.*;
import com.intellij.psi.scope.PsiScopeProcessor;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.util.Function;
import com.intellij.util.IncorrectOperationException;
@@ -30,8 +33,6 @@ import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElement;
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrVariable;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
@@ -44,6 +45,7 @@ import org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtil;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil;
import org.jetbrains.plugins.groovy.lang.psi.impl.statements.params.GrParameterListImpl;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.ClosureSyntheticParameter;
import org.jetbrains.plugins.groovy.lang.psi.impl.synthetic.GrLightVariable;
import org.jetbrains.plugins.groovy.lang.psi.util.GroovyCommonClassNames;
import org.jetbrains.plugins.groovy.lang.resolve.MethodTypeInferencer;
import org.jetbrains.plugins.groovy.lang.resolve.ResolveUtil;
@@ -56,7 +58,6 @@ import org.jetbrains.plugins.groovy.refactoring.GroovyNamesUtil;
*/
public class GrClosableBlockImpl extends GrBlockImpl implements GrClosableBlock {
private volatile GrParameter mySyntheticItParameter;
private GrVariable myOwner;
public GrClosableBlockImpl(@NotNull IElementType type, CharSequence buffer) {
super(type, buffer);
@@ -66,6 +67,13 @@ public class GrClosableBlockImpl extends GrBlockImpl implements GrClosableBlock
visitor.visitClosure(this);
}
@Override
public PsiElement copy() {
final GrClosableBlockImpl clone = (GrClosableBlockImpl)super.copy();
clone.mySyntheticItParameter = null;
return clone;
}
public boolean processDeclarations(final @NotNull PsiScopeProcessor processor,
final @NotNull ResolveState _state,
final PsiElement lastParent,
@@ -190,29 +198,31 @@ public class GrClosableBlockImpl extends GrBlockImpl implements GrClosableBlock
return mySyntheticItParameter;
}
private GrVariable getOwner() {
if (myOwner == null) {
final GroovyPsiElement context = PsiTreeUtil.getParentOfType(this, GrTypeDefinition.class, GrClosableBlock.class, GroovyFile.class);
final PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
PsiType type = null;
if (context instanceof GrTypeDefinition) {
type = factory.createType((PsiClass)context);
}
else if (context instanceof GrClosableBlock) {
type = GrClosureType.create((GrClosableBlock)context, true);
}
else if (context instanceof GroovyFile) {
final PsiClass scriptClass = ((GroovyFile)context).getScriptClass();
if (scriptClass != null && GroovyNamesUtil.isIdentifier(scriptClass.getName())) type = factory.createType(scriptClass);
}
if (type == null) {
type = TypesUtil.getJavaLangObject(this);
}
private PsiVariable getOwner() {
return CachedValuesManager.getManager(getProject()).getCachedValue(this, new CachedValueProvider<PsiVariable>() {
@Override
public Result<PsiVariable> compute() {
final GroovyPsiElement context = PsiTreeUtil.getParentOfType(GrClosableBlockImpl.this, GrTypeDefinition.class, GrClosableBlock.class, GroovyFile.class);
final PsiElementFactory factory = JavaPsiFacade.getInstance(getProject()).getElementFactory();
PsiType type = null;
if (context instanceof GrTypeDefinition) {
type = factory.createType((PsiClass)context);
}
else if (context instanceof GrClosableBlock) {
type = GrClosureType.create((GrClosableBlock)context, true);
}
else if (context instanceof GroovyFile) {
final PsiClass scriptClass = ((GroovyFile)context).getScriptClass();
if (scriptClass != null && GroovyNamesUtil.isIdentifier(scriptClass.getName())) type = factory.createType(scriptClass);
}
if (type == null) {
type = TypesUtil.getJavaLangObject(GrClosableBlockImpl.this);
}
myOwner = GroovyPsiElementFactory.getInstance(getProject()).createVariableDeclaration(null, null, type, OWNER_NAME).getVariables()[0];
}
return myOwner;
PsiVariable owner = new GrLightVariable(null, getManager(), OWNER_NAME, type, GrClosableBlockImpl.this);
return Result.create(owner, PsiModificationTracker.MODIFICATION_COUNT);
}
});
}
public GrExpression replaceWithExpression(@NotNull GrExpression newExpr, boolean removeUnnecessaryParentheses) {
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/TypesUtil.java
+5 -2
View File
@@ -379,8 +379,11 @@ public class TypesUtil {
public static PsiType unboxPrimitiveTypeWrapper(PsiType type) {
if (type instanceof PsiClassType) {
PsiType unboxed = ourQNameToUnboxed.get(type.getCanonicalText());
if (unboxed != null) type = unboxed;
final PsiClass psiClass = ((PsiClassType)type).resolve();
if (psiClass != null) {
PsiType unboxed = ourQNameToUnboxed.get(psiClass.getQualifiedName());
if (unboxed != null) type = unboxed;
}
}
return type;
}
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/ResolvePropertyTest.groovy
+2 -2
View File
@@ -54,8 +54,8 @@ public class ResolvePropertyTest extends GroovyResolveTestCase {
public void testClosureOwner() throws Exception {
PsiReference ref = configureByFile("closureOwner/A.groovy");
PsiElement resolved = ref.resolve();
assertInstanceOf(resolved, GrVariable);
assertEquals(((PsiClassType) ((GrVariable) resolved).getTypeGroovy()).getCanonicalText(), "W");
assertInstanceOf(resolved, PsiVariable);
assertEquals(((PsiVariable) resolved).getType().getCanonicalText(), "W");
}
public void testLocal1() throws Exception {