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

IDEA-170505 Strange formatting of Groovy enum with @Deprecated value

Browse Source
This commit is contained in:
alexey.afanasiev
2017-04-14 13:23:26 +03:00
parent 343642204e
commit f70fc63eb6
15 changed files with 85 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/parsing/auxiliary/annotations/Annotation.java
-16
View File
@@ -61,20 +61,4 @@ public class Annotation {
annMarker.done(GroovyElementTypes.ANNOTATION);
return true;
}
public static void parseAnnotationOptional(PsiBuilder builder, GroovyParser parser) {
PsiBuilder.Marker annOptMarker = builder.mark();
boolean hasAnnotations = false;
while (parse(builder, parser)) {
ParserUtils.getToken(builder, GroovyTokenTypes.mNLS);
hasAnnotations = true;
}
if (hasAnnotations) {
annOptMarker.done(GroovyElementTypes.MODIFIERS);
} else {
annOptMarker.rollbackTo();
}
}
}
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/parsing/auxiliary/modifiers/Modifiers.java
+6 -1
View File
@@ -35,7 +35,12 @@ import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
*/
public class Modifiers {
public static boolean parse(PsiBuilder builder, GroovyParser parser) {
return parse(builder, parser, false);
}
public static boolean parse(PsiBuilder builder, GroovyParser parser, boolean annotationsOnly) {
PsiBuilder.Marker modifiersMarker = builder.mark();
boolean hasModifiers = false;
@@ -44,7 +49,7 @@ public class Modifiers {
final PsiBuilder.Marker modifierListItem = builder.mark();
if (hasModifiers) ParserUtils.getToken(builder, GroovyTokenTypes.mNLS);
final boolean parsed = Annotation.parse(builder, parser) || parseModifier(builder);
final boolean parsed = Annotation.parse(builder, parser) || (!annotationsOnly && parseModifier(builder));
if (parsed) {
if (PathExpression.isQualificationDot(builder)) {
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/parser/parsing/statements/typeDefinitions/members/EnumConstant.java
+2 -2
View File
@@ -21,7 +21,7 @@ import org.jetbrains.plugins.groovy.GroovyBundle;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes;
import org.jetbrains.plugins.groovy.lang.parser.GroovyParser;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.annotations.Annotation;
import org.jetbrains.plugins.groovy.lang.parser.parsing.auxiliary.modifiers.Modifiers;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.expressions.arguments.ArgumentList;
import org.jetbrains.plugins.groovy.lang.parser.parsing.statements.typeDefinitions.TypeDefinition;
import org.jetbrains.plugins.groovy.lang.parser.parsing.util.ParserUtils;
@@ -35,7 +35,7 @@ public class EnumConstant {
PsiBuilder.Marker ecMarker = builder.mark();
ParserUtils.getToken(builder, GroovyTokenTypes.mNLS);
Annotation.parseAnnotationOptional(builder, parser);
Modifiers.parse(builder, parser, true);
if (!ParserUtils.getToken(builder, GroovyTokenTypes.mIDENT)) {
ecMarker.rollbackTo();
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java
+6
View File
@@ -55,6 +55,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrImplements
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinitionBody;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrAnnotationMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrEnumConstant;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeArgumentList;
@@ -228,6 +229,11 @@ public class GroovyIndentProcessor extends GroovyElementVisitor {
myResult = Indent.getContinuationWithoutFirstIndent();
}
@Override
public void visitEnumConstant(@NotNull GrEnumConstant enumConstant) {
Indent.getNoneIndent();
}
@Override
public void visitDocComment(@NotNull GrDocComment comment) {
if (myChildType != GroovyDocTokenTypes.mGDOC_COMMENT_START) {
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java
+5 -1
View File
@@ -317,7 +317,11 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
@Override
public void visitEnumConstant(@NotNull GrEnumConstant enumConstant) {
manageSpaceBeforeCallLParenth();
if (myType1 == GroovyElementTypes.MODIFIERS) {
createSpaceInCode(true);
} else {
manageSpaceBeforeCallLParenth();
}
}
@Override
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
+30
View File
@@ -688,6 +688,36 @@ def foooo(
''')
}
void testEnumAnnotations() {
checkFormatting('''\
enum GroovyEnum {
FOO,
@Deprecated
BAR(""),
DAR
}
''', '''\
enum GroovyEnum {
FOO,
@Deprecated
BAR(""),
DAR
}
''')
}
void testEnumAnnotationsSingleLine() {
checkFormatting('''\
enum GroovyEnum {
@Deprecated BAR("")
}
''', '''\
enum GroovyEnum {
@Deprecated BAR("")
}
''')
}
void testAlignFor() {
groovySettings.ALIGN_MULTILINE_FOR = true
checkFormatting('''\
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum10.test
Vendored
+2
View File
@@ -18,6 +18,8 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('CONST')
PsiElement(new line)('\n ')
Variable definitions
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum11.test
Vendored
+6
View File
@@ -20,15 +20,21 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('Const1')
PsiElement(new line)('\n ')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('Const2')
PsiElement(,)(',')
Enumeration constant
PsiElement(new line)('\n ')
Modifiers
<empty list>
PsiElement(identifier)('Const3')
PsiElement(new line)('\n ')
Variable definitions
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum12.test
Vendored
+2
View File
@@ -17,6 +17,8 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('Const')
PsiElement(;)(';')
PsiWhiteSpace(' ')
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum13.test
Vendored
+2
View File
@@ -14,5 +14,7 @@ Groovy script
PsiElement({)('{')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('CONST')
PsiElement(})('}')
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum5.test
Vendored
+2
View File
@@ -19,6 +19,8 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('foo')
PsiWhiteSpace(' ')
Arguments
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum6.test
Vendored
+2
View File
@@ -17,6 +17,8 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('foo')
PsiElement(new line)('\n')
PsiElement(})('}')
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum8.test
Vendored
+4
View File
@@ -18,11 +18,15 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('CONST1')
PsiElement(new line)('\n ')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('CONST2')
PsiElement(new line)('\n')
PsiElement(})('}')
plugins/groovy/testdata/parsing/groovy/statements/typedef/enums/enum9.test
Vendored
+2
View File
@@ -17,6 +17,8 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('CONST1')
PsiErrorElement:';', '}' or new line expected
<empty list>
plugins/groovy/testdata/parsing/groovy/types/innerEnum.test
Vendored
+14
View File
@@ -37,30 +37,44 @@ Groovy script
PsiWhiteSpace('\n ')
Enumeration constants
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('SUNDAY')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('MONDAY')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('TUESDAY')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('WEDNESDAY')
PsiElement(,)(',')
Enumeration constant
PsiElement(new line)('\n ')
Modifiers
<empty list>
PsiElement(identifier)('THURSDAY')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('FRIDAY')
PsiElement(,)(',')
PsiWhiteSpace(' ')
Enumeration constant
Modifiers
<empty list>
PsiElement(identifier)('SATURDAY')
PsiElement(new line)('\n ')
PsiElement(})('}')