azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: rename method, extract method, static import

Browse Source
This commit is contained in:
Nikolay Krasko
2014-05-02 01:49:00 +04:00
parent 2b847cd885
commit 47400f90ce
2 changed files with 28 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/formatter/ASTIndentStrategy.java
+12 -15
View File
@@ -26,12 +26,13 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@SuppressWarnings("UnusedDeclaration")
public abstract class ASTIndentStrategy {
public static ASTIndentStrategy constIndent(Indent indent) {
return new ConstIndentStrategy(indent);
}
public static PositionStrategy forNode(@Nullable String debugInfo) {
public static PositionStrategy strategy(@Nullable String debugInfo) {
return new PositionStrategy(debugInfo);
}
@@ -77,16 +78,12 @@ public abstract class ASTIndentStrategy {
}
public PositionStrategy in(@NotNull IElementType parentType, @NotNull IElementType... orParentTypes) {
in.clear();
in.add(parentType);
Collections.addAll(in, orParentTypes);
fillTypes(in, parentType, orParentTypes);
return this;
}
public PositionStrategy notIn(@NotNull IElementType parentType, @NotNull IElementType... orParentTypes) {
notIn.clear();
notIn.add(parentType);
Collections.addAll(notIn, orParentTypes);
fillTypes(notIn, parentType, orParentTypes);
return this;
}
@@ -97,18 +94,12 @@ public abstract class ASTIndentStrategy {
}
public PositionStrategy forType(@NotNull IElementType elementType, @NotNull IElementType... otherTypes) {
forElement.clear();
forElement.add(elementType);
Collections.addAll(forElement, otherTypes);
fillTypes(forElement, elementType, otherTypes);
return this;
}
public PositionStrategy notForType(@NotNull IElementType elementType, @NotNull IElementType... otherTypes) {
notForElement.clear();
notForElement.add(elementType);
Collections.addAll(notForElement, otherTypes);
fillTypes(notForElement, elementType, otherTypes);
return this;
}
@@ -151,5 +142,11 @@ public abstract class ASTIndentStrategy {
return defaultIndent;
}
private static void fillTypes(List<IElementType> resultCollection, IElementType singleType, IElementType[] otherTypes) {
resultCollection.clear();
resultCollection.add(singleType);
Collections.addAll(resultCollection, otherTypes);
}
}
}
idea/src/org/jetbrains/jet/plugin/formatter/JetBlock.java
+16 -15
View File
@@ -37,6 +37,7 @@ import java.util.List;
import static org.jetbrains.jet.JetNodeTypes.*;
import static org.jetbrains.jet.lexer.JetTokens.*;
import static org.jetbrains.jet.plugin.formatter.ASTIndentStrategy.strategy;
/**
* @see Block for good JavaDoc documentation
@@ -278,67 +279,67 @@ public class JetBlock extends AbstractBlock {
}
}
static ASTIndentStrategy[] INDENT_RULES = new ASTIndentStrategy[] {
ASTIndentStrategy.forNode("No indent for braces in blocks")
private static final ASTIndentStrategy[] INDENT_RULES = new ASTIndentStrategy[] {
strategy("No indent for braces in blocks")
.in(BLOCK, CLASS_BODY, FUNCTION_LITERAL)
.forType(RBRACE, LBRACE)
.set(Indent.getNoneIndent()),
ASTIndentStrategy.forNode("Indent for block content")
strategy("Indent for block content")
.in(BLOCK, CLASS_BODY, FUNCTION_LITERAL)
.notForType(RBRACE, LBRACE, BLOCK)
.set(Indent.getNormalIndent()),
ASTIndentStrategy.forNode("Indent for property accessors")
strategy("Indent for property accessors")
.in(PROPERTY)
.forType(PROPERTY_ACCESSOR)
.set(Indent.getNormalIndent()),
ASTIndentStrategy.forNode("For a single statement in 'for'")
strategy("For a single statement in 'for'")
.in(BODY)
.notForType(BLOCK)
.set(Indent.getNormalIndent()),
ASTIndentStrategy.forNode("For the entry in when")
strategy("For the entry in when")
.forType(WHEN_ENTRY)
.set(Indent.getNormalIndent()),
ASTIndentStrategy.forNode("For single statement in THEN and ELSE")
strategy("For single statement in THEN and ELSE")
.in(THEN, ELSE)
.notForType(BLOCK)
.set(Indent.getNormalIndent()),
ASTIndentStrategy.forNode("Indent for parts")
strategy("Indent for parts")
.in(PROPERTY, FUN)
.notForType(BLOCK, FUN_KEYWORD, VAL_KEYWORD, VAR_KEYWORD)
.set(Indent.getContinuationWithoutFirstIndent()),
ASTIndentStrategy.forNode("Chained calls")
strategy("Chained calls")
.in(DOT_QUALIFIED_EXPRESSION, SAFE_ACCESS_EXPRESSION)
.set(Indent.getContinuationWithoutFirstIndent(true)),
ASTIndentStrategy.forNode("Delegation list")
strategy("Delegation list")
.in(DELEGATION_SPECIFIER_LIST, INITIALIZER_LIST)
.set(Indent.getContinuationIndent(false)),
ASTIndentStrategy.forNode("Indices")
strategy("Indices")
.in(INDICES)
.set(Indent.getContinuationIndent(false)),
ASTIndentStrategy.forNode("Binary expressions")
strategy("Binary expressions")
.in(BINARY_EXPRESSION)
.set(Indent.getContinuationWithoutFirstIndent(false)),
ASTIndentStrategy.forNode("Parenthesized expression")
strategy("Parenthesized expression")
.in(PARENTHESIZED)
.set(Indent.getContinuationWithoutFirstIndent(false)),
ASTIndentStrategy.forNode("KDoc comment indent")
strategy("KDoc comment indent")
.in(DOC_COMMENT)
.forType(KDocTokens.LEADING_ASTERISK, KDocTokens.END)
.set(Indent.getSpaceIndent(KDOC_COMMENT_INDENT)),
ASTIndentStrategy.forNode("Block in when entry")
strategy("Block in when entry")
.in(WHEN_ENTRY)
.notForType(BLOCK, WHEN_CONDITION_EXPRESSION, WHEN_CONDITION_IN_RANGE, WHEN_CONDITION_IS_PATTERN, ELSE_KEYWORD, ARROW)
.set(Indent.getNormalIndent()),