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

visitor for GrTypeParameter

Browse Source
This commit is contained in:
Maxim.Medvedev
2012-06-25 11:05:00 +04:00
parent 5bfab8db02
commit 1334bf0581
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java
+2 -3
View File
@@ -21,7 +21,6 @@ import com.intellij.lang.ASTNode;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiIdentifier;
import com.intellij.psi.PsiWhiteSpace;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.formatter.FormatterUtil;
@@ -285,8 +284,8 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
if (myType2 == CLASS_BODY) {
PsiIdentifier nameIdentifier = typeDefinition.getNameIdentifier();
int dependenceStart = nameIdentifier == null ? myParent.getTextRange().getStartOffset() : nameIdentifier.getTextRange().getStartOffset();
PsiElement nameIdentifier = typeDefinition.getNameIdentifierGroovy();
int dependenceStart = nameIdentifier.getTextRange().getStartOffset();
createSpaceBeforeLBrace(mySettings.SPACE_BEFORE_CLASS_LBRACE, mySettings.CLASS_BRACE_STYLE, new TextRange(dependenceStart, myChild1.getTextRange().getEndOffset()), false);
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/GroovyElementVisitor.java
+4
View File
@@ -443,4 +443,8 @@ public abstract class GroovyElementVisitor {
public void visitClassInitializer(GrClassInitializer initializer) {
visitElement(initializer);
}
public void visitTypeParameter(GrTypeParameter typeParameter) {
visitTypeDefinition(typeParameter);
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/ControlFlowBuilder.java
-4
View File
@@ -1067,10 +1067,6 @@ public class ControlFlowBuilder extends GroovyRecursiveElementVisitor {
collectVars(block.getControlFlow());
}
@Override
public void visitTypeDefinition(GrTypeDefinition typeDefinition) {
typeDefinition.acceptChildren(this);
}
});
PsiField[] fields = typeDefinition.getAllFields();
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrTypeParameterImpl.java
+6 -1
View File
@@ -29,6 +29,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocComment;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrClassInitializer;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrField;
@@ -394,5 +395,9 @@ public class GrTypeParameterImpl extends GrStubElementBase<GrTypeParameterStub>
public PsiAnnotation[] getApplicableAnnotations() {
return getAnnotations();
}
@Override
public void accept(GroovyElementVisitor visitor) {
visitor.visitTypeParameter(this);
}
}