getLBrace() and getRBrace() for Groovy classes

java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java

@@ -214,7 +214,7 @@ class DeclarationMover extends LineMover {
                              editor.getDocument());
       }
       else {
-        PsiJavaToken rBrace = aClass.getRBrace();
+        PsiElement rBrace = aClass.getRBrace();
         if (rBrace == null) throw new IllegalMoveException();
         return new LineRange(rBrace, rBrace, editor.getDocument());
       }

java/java-impl/src/com/intellij/codeInsight/folding/impl/JavaFoldingBuilder.java

@@ -284,9 +284,9 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
     }
     if (element instanceof PsiClass) {
       PsiClass aClass = (PsiClass)element;
-      PsiJavaToken lBrace = aClass.getLBrace();
+      PsiElement lBrace = aClass.getLBrace();
       if (lBrace == null) return null;
-      PsiJavaToken rBrace = aClass.getRBrace();
+      PsiElement rBrace = aClass.getRBrace();
       if (rBrace == null) return null;
       return new TextRange(lBrace.getTextOffset(), rBrace.getTextOffset() + 1);
     }
@@ -579,7 +579,7 @@ public class JavaFoldingBuilder extends FoldingBuilderEx implements DumbAware {
               if (rbrace != null) rangeEnd = rbrace.getTextRange().getStartOffset();
 
               final CharSequence seq = document.getCharsSequence();
-              final PsiJavaToken classRBrace = anonymousClass.getRBrace();
+              final PsiElement classRBrace = anonymousClass.getRBrace();
               if (classRBrace != null && rbrace != null) {
                 final int methodEndLine = document.getLineNumber(rangeEnd);
                 final int methodEndLineStart = document.getLineStartOffset(methodEndLine);

java/java-impl/src/com/intellij/codeInsight/generation/GenerationInfo.java

@@ -42,11 +42,11 @@ public abstract class GenerationInfo {
       element = element.getParent();
     }
 
-    PsiJavaToken lBrace = aClass.getLBrace();
+    PsiElement lBrace = aClass.getLBrace();
     if (lBrace == null) {
       return null;
     }
-    PsiJavaToken rBrace = aClass.getRBrace();
+    PsiElement rBrace = aClass.getRBrace();
     if (!GenerateMembersUtil.isChildInRange(element, lBrace.getNextSibling(), rBrace)) {
       return null;
     }

java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java

@@ -85,7 +85,7 @@ public class CreateSubclassAction extends PsiElementBaseIntentionAction {
       }
       if (!hasNonPrivateConstructor) return false;
     }
-    PsiJavaToken lBrace = psiClass.getLBrace();
+    PsiElement lBrace = psiClass.getLBrace();
     if (lBrace == null) return false;
     if (element.getTextOffset() >= lBrace.getTextOffset()) return false;
 

java/java-impl/src/com/intellij/codeInsight/template/macro/ClassNameMacro.java

@@ -51,7 +51,7 @@ public class ClassNameMacro implements Macro {
       if (place instanceof PsiClass && !(place instanceof PsiAnonymousClass) && !(place instanceof PsiTypeParameter)){
         aClass = (PsiClass)place;
         // if className() is evaluated outside of the body of inner class, return name of its outer class instead (IDEADEV-19865)
-        final PsiJavaToken lBrace = aClass.getLBrace();
+        final PsiElement lBrace = aClass.getLBrace();
         if (lBrace != null && offset < lBrace.getTextOffset() && aClass.getContainingClass() != null) {
           aClass = aClass.getContainingClass();
         }

java/java-impl/src/com/intellij/psi/impl/light/LightClass.java

@@ -216,12 +216,12 @@ public class LightClass extends LightElement implements PsiClass {
   }
 
   @Nullable
-  public PsiJavaToken getLBrace() {
+  public PsiElement getLBrace() {
     return myDelegate.getLBrace();
   }
 
   @Nullable
-  public PsiJavaToken getRBrace() {
+  public PsiElement getRBrace() {
     return myDelegate.getRBrace();
   }
 

java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousConstructorProcessor.java

@@ -124,7 +124,7 @@ class InlineToAnonymousConstructorProcessor {
 
     int fieldCount = myClass.getFields().length;
     int processedFields = 0;
-    PsiJavaToken token = anonymousClass.getRBrace();
+    PsiElement token = anonymousClass.getRBrace();
     if (initializerBlock.getBody().getStatements().length > 0 && fieldCount == 0) {
       insertInitializerBefore(initializerBlock, anonymousClass, token);
     }
@@ -159,7 +159,7 @@ class InlineToAnonymousConstructorProcessor {
     JavaCodeStyleManager.getInstance(superNewExpression.getProject()).shortenClassReferences(superNewExpression);
   }
 
-  private void insertInitializerBefore(final PsiClassInitializer initializerBlock, final PsiClass anonymousClass, final PsiJavaToken token)
+  private void insertInitializerBefore(final PsiClassInitializer initializerBlock, final PsiClass anonymousClass, final PsiElement token)
       throws IncorrectOperationException {
     anonymousClass.addBefore(CodeEditUtil.createLineFeed(token.getManager()), token);
     anonymousClass.addBefore(initializerBlock, token);

java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestAction.java

@@ -49,8 +49,8 @@ public class CreateTestAction extends PsiElementBaseIntentionAction {
     PsiClass psiClass = getContainingClass(element);
 
     assert psiClass != null;
-    PsiJavaToken leftBrace = psiClass.getLBrace();
-    if (leftBrace == null) return true;
+    PsiElement leftBrace = psiClass.getLBrace();
+    if (leftBrace == null) return false;
     if (element.getTextOffset() >= leftBrace.getTextOffset()) return false;
 
     //TextRange declarationRange = HighlightNamesUtil.getClassDeclarationTextRange(psiClass);