introduce parameter in script method

This commit is contained in:
Maxim.Medvedev
2012-01-25 11:55:44 +04:00
parent 016fbf57e2
commit 3436a0c96d
2 changed files with 3 additions and 3 deletions
@@ -543,7 +543,7 @@ public class PsiUtil {
if (context instanceof GrTypeDefinition) {
return (PsiClass)context;
}
else if (context instanceof GroovyFileBase) {
else if (context instanceof GroovyFileBase && context.isPhysical()) {
return ((GroovyFileBase)context).getScriptClass();
}
@@ -145,7 +145,7 @@ public class OldReferencesResolver {
//newExpr = ((GrReferenceExpression)newExpr).getReferenceNameElement();
final GroovyResolveResult adv = oldRef.advancedResolve();
final PsiElement scope = getClassContainingResolve(adv);
final PsiElement owner = PsiTreeUtil.getContextOfType(oldExpr, PsiClass.class);
final PsiElement owner = PsiUtil.getContextClass(oldExpr);
if (myToReplaceIn instanceof GrClosableBlock || (owner != null && scope != null && PsiTreeUtil.isContextAncestor(owner, scope, false))) {
@@ -368,7 +368,7 @@ public class OldReferencesResolver {
return ((PsiMember)elem).getContainingClass();
}
else {
return PsiTreeUtil.getParentOfType(elem, PsiClass.class);
return PsiUtil.getContextClass(elem);
}
}
return null;