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

Revert previous fix in custom folding descriptor: copy indentation again

Browse Source 
Python formatter does not correctly align closing comment after
first method in class if opening comment was aligned on first column.
The problem is that left margin of block that corresponds to
statement list is determined by its first child. If this child
is incorrectly indented line comment, all later comments will be
aligned wrongly as well, because their blocks have 'none' indent in
parent.
This commit is contained in:
Mikhail Golubev
2014-11-07 14:39:32 +03:00
parent 483d9346a5
commit 8dd5ec461d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/lang/folding/CustomFoldingSurroundDescriptor.java
+5 -4
View File
@@ -260,6 +260,8 @@ public class CustomFoldingSurroundDescriptor implements SurroundDescriptor {
int prefixLength = linePrefix.length();
int startOffset = firstElement.getTextRange().getStartOffset();
final Document document = editor.getDocument();
final int startLineNumber = document.getLineNumber(startOffset);
final String startIndent = document.getText(new TextRange(document.getLineStartOffset(startLineNumber), startOffset));
int endOffset = lastElement.getTextRange().getEndOffset();
int delta = 0;
TextRange rangeToSelect = new TextRange(startOffset, startOffset);
@@ -269,12 +271,11 @@ public class CustomFoldingSurroundDescriptor implements SurroundDescriptor {
startText = startText.replace("?", DEFAULT_DESC_TEXT);
rangeToSelect = new TextRange(startOffset + descPos, startOffset + descPos + DEFAULT_DESC_TEXT.length());
}
String startString = linePrefix + startText + "\n";
String startString = linePrefix + startText + "\n" + startIndent;
String endString = "\n" + linePrefix + myProvider.getEndString();
document.insertString(endOffset, endString);
delta += endString.length();
final int startCommentInsertionOffset = document.getLineStartOffset(document.getLineNumber(startOffset));
document.insertString(startCommentInsertionOffset, startString);
document.insertString(startOffset, startString);
delta += startString.length();
rangeToSelect = rangeToSelect.shiftRight(prefixLength);
PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project);
@@ -282,7 +283,7 @@ public class CustomFoldingSurroundDescriptor implements SurroundDescriptor {
adjustLineIndent(project, psiFile, language,
new TextRange(endOffset + delta - endString.length(), endOffset + delta));
adjustLineIndent(project, psiFile, language,
new TextRange(startCommentInsertionOffset, startCommentInsertionOffset + startString.length()));
new TextRange(startOffset, startOffset + startString.length()));
return rangeToSelect;
}