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

PY-22422 PyPreFormatProcessor doesn't need to unblock/commit document, it operates on PSI

Browse Source
This commit is contained in:
Mikhail Golubev
2017-03-06 17:15:58 +03:00
parent 496fe62d7a
commit ddc66d519c
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/formatter/PyFromImportPostFormatProcessor.java
+5 -2
View File
@@ -155,9 +155,12 @@ public class PyFromImportPostFormatProcessor implements PostFormatProcessor {
return newFromImport;
}
else {
final int oldLength = fromImport.getTextLength();
// Add only trailing comma
final PsiElement comma = fromImport.addAfter(generator.createComma().getPsi(), allNames[allNames.length - 1]);
codeStyleManager.reformat(comma);
fromImport.addAfter(generator.createComma().getPsi(), allNames[allNames.length - 1]);
// Adjust spaces around the comma if necessary
codeStyleManager.reformat(fromImport, true);
myHelper.updateResultRange(oldLength, fromImport.getTextLength());
return fromImport;
}
}
python/src/com/jetbrains/python/formatter/PyPreFormatProcessor.java
+4 -10
View File
@@ -82,16 +82,10 @@ public class PyPreFormatProcessor implements PreFormatProcessor {
final PsiDocumentManager manager = PsiDocumentManager.getInstance(myProject);
final Document document = manager.getDocument(element.getContainingFile());
if (document != null) {
manager.doPostponedOperationsAndUnblockDocument(document);
try {
// collect all comments
element.accept(this);
for (Couple<PsiComment> pair : myCommentReplacements) {
pair.getFirst().replace(pair.getSecond());
}
}
finally {
manager.commitDocument(document);
// collect all comments
element.accept(this);
for (Couple<PsiComment> pair : myCommentReplacements) {
pair.getFirst().replace(pair.getSecond());
}
}
return TextRange.create(range.getStartOffset(), range.getEndOffset() + myDelta);