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

failing test for PY-10319

Browse Source
This commit is contained in:
Dmitry Jemerov
2013-11-06 19:17:43 +01:00
parent dd3f3fa7d0
commit 38f058d76f
4 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/formatter/PyBlock.java
+6 -1
View File
@@ -152,7 +152,7 @@ public class PyBlock implements ASTBlock {
if (ourListElementTypes.contains(parentType)) {
// wrapping in non-parenthesized tuple expression is not allowed (PY-1792)
if ((parentType != PyElementTypes.TUPLE_EXPRESSION || grandparentType == PyElementTypes.PARENTHESIZED_EXPRESSION) &&
!ourBrackets.contains(childType) && childType != PyTokenTypes.COMMA && !isSliceOperand(child)) {
!ourBrackets.contains(childType) && childType != PyTokenTypes.COMMA && !isSliceOperand(child) /*&& !isSubscriptionOperand(child)*/) {
wrap = Wrap.createWrap(WrapType.NORMAL, true);
}
if (needListAlignment(child) && !isEmptyList(_node.getPsi())) {
@@ -257,6 +257,11 @@ public class PyBlock implements ASTBlock {
return new PyBlock(this, child, childAlignment, childIndent, wrap, myContext);
}
private static boolean isSubscriptionOperand(ASTNode child) {
return child.getTreeParent().getElementType() == PyElementTypes.SUBSCRIPTION_EXPRESSION &&
child.getPsi() == ((PySubscriptionExpression) child.getTreeParent().getPsi()).getOperand();
}
private boolean isInControlStatement() {
return PsiTreeUtil.getParentOfType(_node.getPsi(), PyStatementPart.class, false, PyStatementList.class) != null ||
PsiTreeUtil.getParentOfType(_node.getPsi(), PyWithItem.class) != null;
python/testData/formatter/wrapBeforeElse.py
+1
View File
@@ -0,0 +1 @@
id = 1 if looooooooooooooooooooooooong_vaaaaaaaaaaaaaaaar == 'loooooooooooooooong_vaaaaaaaaaaaaaaaaaaaaaaaaaalue' else list('foo')[0]
python/testData/formatter/wrapBeforeElse_after.py
+2
View File
@@ -0,0 +1,2 @@
id = 1 if looooooooooooooooooooooooong_vaaaaaaaaaaaaaaaar == 'loooooooooooooooong_vaaaaaaaaaaaaaaaaaaaaaaaaaalue' else list(
'foo')[0]
python/testSrc/com/jetbrains/python/PyFormatterTest.java
+16 -1
View File
@@ -337,12 +337,27 @@ public class PyFormatterTest extends PyTestCase {
doTest();
}
public void _testWrapBeforeElse() { // PY-10319
doTest(true);
}
private void doTest() {
doTest(false);
}
private void doTest(final boolean reformatText) {
myFixture.configureByFile("formatter/" + getTestName(true) + ".py");
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override
public void run() {
CodeStyleManager.getInstance(myFixture.getProject()).reformat(myFixture.getFile());
CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(myFixture.getProject());
PsiFile file = myFixture.getFile();
if (reformatText) {
codeStyleManager.reformatText(file, 0, file.getTextLength());
}
else {
codeStyleManager.reformat(file);
}
}
});
myFixture.checkResultByFile("formatter/" + getTestName(true) + "_after.py");