From 1901ac53269af7f81f1ac8e30bfdd139d0de74cb Mon Sep 17 00:00:00 2001
From: Maxim Medvedev <maxim.medvedev@jetbrains.com>
Date: Mon, 21 Feb 2011 12:17:00 +0300
Subject: [PATCH] fix test

---
 .../actions/generate/constructors/GroovyGenerationInfo.java  | 2 +-
 .../jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/GroovyGenerationInfo.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/GroovyGenerationInfo.java
index 87929cbb6865..6e36d660ffe5 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/GroovyGenerationInfo.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/actions/generate/constructors/GroovyGenerationInfo.java
@@ -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();
     }
 
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
index 1e2ae47a3710..ae581d9070f4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/resolve/ResolveUtil.java
@@ -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();