MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

PY-75714 Fold single line match case clauses

Browse Source 
Merge-request: IJ-MR-144163
Merged-by: Pavel Karateev <Pavel.Karateev@jetbrains.com>

GitOrigin-RevId: 352d1111988371b6edd9fa1af71b345dbb7aee38
This commit is contained in:
Pavel Karateev
2024-10-02 15:01:14 +00:00
committed by intellij-monorepo-bot
parent 06a6f45bbe
commit 85c6eee402
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
python/src/com/jetbrains/python/PythonFoldingBuilder.java
View File

@@ -176,14 +176,12 @@ public class PythonFoldingBuilder extends CustomFoldingBuilder implements DumbAw
} }
private static boolean checkFoldBlocks(@NotNull ASTNode statementList, @NotNull IElementType parentType) { private static boolean checkFoldBlocks(@NotNull ASTNode statementList, @NotNull IElementType parentType) {
if (!PyElementTypes.PARTS.contains(parentType) && parentType != PyElementTypes.WITH_STATEMENT && parentType != PyElementTypes.CASE_CLAUSE) {
return false;
}
PsiElement element = statementList.getPsi(); PsiElement element = statementList.getPsi();
if (element instanceof PyStatementList) { assert element instanceof PyStatementList;
return StringUtil.countNewLines(element.getText()) > 0;
} return PyElementTypes.PARTS.contains(parentType) ||
return false; parentType == PyElementTypes.WITH_STATEMENT ||
parentType == PyElementTypes.CASE_CLAUSE;
} }
private static void foldLongStrings(ASTNode node, List<FoldingDescriptor> descriptors) { private static void foldLongStrings(ASTNode node, List<FoldingDescriptor> descriptors) {

16
python/testData/folding/blocksFolding.py
View File

@@ -1,7 +1,7 @@
if True: if True:<fold text='...'>
pass pass</fold>
else: else:<fold text='...'>
pass pass</fold>
if True:<fold text='...'> if True:<fold text='...'>
pass pass
@@ -15,8 +15,8 @@ else:<fold text='...'>
x = [] x = []
for i in x: for i in x:<fold text='...'>
pass pass</fold>
for i in x:<fold text='...'> for i in x:<fold text='...'>
pass pass
@@ -39,8 +39,8 @@ except ValueError:<fold text='...'>
print('') print('')
print('') print('')
print('')</fold> print('')</fold>
except Exception: except Exception:<fold text='...'>
print('') print('')</fold>
else:<fold text='...'> else:<fold text='...'>
print('') print('')
print('') print('')

8
python/testData/folding/matchFolding.py
View File

@@ -3,8 +3,8 @@ def f(data):<fold text='...'>
case 1:<fold text='...'> case 1:<fold text='...'>
pass pass
pass</fold> pass</fold>
case 2: case 2:<fold text='...'>
pass pass</fold>
case 3:<fold text='...'> case 3:<fold text='...'>
pass pass
pass</fold></fold></fold> pass</fold></fold></fold>
@@ -15,5 +15,5 @@ match p:<fold text='...'>
case 0:<fold text='...'> case 0:<fold text='...'>
pass pass
pass</fold> pass</fold>
case 1: case 1:<fold text='...'>
pass</fold> pass</fold></fold>