MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-18 09:34:34 +07:00
Code Issues Packages Projects Releases Wiki Activity

Formatting: spaces in and around resource list

Browse Source
This commit is contained in:
Roman Shevchenko
2011-03-14 20:00:31 +01:00
parent 967185e371
commit 25ef1f7ada
6 changed files with 107 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/ide/JavaLanguageCodeStyleSettingsProvider.java
+1 -1
View File
@@ -164,7 +164,7 @@ public class JavaLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSett
" y += (y ^ 0x123) << 2;\n" +
" }\n" +
" do {\n" +
" try {\n" +
" try (MyResource r1 = getResource(); MyResource r2 = null) {\n" +
" if (0 < x && x < 10) {\n" +
" while (x != y) {\n" +
" x = f(x * 3 + 5);\n" +
java/java-impl/src/com/intellij/psi/formatter/java/JavaSpacePropertyProcessor.java
+25 -6
View File
@@ -614,10 +614,17 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
return;
}
if (myRole2 == ChildRole.TRY_BLOCK || myRole2 == ChildRole.FINALLY_BLOCK) {
boolean useSpaceBeforeLBrace = myRole2 == ChildRole.TRY_BLOCK ? mySettings.SPACE_BEFORE_TRY_LBRACE
: mySettings.SPACE_BEFORE_FINALLY_LBRACE;
myResult = getSpaceBeforeLBrace(useSpaceBeforeLBrace, mySettings.BRACE_STYLE, null, mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE, true);
if (myRole2 == ChildRole.TRY_BLOCK) {
myResult = getSpaceBeforeLBrace(mySettings.SPACE_BEFORE_TRY_LBRACE,
mySettings.BRACE_STYLE, null, mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE, true);
}
else if (myRole2 == ChildRole.FINALLY_BLOCK) {
myResult = getSpaceBeforeLBrace(mySettings.SPACE_BEFORE_FINALLY_LBRACE,
mySettings.BRACE_STYLE, null, mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE, true);
}
else if (myType2 == JavaElementType.RESOURCE_LIST) {
myResult = getSpaceBeforeLBrace(mySettings.SPACE_BEFORE_TRY_PARENTHESES,
mySettings.BRACE_STYLE, null, mySettings.KEEP_SIMPLE_BLOCKS_IN_ONE_LINE, true);
}
}
@@ -1211,6 +1218,20 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
}
@Override
public void visitResourceList(final PsiResourceList resourceList) {
if (myType1 == JavaTokenType.LPARENTH || myType2 == JavaTokenType.RPARENTH) {
createSpaceInCode(mySettings.SPACE_WITHIN_TRY_PARENTHESES);
}
if (myType1 == JavaTokenType.SEMICOLON) {
createSpaceInCode(mySettings.SPACE_AFTER_SEMICOLON);
}
if (myType2 == JavaTokenType.SEMICOLON) {
createSpaceInCode(mySettings.SPACE_BEFORE_SEMICOLON);
}
}
@Override public void visitReferenceParameterList(PsiReferenceParameterList list) {
if (myRole1 == ChildRole.LT_IN_TYPE_LIST && myRole2 == ChildRole.TYPE_IN_REFERENCE_PARAMETER_LIST) {
createSpaceInCode(false);
@@ -1227,8 +1248,6 @@ public class JavaSpacePropertyProcessor extends JavaElementVisitor {
else if (myRole2 == ChildRole.GT_IN_TYPE_LIST) {
createSpaceInCode(false);
}
}
@Override public void visitTypeCastExpression(PsiTypeCastExpression expression) {