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

spaces and line feeds in groovy modifier list

Browse Source
This commit is contained in:
Max Medvedev
2012-11-08 14:50:52 +04:00
parent 91fb7c5e1d
commit e8e484ce70
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java
+9 -9
View File
@@ -369,7 +369,7 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
@Override
public void visitModifierList(GrModifierList modifierList) {
int annotationWrap = getAnnotationWrap();
int annotationWrap = getAnnotationWrap(myParent.getParent());
if (myChild1.getElementType() == ANNOTATION && annotationWrap == CommonCodeStyleSettings.WRAP_ALWAYS) {
myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
}
@@ -721,7 +721,7 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
private void processModifierList(ASTNode modifierList) {
int annotationWrap = getAnnotationWrap();
int annotationWrap = getAnnotationWrap(myParent);
if (modifierList.getLastChildNode().getElementType() == ANNOTATION && annotationWrap == CommonCodeStyleSettings.WRAP_ALWAYS ||
mySettings.MODIFIER_LIST_WRAP) {
myResult = Spacing.createSpacing(0, 0, 1, mySettings.KEEP_LINE_BREAKS, mySettings.KEEP_BLANK_LINES_IN_CODE);
@@ -731,13 +731,13 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
}
}
private int getAnnotationWrap() {
return myParent instanceof PsiMethod ? mySettings.METHOD_ANNOTATION_WRAP :
myParent instanceof PsiClass ? mySettings.CLASS_ANNOTATION_WRAP :
myParent instanceof GrVariableDeclaration &&
((GrVariableDeclaration)myParent).getVariables()[0] instanceof PsiField ? mySettings.FIELD_ANNOTATION_WRAP :
myParent instanceof GrVariableDeclaration ? mySettings.VARIABLE_ANNOTATION_WRAP :
myParent instanceof PsiParameter ? mySettings.PARAMETER_ANNOTATION_WRAP :
private int getAnnotationWrap(final PsiElement parent) {
return parent instanceof PsiMethod ? mySettings.METHOD_ANNOTATION_WRAP :
parent instanceof PsiClass ? mySettings.CLASS_ANNOTATION_WRAP :
parent instanceof GrVariableDeclaration &&
((GrVariableDeclaration)parent).getVariables()[0] instanceof PsiField ? mySettings.FIELD_ANNOTATION_WRAP :
parent instanceof GrVariableDeclaration ? mySettings.VARIABLE_ANNOTATION_WRAP :
parent instanceof PsiParameter ? mySettings.PARAMETER_ANNOTATION_WRAP :
CommonCodeStyleSettings.DO_NOT_WRAP;
}
plugins/groovy/testdata/groovy/formatter/fieldInColumnsAlignment.test
Vendored
+3 -5
View File
@@ -36,11 +36,9 @@ public class FormattingTest {
char ccc3 = 'a'
double ddd31, ddd32 = 1
private
final String s4 = ""
private
transient int i4 = 1
def o4
private final String s4 = ""
private transient int i4 = 1
def o4
private final String s5 = "xxx"
private transient int iiii5 = 1