From 9fa9f3cd85faa7470e7ddc051a37b2a81e49a69f Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Tue, 4 Sep 2012 15:49:06 +0400 Subject: [PATCH] skip additional exceptions if formatting fails --- .../org/jetbrains/plugins/groovy/formatter/GroovyBlock.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java index 2ca6d2f52539..36b3a5cf8a45 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/formatter/GroovyBlock.java @@ -47,6 +47,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrBinary import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrCommandArgumentList; import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameterList; +import java.util.ArrayList; import java.util.List; /** @@ -115,10 +116,12 @@ public class GroovyBlock implements Block, GroovyElementTypes, ASTBlock { catch (AssertionError e) { final PsiFile file = myNode.getPsi().getContainingFile(); LogMessageEx.error(LOG, "Formatting failed for file " + file.getName(), e, file.getText(), myNode.getText()); + mySubBlocks = new ArrayList(); } catch (RuntimeException e) { final PsiFile file = myNode.getPsi().getContainingFile(); LogMessageEx.error(LOG, "Formatting failed for file " + file.getName(), e, file.getText(), myNode.getText()); + mySubBlocks = new ArrayList(); } } return mySubBlocks;