From 16f26b45c6ce766def96b4e94ce9ce18f7d098d8 Mon Sep 17 00:00:00 2001 From: Max Medvedev Date: Wed, 29 May 2013 16:12:15 +0400 Subject: [PATCH] separate package for groovy formatting blocks --- .../plugins/groovy/formatter/AlignmentProvider.java | 8 ++++---- .../groovy/formatter/GroovyFormattingModelBuilder.java | 1 + .../groovy/formatter/{ => blocks}/ClosureBodyBlock.java | 3 ++- .../groovy/formatter/{ => blocks}/GroovyBlock.java | 3 ++- .../formatter/{ => blocks}/GroovyBlockGenerator.java | 4 +++- .../{ => blocks}/MethodCallWithoutQualifierBlock.java | 3 ++- .../groovy/formatter/{ => blocks}/ParameterListBlock.java | 4 +++- .../formatter/processors/GroovyIndentProcessor.java | 4 ++-- .../formatter/processors/GroovySpacingProcessor.java | 4 ++-- .../formatter/processors/GroovySpacingProcessorBasic.java | 6 +++--- .../formatter/processors/GroovyWrappingProcessor.java | 2 +- 11 files changed, 25 insertions(+), 17 deletions(-) rename plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/{ => blocks}/ClosureBodyBlock.java (95%) rename plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/{ => blocks}/GroovyBlock.java (98%) rename plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/{ => blocks}/GroovyBlockGenerator.java (99%) rename plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/{ => blocks}/MethodCallWithoutQualifierBlock.java (95%) rename plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/{ => blocks}/ParameterListBlock.java (95%) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java index 900f7acfd1a3..815900804ec0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/AlignmentProvider.java @@ -30,7 +30,7 @@ import java.util.Set; /** * @author Max Medvedev */ -class AlignmentProvider { +public class AlignmentProvider { private final Map> myTree = new HashMap>(); private final Map, Alignment> myAlignments = new HashMap, Alignment>(); private final Map, Boolean> myAllowBackwardShift = new HashMap, Boolean>(); @@ -175,18 +175,18 @@ class AlignmentProvider { * * @author Max Medvedev */ - class Aligner { + public class Aligner { private PsiElement myRef = null; private boolean allowBackwardShift = true; @NotNull private final Alignment.Anchor myAnchor; - Aligner(boolean allowBackwardShift, @NotNull Alignment.Anchor anchor) { + private Aligner(boolean allowBackwardShift, @NotNull Alignment.Anchor anchor) { this.allowBackwardShift = allowBackwardShift; myAnchor = anchor; } - void append(@Nullable PsiElement element) { + public void append(@Nullable PsiElement element) { if (element == null) return; if (myRef == null) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java index 1492a28e11fb..226e23db0603 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyFormattingModelBuilder.java @@ -37,6 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings; +import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; import org.jetbrains.plugins.groovy.lang.lexer.TokenSets; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ClosureBodyBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ClosureBodyBlock.java similarity index 95% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ClosureBodyBlock.java rename to plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ClosureBodyBlock.java index 0f6b5a23e8c1..40834975ef29 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ClosureBodyBlock.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ClosureBodyBlock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy.formatter; +package org.jetbrains.plugins.groovy.formatter.blocks; import com.intellij.formatting.Block; import com.intellij.formatting.ChildAttributes; @@ -23,6 +23,7 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.groovy.formatter.FormattingContext; import java.util.List; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlock.java similarity index 98% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java rename to plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlock.java index f2ec4ee00325..bf3046a8a07b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlock.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.plugins.groovy.formatter; +package org.jetbrains.plugins.groovy.formatter.blocks; import com.intellij.diagnostic.LogMessageEx; import com.intellij.formatting.*; @@ -25,6 +25,7 @@ import com.intellij.psi.*; import com.intellij.psi.tree.ILazyParseableElementType; 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 org.jetbrains.plugins.groovy.formatter.processors.GroovySpacingProcessor; import org.jetbrains.plugins.groovy.formatter.processors.GroovySpacingProcessorBasic; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlockGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java similarity index 99% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlockGenerator.java rename to plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java index feed75564e25..ae377e65a064 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlockGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/GroovyBlockGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.jetbrains.plugins.groovy.formatter; +package org.jetbrains.plugins.groovy.formatter.blocks; import com.intellij.formatting.*; import com.intellij.lang.ASTNode; @@ -34,6 +34,8 @@ import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyFileType; +import org.jetbrains.plugins.groovy.formatter.AlignmentProvider; +import org.jetbrains.plugins.groovy.formatter.FormattingContext; import org.jetbrains.plugins.groovy.formatter.processors.GroovyIndentProcessor; import org.jetbrains.plugins.groovy.formatter.processors.GroovyWrappingProcessor; import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/MethodCallWithoutQualifierBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/MethodCallWithoutQualifierBlock.java similarity index 95% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/MethodCallWithoutQualifierBlock.java rename to plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/MethodCallWithoutQualifierBlock.java index 1e3100d258ac..a14f2f8c3ebc 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/MethodCallWithoutQualifierBlock.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/MethodCallWithoutQualifierBlock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy.formatter; +package org.jetbrains.plugins.groovy.formatter.blocks; import com.intellij.formatting.Block; import com.intellij.formatting.Indent; @@ -23,6 +23,7 @@ import com.intellij.lang.ASTNode; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; +import org.jetbrains.plugins.groovy.formatter.FormattingContext; import java.util.ArrayList; import java.util.List; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ParameterListBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ParameterListBlock.java similarity index 95% rename from plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ParameterListBlock.java rename to plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ParameterListBlock.java index 3231436393d0..e2ef0bde23eb 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/ParameterListBlock.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/blocks/ParameterListBlock.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jetbrains.plugins.groovy.formatter; +package org.jetbrains.plugins.groovy.formatter.blocks; import com.intellij.formatting.Block; import com.intellij.formatting.Indent; @@ -24,6 +24,8 @@ import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiErrorElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.plugins.groovy.formatter.AlignmentProvider; +import org.jetbrains.plugins.groovy.formatter.FormattingContext; import org.jetbrains.plugins.groovy.formatter.processors.GroovyWrappingProcessor; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java index ac4bb21c622f..d9265dd0b98c 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyIndentProcessor.java @@ -23,8 +23,8 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; -import org.jetbrains.plugins.groovy.formatter.ClosureBodyBlock; -import org.jetbrains.plugins.groovy.formatter.GroovyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.ClosureBodyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock; import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocComment; import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocMethodParams; import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GrDocTag; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java index f1aeb55dec84..0075d214bc5e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessor.java @@ -31,8 +31,8 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings; import org.jetbrains.plugins.groovy.formatter.FormattingContext; import org.jetbrains.plugins.groovy.formatter.GeeseUtil; -import org.jetbrains.plugins.groovy.formatter.GroovyBlock; -import org.jetbrains.plugins.groovy.formatter.ParameterListBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.ParameterListBlock; import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.*; import org.jetbrains.plugins.groovy.lang.lexer.TokenSets; import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessorBasic.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessorBasic.java index de51dfadb29f..3fc1d4cecd76 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessorBasic.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovySpacingProcessorBasic.java @@ -26,10 +26,10 @@ import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeStyle.GroovyCodeStyleSettings; -import org.jetbrains.plugins.groovy.formatter.ClosureBodyBlock; import org.jetbrains.plugins.groovy.formatter.FormattingContext; -import org.jetbrains.plugins.groovy.formatter.GroovyBlock; -import org.jetbrains.plugins.groovy.formatter.MethodCallWithoutQualifierBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.ClosureBodyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.MethodCallWithoutQualifierBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.GrStatement; import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlock; import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrConditionalExpression; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyWrappingProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyWrappingProcessor.java index 6c640dc604de..272540d8f4c9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyWrappingProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/processors/GroovyWrappingProcessor.java @@ -25,7 +25,7 @@ import com.intellij.psi.tree.IElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.formatter.FormattingContext; -import org.jetbrains.plugins.groovy.formatter.GroovyBlock; +import org.jetbrains.plugins.groovy.formatter.blocks.GroovyBlock; import org.jetbrains.plugins.groovy.lang.lexer.TokenSets; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList; import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.annotation.GrAnnotation;