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-17593 Remove IMPORT_GROUP_BEGIN marker from import statements after reformat

Browse Source 
so user could adjust spacing manually and keep it next time
formatting is called.
This commit is contained in:
Mikhail Golubev
2015-11-16 14:32:04 +03:00
parent 3ce58db658
commit 4128424a5f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/formatter/PyBlock.java
+9 -2
View File
@@ -720,10 +720,17 @@ public class PyBlock implements ASTBlock {
if (psi1 instanceof PyImportStatementBase) {
if (psi2 instanceof PyImportStatementBase) {
if (psi2.getCopyableUserData(IMPORT_GROUP_BEGIN) != null) {
final Boolean leftImportIsGroupStart = psi1.getCopyableUserData(IMPORT_GROUP_BEGIN);
final Boolean rightImportIsGroupStart = psi2.getCopyableUserData(IMPORT_GROUP_BEGIN);
// Cleanup user data, it's no longer needed
psi1.putCopyableUserData(IMPORT_GROUP_BEGIN, null);
// Don't remove IMPORT_GROUP_BEGIN from the element psi2 yet, because spacing is constructed pairwise:
// it might be needed on the next iteration.
//psi2.putCopyableUserData(IMPORT_GROUP_BEGIN, null);
if (rightImportIsGroupStart != null) {
return Spacing.createSpacing(0, 0, 2, true, 1);
}
else if (psi1.getCopyableUserData(IMPORT_GROUP_BEGIN) != null) {
else if (leftImportIsGroupStart != null) {
// It's a trick to keep spacing consistent when new import statement is inserted
// at the beginning of an import group, i.e. if there is a blank line before the next
// import we want to save it, but remove line *after* inserted import.