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-110092 Java style indents for labels in Groovy

Browse Source
This commit is contained in:
Max Medvedev
2013-07-05 17:20:52 +04:00
parent 9b5d3d5be9
commit 33cdb24cd1
8 changed files with 39 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/groovy/src/org/jetbrains/plugins/groovy/codeStyle/GroovyLanguageCodeStyleSettingsProvider.java
+5 -7
View File
@@ -34,9 +34,9 @@ import javax.swing.*;
*/
public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
public static final String IN_SPOCK_ONLY = "In Spock only";
public static final String ABSOLUTE = "Absolute";
public static final String RELATIVE = "Relative";
public static final String RELATIVE = "Indent statements after label";
public static final String RELATIVE_REVERSED = "Indent labels";
@NotNull
@Override
@@ -264,8 +264,6 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe
defaultSettings.SPACE_WITHIN_BRACES = true;
defaultSettings.KEEP_SIMPLE_CLASSES_IN_ONE_LINE = true;
defaultSettings.KEEP_SIMPLE_METHODS_IN_ONE_LINE = true;
//defaultSettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE = true;
defaultSettings.getIndentOptions().LABEL_INDENT_SIZE = 2;
return defaultSettings;
}
@@ -300,7 +298,7 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe
myStyleLabel = new JBLabel("Label indent style:");
myLabelIndentStyle = new JComboBox(new Object[] {IN_SPOCK_ONLY, ABSOLUTE, RELATIVE});
myLabelIndentStyle = new JComboBox(new Object[] {ABSOLUTE, RELATIVE, RELATIVE_REVERSED});
add(myStyleLabel, myLabelIndentStyle);
}
@@ -320,7 +318,7 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe
return !RELATIVE.equals(myLabelIndentStyle.getSelectedItem());
}
else {
return !IN_SPOCK_ONLY.equals(myLabelIndentStyle.getSelectedItem());
return !RELATIVE_REVERSED.equals(myLabelIndentStyle.getSelectedItem());
}
}
@@ -342,7 +340,7 @@ public class GroovyLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSe
myLabelIndentStyle.setSelectedItem(RELATIVE);
}
else {
myLabelIndentStyle.setSelectedItem(IN_SPOCK_ONLY);
myLabelIndentStyle.setSelectedItem(RELATIVE_REVERSED);
}
}
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ClosureBodyBlock.java
+1 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.openapi.util.TextRange;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.groovy.formatter.FormattingContext;
import org.jetbrains.plugins.groovy.formatter.processors.GroovyIndentProcessor;
import java.util.List;
@@ -53,7 +52,7 @@ public class ClosureBodyBlock extends GroovyBlock {
GroovyBlockGenerator generator = new GroovyBlockGenerator(this);
List<ASTNode> children = GroovyBlockGenerator.getClosureBodyVisibleChildren(myNode.getTreeParent());
mySubBlocks = generator.generateSubBlockForCodeBlocks(false, children, GroovyIndentProcessor.indentLabelBlock(myNode.getPsi(), myContext.getGroovySettings()));
mySubBlocks = generator.generateSubBlockForCodeBlocks(false, children, myContext.getGroovySettings().INDENT_LABEL_BLOCKS);
//at least -> exists
assert !mySubBlocks.isEmpty();
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlock.java
+1 -1
View File
@@ -219,7 +219,7 @@ public class GroovyBlock implements Block, GroovyElementTypes, ASTBlock {
return new ChildAttributes(Indent.getNormalIndent(), null);
}
if (psiParent instanceof GrLabeledStatement && newChildIndex == 2) {
final Indent indent = GroovyIndentProcessor.indentLabelBlock(psiParent, getContext().getGroovySettings())
final Indent indent = getContext().getGroovySettings().INDENT_LABEL_BLOCKS
? Indent.getLabelIndent()
: Indent.getNoneIndent();
return new ChildAttributes(indent, null);
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java
+2 -2
View File
@@ -242,7 +242,7 @@ public class GroovyBlockGenerator implements GroovyElementTypes {
}
if (blockPsi instanceof GrCodeBlock || blockPsi instanceof GroovyFile || classLevel) {
return generateSubBlockForCodeBlocks(classLevel, visibleChildren(myNode), GroovyIndentProcessor.indentLabelBlock(blockPsi, myContext.getGroovySettings()));
return generateSubBlockForCodeBlocks(classLevel, visibleChildren(myNode), myContext.getGroovySettings().INDENT_LABEL_BLOCKS);
}
if (blockPsi instanceof GrMethod) {
@@ -324,7 +324,7 @@ public class GroovyBlockGenerator implements GroovyElementTypes {
return wrap;
}
public List<Block> generateSubBlockForCodeBlocks(boolean classLevel, final List<ASTNode> children, final boolean indentLabelBlocks) {
public List<Block> generateSubBlockForCodeBlocks(boolean classLevel, final List<ASTNode> children, boolean indentLabelBlocks) {
calculateAlignments(children, classLevel);
final ArrayList<Block> subBlocks = new ArrayList<Block>();
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java
+4 -41
View File
@@ -18,15 +18,11 @@ package org.jetbrains.plugins.groovy.formatter.processors;
import com.intellij.formatting.Indent;
import com.intellij.lang.ASTNode;
import com.intellij.psi.PsiClassType;
import com.intellij.psi.PsiElement;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.TokenSet;
import com.intellij.psi.util.InheritanceUtil;
import com.intellij.psi.util.PsiTreeUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings;
import org.jetbrains.plugins.groovy.formatter.blocks.ClosureBodyBlock;
import org.jetbrains.plugins.groovy.formatter.blocks.GrLabelBlock;
import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock;
@@ -58,8 +54,6 @@ 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.GrMethod;
import org.jetbrains.plugins.groovy.lang.psi.api.types.GrCodeReferenceElement;
import org.jetbrains.plugins.groovy.spock.SpockUtils;
import static org.jetbrains.plugins.groovy.lang.parser.GroovyElementTypes.*;
@@ -151,46 +145,15 @@ public class GroovyIndentProcessor extends GroovyElementVisitor {
if (indentOptions != null && indentOptions.LABEL_INDENT_ABSOLUTE) {
myResult = Indent.getAbsoluteLabelIndent();
}
}
else {
if (indentLabelBlock(myChild, myBlock.getContext().getGroovySettings())) {
else if (!myBlock.getContext().getGroovySettings().INDENT_LABEL_BLOCKS) {
myResult = Indent.getLabelIndent();
}
}
}
public static boolean indentLabelBlock(@NotNull PsiElement place, final GroovyCodeStyleSettings settings) {
if (settings.INDENT_LABEL_BLOCKS) {
return true;
}
final GrTypeDefinition clazz = PsiTreeUtil.getParentOfType(place, GrTypeDefinition.class);
if (clazz == null) return false;
if (isDirectInheritorOfSpecification(clazz) || InheritanceUtil.isInheritor(clazz, SpockUtils.SPEC_CLASS_NAME)) {
return true;
}
final PsiClassType[] supers = clazz.getSuperTypes();
for (PsiClassType aSuper : supers) {
if (aSuper.equalsToText(SpockUtils.SPEC_CLASS_NAME)) {
return true;
else {
if (myBlock.getContext().getGroovySettings().INDENT_LABEL_BLOCKS) {
myResult = Indent.getLabelIndent();
}
}
return false;
}
private static boolean isDirectInheritorOfSpecification(@NotNull GrTypeDefinition clazz) {
final GrExtendsClause clause = clazz.getExtendsClause();
if (clause != null) {
final GrCodeReferenceElement[] refs = clause.getReferenceElements();
for (GrCodeReferenceElement ref : refs) {
if (SpockUtils.SPEC_CLASS_NAME.equals(ref.getClassNameText())) {
return true;
}
}
}
return false;
}
@Override
plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java
+1 -1
View File
@@ -211,7 +211,7 @@ public class GroovySpacingProcessor extends GroovyElementVisitor {
@Override
public void visitLabeledStatement(GrLabeledStatement labeledStatement) {
if (myType1 == mCOLON) {
if (GroovyIndentProcessor.indentLabelBlock(labeledStatement, myGroovySettings)) {
if (myGroovySettings.INDENT_LABEL_BLOCKS) {
createLF(true);
}
else {
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/EnterActionTest.groovy
+4 -3
View File
@@ -14,13 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.plugins.groovy.lang.formatter;
package org.jetbrains.plugins.groovy.lang.formatter
import org.jetbrains.plugins.groovy.GroovyFileType
import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings
import org.jetbrains.plugins.groovy.util.TestUtils
/**
* @author ilyas
*/
@@ -350,6 +348,9 @@ def cl = {
}
void testIndentAfterLabelColon() {
groovySettings.indentOptions.LABEL_INDENT_SIZE = 2
groovySettings.indentOptions.INDENT_SIZE = 2
groovyCustomSettings.INDENT_LABEL_BLOCKS = true
doTest('''
class A extends spock.lang.Specification {
def 'test'() {
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/formatter/FormatterTest.groovy
+21 -9
View File
@@ -112,9 +112,9 @@ public class FormatterTest extends GroovyFormatterTestCase {
public void testAnnotationOnSeparateLine() throws Throwable { doTest(); }
public void testAlignMultipleVariables() throws Throwable { doTest(); }
public void testSpockTable() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
public void testSpockTableComments() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
public void testSpockTableWithStringComment() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
//public void testSpockTable() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
//public void testSpockTableComments() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
//public void testSpockTableWithStringComment() throws Throwable {myFixture.addClass('package spock.lang; public class Specification{}'); doTest(); }
public void testElseIfs() throws Throwable {
groovySettings.SPECIAL_ELSE_IF_TREATMENT = false;
@@ -712,24 +712,36 @@ print abc ?:
}
void testLabelsInBasicMode() {
groovySettings.indentOptions.INDENT_SIZE = 4
groovySettings.indentOptions.LABEL_INDENT_SIZE = -2
groovyCustomSettings.INDENT_LABEL_BLOCKS = false
checkFormatting('''\
abc:foo()
bar()
def bar() {
abc:
foo()
bar()
}
''', '''\
abc: foo()
bar()
def bar() {
abc:
foo()
bar()
}
''')
}
void testLabels() {
checkFormatting('''\
def foo() {
abc:foo()
bar()
}
''', '''\
abc: foo()
bar()
def foo() {
abc: foo()
bar()
}
''')
}