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

don't indent closing paren of tuple (PY-7946)

Browse Source
This commit is contained in:
Dmitry Jemerov
2012-12-13 17:04:00 +01:00
parent dbe5942f26
commit ff9b2b7aa4
5 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/formatter/PyBlock.java
+7 -3
View File
@@ -192,9 +192,13 @@ public class PyBlock implements ASTBlock {
childIndent = Indent.getNormalIndent();
}
}
else if ((parentType == PyElementTypes.PARENTHESIZED_EXPRESSION || parentType == PyElementTypes.GENERATOR_EXPRESSION) &&
hasLineBreaksBefore(child, 1)) {
childIndent = Indent.getNormalIndent();
else if ((parentType == PyElementTypes.PARENTHESIZED_EXPRESSION || parentType == PyElementTypes.GENERATOR_EXPRESSION)) {
if (childType == PyTokenTypes.RPAR || !hasLineBreaksBefore(child, 1)) {
childIndent = Indent.getNoneIndent();
}
else {
childIndent = Indent.getNormalIndent();
}
}
if (isAfterStatementList(child) && !hasLineBreaksBefore(child, 2)) { // maybe enter was pressed and cut us from a previous (nested) statement list
python/testData/formatter/tupleClosingParen.py
+4
View File
@@ -0,0 +1,4 @@
tuple = (
'value',
'value',
)
python/testData/formatter/tupleClosingParen_after.py
+4
View File
@@ -0,0 +1,4 @@
tuple = (
'value',
'value',
)
python/testData/intentions/afterConvertTripleQuotedString.py
+1 -1
View File
@@ -4,4 +4,4 @@ if True:
'\n'
' Let\'s go.\n'
' And they went out.'
)
)
python/testSrc/com/jetbrains/python/PyFormatterTest.java
+3
View File
@@ -199,7 +199,10 @@ public class PyFormatterTest extends PyTestCase {
public void testSpaceWithinBraces() { // PY-8069
settings().getCustomSettings(PyCodeStyleSettings.class).SPACE_WITHIN_BRACES = true;
doTest();
}
public void testTupleClosingParen() { // PY-7946
doTest();
}
public void testPsiFormatting() { // IDEA-69724