IDEA-136397 Close brace in try resource block

This commit is contained in:
Dmitry Batrak
2015-02-20 11:35:58 +03:00
parent 66fc581516
commit 05015b2e8a
4 changed files with 23 additions and 7 deletions
@@ -0,0 +1,8 @@
class Test {
void m() {
try (<caret>){
}
finally {
}
}
}
@@ -0,0 +1,8 @@
class Test {
void m() {
try <caret>{
}
finally {
}
}
}
@@ -90,6 +90,10 @@ public class JavaTypingTest extends LightPlatformCodeInsightFixtureTestCase {
doTest('{');
}
public void testInsertPairParenBeforeTryBlock() {
doTest('(');
}
private void doTest(char c) {
myFixture.configureByFile(getTestName(true) + "_before.java");
myFixture.type(c);
@@ -339,13 +339,9 @@ public class TypedHandler extends TypedActionHandlerBase {
if (!iterator.atEnd()) {
iterator.advance();
if (!iterator.atEnd()) {
if (!BraceMatchingUtil.isPairedBracesAllowedBeforeTypeInFileType(braceTokenType, iterator.getTokenType(), fileType)) {
return;
}
if (BraceMatchingUtil.isLBraceToken(iterator, fileText, fileType)) {
return;
}
if (!iterator.atEnd() &&
!BraceMatchingUtil.isPairedBracesAllowedBeforeTypeInFileType(braceTokenType, iterator.getTokenType(), fileType)) {
return;
}
iterator.retreat();