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

PY-17193, PY-10709 enable Use parentheses instead of backslashes for breaking lines option by default

Browse Source 
Change tests according to the new default value

GitOrigin-RevId: 79a09911127532fadcc4a4d37a454887d46effa9
This commit is contained in:
Daniil Kalinin
2023-07-07 13:26:55 +00:00
committed by intellij-monorepo-bot
parent b4fc02d2f9
commit 2983980cbd
20 changed files with 150 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/python-common-tests/com/jetbrains/python/PythonCommonFormatterTest.java
+21 -2
View File
@@ -7,6 +7,7 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleManager;
import com.intellij.psi.util.PsiTreeUtil;
import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
import com.jetbrains.python.fixture.PythonCommonTestCase;
import com.jetbrains.python.formatter.PyCodeStyleSettings;
import com.jetbrains.python.psi.LanguageLevel;
@@ -1058,19 +1059,37 @@ public abstract class PythonCommonFormatterTest extends PythonCommonTestCase {
}
// PY-27615
public void testFStringFragmentWrappingSplitInsideExpression() {
public void testFStringFragmentWrappingSplitInsideExpressionWithBackslash() {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = false;
getCodeStyleSettings().setRightMargin(PythonLanguage.getInstance(), 20);
getCommonCodeStyleSettings().WRAP_LONG_LINES = true;
doTest();
}
public void testFStringFragmentWrappingSplitInsideExpressionWithParentheses() {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = true;
getCodeStyleSettings().setRightMargin(PythonLanguage.getInstance(), 20);
getCommonCodeStyleSettings().WRAP_LONG_LINES = true;
doTest();
}
// PY-27615
public void testFStringFragmentWrappingSplitInsideNestedExpression() {
public void testFStringFragmentWrappingSplitInsideNestedExpressionWithBackslash() {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = false;
getCodeStyleSettings().setRightMargin(PythonLanguage.getInstance(), 20);
getCommonCodeStyleSettings().WRAP_LONG_LINES = true;
doTest();
}
// TODO enable after PY-61453 fixed
//public void testFStringFragmentWrappingSplitInsideNestedExpressionWithParentheses() {
// PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = true;
// getCodeStyleSettings().setRightMargin(PythonLanguage.getInstance(), 20);
// getCommonCodeStyleSettings().WRAP_LONG_LINES = true;
// doTest();
//}
// PY-40778
public void testFStringSpacesBetweenFragmentAndExpressionBracesPreserved() {
doTest();
python/python-psi-impl/src/com/jetbrains/python/codeInsight/PyCodeInsightSettings.java
+1 -1
View File
@@ -36,7 +36,7 @@ public class PyCodeInsightSettings implements PersistentStateComponent<PyCodeIns
public boolean INSERT_TYPE_DOCSTUB;
public boolean PARENTHESISE_ON_ENTER;
public boolean PARENTHESISE_ON_ENTER = true;
@Override
public PyCodeInsightSettings getState() {
python/testData/editing/backslashOnEnterInTopLevelStringLiteralPattern.after.py
-4
View File
@@ -1,4 +0,0 @@
match x:
case 'foo' \
'<caret>bar':
pass
python/testData/editing/backslashOnEnterInTopLevelStringLiteralPattern.py
-3
View File
@@ -1,3 +0,0 @@
match x:
case 'foo<caret>bar':
pass
python/testData/formatter/fStringFragmentWrappingSplitInsideExpression.py → python/testData/formatter/fStringFragmentWrappingSplitInsideExpressionWithBackslash.py
View File
python/testData/formatter/fStringFragmentWrappingSplitInsideExpression_after.py → python/testData/formatter/fStringFragmentWrappingSplitInsideExpressionWithBackslash_after.py
View File
python/testData/formatter/fStringFragmentWrappingSplitInsideExpressionWithParentheses.py
+1
View File
@@ -0,0 +1 @@
s = f'aaaaaa{oct(42)}'
python/testData/formatter/fStringFragmentWrappingSplitInsideExpressionWithParentheses_after.py
+2
View File
@@ -0,0 +1,2 @@
s = (f'aaaaaa'
f'{oct(42)}')
python/testData/formatter/fStringFragmentWrappingSplitInsideNestedExpression.py → python/testData/formatter/fStringFragmentWrappingSplitInsideNestedExpressionWithBackslash.py
View File
python/testData/formatter/fStringFragmentWrappingSplitInsideNestedExpression_after.py → python/testData/formatter/fStringFragmentWrappingSplitInsideNestedExpressionWithBackslash_after.py
View File
python/testData/refactoring/inlinelocal/resultExceedsRightMargin.after.py → python/testData/refactoring/inlinelocal/resultExceedsRightMarginWithBackslash.after.py
View File
python/testData/refactoring/inlinelocal/resultExceedsRightMargin.before.py → python/testData/refactoring/inlinelocal/resultExceedsRightMarginWithBackslash.before.py
View File
python/testData/refactoring/inlinelocal/resultExceedsRightMarginWithParenthesizeOnEnter.after.py
+3
View File
@@ -0,0 +1,3 @@
result = ('123456789|123456789|123456789|123456789|123456789|' +
'123456789|123456789|123456789|123456789|123456789|' +
'123456789|123456789|123456789|123456789|123456789|')
python/testData/refactoring/inlinelocal/resultExceedsRightMarginWithParenthesizeOnEnter.before.py
+3
View File
@@ -0,0 +1,3 @@
s = '123456789|123456789|123456789|123456789|123456789|'
result = s + s + s
python/testData/wrap/ParenthesesOnWrap.after.py
+4
View File
@@ -0,0 +1,4 @@
def copy_location(new_node, old_node):
for attr in 'lineno', 'col_offset':
if (attr in old_node._attributes and attr in new_node._attributes and
hasattr(old_node, attr))
python/testData/wrap/ParenthesesOnWrap.py
+3
View File
@@ -0,0 +1,3 @@
def copy_location(new_node, old_node):
for attr in 'lineno', 'col_offset':
if attr in old_node._attributes and attr in new_node._attributes <caret>
python/testSrc/com/jetbrains/python/PyEditingTest.java
+53 -40
View File
@@ -545,12 +545,25 @@ public class PyEditingTest extends PyTestCase {
}
private void doTestEnter(String before, final String after) {
int pos = before.indexOf("<caret>");
before = before.replace("<caret>", "");
doTestTyping(before, pos, '\n');
myFixture.checkResult(after);
doTestEnter(before, after, false);
}
private void doTestEnter(String before, final String after, boolean parenthesiseOnEnter) {
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = parenthesiseOnEnter;
int pos = before.indexOf("<caret>");
before = before.replace("<caret>", "");
doTestTyping(before, pos, '\n');
myFixture.checkResult(after);
}
finally {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}
// PY-21478
public void testContinuationIndentForFunctionArguments() {
getPythonCodeStyleSettings().USE_CONTINUATION_INDENT_FOR_ARGUMENTS = true;
@@ -915,7 +928,18 @@ public class PyEditingTest extends PyTestCase {
// PY-49080
public void testBackslashOnEnterInTopLevelStringLiteralPattern() {
doTypingTest('\n');
doTestEnter("""
match x:
case 'foo<caret>bar':
pass
""",
"""
match x:
case 'foo' \\
'<caret>bar':
pass
"""
);
}
// PY-42200
@@ -1053,51 +1077,51 @@ public class PyEditingTest extends PyTestCase {
}
public void testParenthesiseBinaryExpression() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
x = a + b + <caret>c + d
""",
"""
x = (a + b +\s
c + d)
""");
""", true);
}
public void testParenthesiseImportStatement() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
from collections import Hashable, Iterable, <caret>KeysView, Mapping, MutableMapping
""",
"""
from collections import (Hashable, Iterable,\s
KeysView, Mapping, MutableMapping)
""");
""", true);
}
public void testParenthesiseCallChain() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
result = str.capitalize()<caret>.foo().bar().baz()
""",
"""
result = (str.capitalize()
.foo().bar().baz())
""");
""", true);
}
public void testParenthesiseConditionalExpression() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
x = 3 if a == 10 or<caret> b == 13 or c < 4 else 3
""",
"""
x = 3 if (a == 10 or
b == 13 or c < 4) else 3
""");
""", true);
}
public void testParenthesiseTupleExpression() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
for x in 'a',<caret> 'b', 'c':
pass
@@ -1106,55 +1130,55 @@ public class PyEditingTest extends PyTestCase {
for x in ('a',
'b', 'c'):
pass
""");
""", true);
}
public void testParenthesiseString() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
s = "str<caret>ing"
""",
"""
s = ("str"
"ing")
""");
""", true);
}
public void testStringNotParenthesisedRepeatedly() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
s = ("str<caret>ing")
""",
"""
s = ("str"
"ing")
""");
""", true);
}
public void testParenthesiseUnicodeString() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
s = u"uni<caret>code"
""",
"""
s = (u"uni"
u"code")
""");
""", true);
}
public void testParenthesiseEscapedQuote() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
a = 'some \\<caret>' string'
""",
"""
a = ('some \\''
' string')
""");
""", true);
}
public void testParenthesiseSequencePattern() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
match (1, 2):
case int(),<caret> int():
@@ -1165,22 +1189,22 @@ public class PyEditingTest extends PyTestCase {
case (int(),
int()):
pass
""");
""", true);
}
public void testParenthesiseAttributeAccessInCallChain() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
C().m().m().m()<caret>.attr
""",
"""
(C().m().m().m()
.attr)
""");
""", true);
}
public void testParenthesiseWithStatement() {
testWithParenthesiseOnEnter(
doTestEnter(
"""
with open('foo.txt') as foo, <caret>open('bar.txt') as bar:
pass
@@ -1189,18 +1213,7 @@ public class PyEditingTest extends PyTestCase {
with (open('foo.txt') as foo,\s
open('bar.txt') as bar):
pass
""");
}
private void testWithParenthesiseOnEnter(String before, String after) {
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = true;
doTestEnter(before, after);
}
finally {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
""", true);
}
@NotNull
python/testSrc/com/jetbrains/python/PyFillParagraphTest.java
+13 -2
View File
@@ -16,6 +16,7 @@
package com.jetbrains.python;
import com.intellij.codeInsight.editorActions.fillParagraph.FillParagraphAction;
import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
import com.jetbrains.python.fixtures.PyTestCase;
/**
@@ -36,7 +37,7 @@ public class PyFillParagraphTest extends PyTestCase {
}
public void testString() {
doTest();
doTestWithParenthesizeOnEnter(false, 120);
}
public void testComment() {
@@ -65,7 +66,7 @@ public class PyFillParagraphTest extends PyTestCase {
// PY-26422
public void testFString() {
doTestWithMargin(20);
doTestWithParenthesizeOnEnter(false, 20);
}
private void doTest() {
@@ -79,4 +80,14 @@ public class PyFillParagraphTest extends PyTestCase {
myFixture.testAction(new FillParagraphAction());
myFixture.checkResultByFile(baseName + "_after.py", true);
}
private void doTestWithParenthesizeOnEnter(boolean enabled, int margin) {
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = enabled;
doTestWithMargin(margin);
} finally {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}
}
python/testSrc/com/jetbrains/python/PyWrapTest.java
+18 -1
View File
@@ -6,6 +6,7 @@ import com.intellij.lang.injection.InjectedLanguageManager;
import com.intellij.psi.PsiFile;
import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
import com.jetbrains.python.fixtures.PyTestCase;
@@ -41,7 +42,23 @@ public class PyWrapTest extends PyTestCase {
}
public void testBackslashOnWrap() {
doTest("and hasattr(old_node, attr):");
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = false;
doTest("and hasattr(old_node, attr):");
} finally {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}
public void testParenthesesOnWrap() {
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = true;
doTest("and hasattr(old_node, attr)");
} finally {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}
public void testWrapInComment() {
python/testSrc/com/jetbrains/python/refactoring/PyInlineLocalTest.java
+28 -1
View File
@@ -10,6 +10,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import com.intellij.psi.codeStyle.CommonCodeStyleSettings;
import com.jetbrains.python.PyPsiBundle;
import com.jetbrains.python.PythonLanguage;
import com.jetbrains.python.codeInsight.PyCodeInsightSettings;
import com.jetbrains.python.fixtures.PyTestCase;
import com.jetbrains.python.refactoring.inline.PyInlineLocalHandler;
import org.jetbrains.annotations.NotNull;
@@ -98,21 +99,47 @@ public class PyInlineLocalTest extends PyTestCase {
}
// PY-12409
public void testResultExceedsRightMargin() {
public void testResultExceedsRightMarginWithBackslash() {
final CodeStyleSettings settings = getCodeStyleSettings();
final CommonCodeStyleSettings commonSettings = settings.getCommonSettings(PythonLanguage.getInstance());
final int oldRightMargin = settings.getRightMargin(PythonLanguage.getInstance());
final boolean oldWrapLongLines = commonSettings.WRAP_LONG_LINES;
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
settings.setRightMargin(PythonLanguage.getInstance(), 80);
commonSettings.WRAP_LONG_LINES = true;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = false;
doTest();
}
finally {
commonSettings.WRAP_LONG_LINES = oldWrapLongLines;
settings.setRightMargin(PythonLanguage.getInstance(), oldRightMargin);
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}
public void testResultExceedsRightMarginWithParenthesizeOnEnter() {
final CodeStyleSettings settings = getCodeStyleSettings();
final CommonCodeStyleSettings commonSettings = settings.getCommonSettings(PythonLanguage.getInstance());
final int oldRightMargin = settings.getRightMargin(PythonLanguage.getInstance());
final boolean oldWrapLongLines = commonSettings.WRAP_LONG_LINES;
boolean initialValue = PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER;
settings.setRightMargin(PythonLanguage.getInstance(), 80);
commonSettings.WRAP_LONG_LINES = true;
try {
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = true;
doTest();
}
finally {
commonSettings.WRAP_LONG_LINES = oldWrapLongLines;
settings.setRightMargin(PythonLanguage.getInstance(), oldRightMargin);
PyCodeInsightSettings.getInstance().PARENTHESISE_ON_ENTER = initialValue;
}
}