From 0011519715d4842db304d4c8d02bc0d305031574 Mon Sep 17 00:00:00 2001 From: Yaroslav Lepenkin Date: Wed, 8 Apr 2015 14:50:34 +0300 Subject: [PATCH] Detect continuation indent only if last opened brace is "(" --- .../psi/codeStyle/autodetect/ContinuationIndentDetector.java | 4 ++-- .../codeStyle/autodetect/ContinuationIndentDetectorTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java index 74cb08bc3a23..6b27f04341e2 100644 --- a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java +++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetector.java @@ -60,10 +60,10 @@ class ContinuationIndentDetector { } public boolean isContinuationIndent() { - if (myIncorrectBracketsOrder) { + if (myIncorrectBracketsOrder || myOpenedBrackets.isEmpty()) { return false; } - return myOpenedBrackets.contains(Bracket.LPARENTH); + return myOpenedBrackets.peek() == Bracket.LPARENTH; } diff --git a/platform/lang-impl/testSources/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetectorTest.java b/platform/lang-impl/testSources/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetectorTest.java index 617a54b3c102..4a7475a49f62 100644 --- a/platform/lang-impl/testSources/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetectorTest.java +++ b/platform/lang-impl/testSources/com/intellij/psi/codeStyle/autodetect/ContinuationIndentDetectorTest.java @@ -101,7 +101,7 @@ public class ContinuationIndentDetectorTest extends TestCase { " }\n" + "}" ); - doCheckLinesWithContinuationIndents(7, 8, 9, 10, 11, 12, 13, 14, 15, 16); + doCheckLinesWithContinuationIndents(11, 16); } public void testClosingBracesAtLineStart() { @@ -127,7 +127,7 @@ public class ContinuationIndentDetectorTest extends TestCase { " )}\n" + ")\n" + "class T {}"); - doCheckLinesWithContinuationIndents(1, 2, 3, 4, 5, 6); + doCheckLinesWithContinuationIndents(1, 2, 4, 5, 6); } private void doCheckLinesWithContinuationIndents(Integer... linesWithContinuationIndents) {