diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineInfoBuilderTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineInfoBuilderTest.java index 9bdd7590bb79..8ed5cc75f174 100644 --- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineInfoBuilderTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/FormatterBasedLineInfoBuilderTest.java @@ -65,7 +65,7 @@ public class FormatterBasedLineInfoBuilderTest extends LightPlatformCodeInsightT TestFormattingModel model = new TestFormattingModel(text); Document document = model.getDocument(); TestBlock block = new FormattingModelXmlReader(model).readTestBlock(getTestDataPath(), file); - FormatterBasedLineIndentInfoBuilder builder = new FormatterBasedLineIndentInfoBuilder(document, block, indicator); + FormatterBasedLineIndentInfoBuilder builder = new FormatterBasedLineIndentInfoBuilder(document, block, null); return builder.build(); } } \ No newline at end of file diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java index 8f3edd58d57a..7d5b5b695c5b 100644 --- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java +++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/autodetect/NewLineBlocksIteratorTest.java @@ -78,6 +78,6 @@ public class NewLineBlocksIteratorTest extends AbstractNewLineBlocksIteratorTest TestFormattingModel model = new TestFormattingModel(text); Document document = model.getDocument(); TestBlock block = new FormattingModelXmlReader(model).readTestBlock(getTestDataPath(), getFileName() + ".xml"); - return new NewLineBlocksIterator(block, document); + return new NewLineBlocksIterator(block, document, null); } } diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/common/AbstractBlock.java b/platform/lang-impl/src/com/intellij/psi/formatter/common/AbstractBlock.java index f7337dc2554a..6310f66298d2 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/common/AbstractBlock.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/common/AbstractBlock.java @@ -58,14 +58,6 @@ public abstract class AbstractBlock implements ASTBlock { @NotNull public List getSubBlocks() { if (mySubBlocks == null) { - - try { - Thread.sleep(100); - } - catch (InterruptedException e) { - e.printStackTrace(); - } - List list = buildChildren(); if (list.isEmpty()) { list = buildInjectedBlocks();