This commit is contained in:
Maxim Medvedev
2011-02-21 12:17:00 +03:00
parent c7ddcdb9a3
commit 1901ac5326
2 changed files with 3 additions and 4 deletions
@@ -61,7 +61,7 @@ public class GroovyGenerationInfo<T extends PsiMember> extends PsiGenerationInfo
}
final IElementType type = element.getNode().getElementType();
if (GroovyTokenTypes.WHITE_SPACES_SET.contains(type)) {
if (type == GroovyTokenTypes.mNLS || type == GroovyTokenTypes.mWS) {
return element.getNextSibling();
}
@@ -520,9 +520,8 @@ public class ResolveUtil {
return resolveResult != null && isInUseScope(resolveResult.getCurrentFileResolveContext());
}
public static boolean isInUseScope(PsiElement context) {
if (!context.isValid()) return false;
if (context instanceof GrMethodCall) {
public static boolean isInUseScope(@Nullable PsiElement context) {
if (context instanceof GrMethodCall && context.isValid()) {
final GrExpression expression = ((GrMethodCall)context).getInvokedExpression();
if (expression instanceof GrReferenceExpression) {
final PsiElement resolved = ((GrReferenceExpression)expression).resolve();