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

fixed PY-5269 Move statement: inconsistent moving of continue and break statement within nested loops

Browse Source
This commit is contained in:
Ekaterina Tuzova
2012-03-22 15:17:11 +04:00
parent 7e1917023d
commit ab0df25b01
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/codeInsight/editorActions/moveUpDown/StatementMover.java
+8 -2
View File
@@ -78,13 +78,18 @@ public class StatementMover extends LineMover {
}
if ( myStatementToMove instanceof PyBreakStatement
|| myStatementToMove instanceof PyContinueStatement) {
//info.toMove2 = info.toMove;
//return true;
PyLoopStatement parent = PsiTreeUtil.getParentOfType(myStatementToMove, PyLoopStatement.class);
if (parent != null) {
PyStatementPart part = PsiTreeUtil.getChildOfType(parent, PyStatementPart.class);
if (part != null && part.getStatementList() != null) {
PyStatementList statementList = part.getStatementList();
if (myStatementToMove.getParent() instanceof PyStatementList) {
statementList = (PyStatementList)myStatementToMove.getParent();
}
if (statementList != null && statementList.getStatements().length > 0) {
if ((statementList.getStatements()[0] == myStatementToMove && !down)
if ((statementList.getStatements()[0] == myStatementToMove /*&& !down*/)
|| (statementList.getStatements()[statementList.getStatements().length-1] == myStatementToMove && down)) {
info.toMove2 = info.toMove;
return true;
@@ -415,7 +420,8 @@ public class StatementMover extends LineMover {
CodeStyleSettings.IndentOptions indentOptions = CodeStyleSettingsManager.getInstance(editor.getProject()).
getCurrentSettings().getIndentOptions(PythonFileType.INSTANCE);
PsiElement whiteSpace = myStatementToAddLinebreak.getContainingFile().findElementAt(editor.getDocument().getLineStartOffset(line));
PsiElement whiteSpace = myStatementToAddLinebreak.getContainingFile().findElementAt(
editor.getDocument().getLineStartOffset(line));
String indent = StringUtil.repeatSymbol(' ', indentOptions.INDENT_SIZE);
PyStatementWithElse statementWithElse = PsiTreeUtil.getParentOfType(myStatementToAddLinebreak, PyStatementWithElse.class);