regression with moving future import to the top, test for extended completion (PY-23475)

GitOrigin-RevId: 218984c89d2229b6a32947650f46df4f1c3aecef

python/python-psi-impl/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java

@@ -217,6 +217,10 @@ public class AddImportHelper {
         seeker = feeler;
       }
       else if (isAssignmentToModuleLevelDunderName(feeler)) {
+        if (priority == ImportPriority.FUTURE) {
+          seeker = feeler;
+          break;
+        }
         feeler = feeler.getNextSibling();
         seeker = feeler;
         skippedOverStatements = true;

python/testData/completion/className/importAddedAfterModuleLevelDunder/importAddedAfterModuleLevelDunder.after.py

@@ -0,0 +1,7 @@
+"""Module docstring"""
+
+__author__ = "aknizev"
+
+from src import foo
+
+foo()

python/testData/completion/className/importAddedAfterModuleLevelDunder/importAddedAfterModuleLevelDunder.py

@@ -0,0 +1,6 @@
+"""Module docstring"""
+
+__author__ = "aknizev"
+
+
+foo<caret>

python/testData/completion/className/importAddedAfterModuleLevelDunder/src.py

@@ -0,0 +1,2 @@
+def foo():
+    pass

python/testData/inspections/MoveFromFutureImportAboveModuleLevelDunder.py

@@ -0,0 +1,6 @@
+"""Module docstring"""
+
+__author__ = "akniazev"
+
+<warning descr="from __future__ imports must occur at the beginning of the file"><caret>from __future__ import absolute_import</warning>
+import collections

python/testData/inspections/MoveFromFutureImportAboveModuleLevelDunder_after.py

@@ -0,0 +1,7 @@
+"""Module docstring"""
+
+from __future__ import absolute_import
+
+__author__ = "akniazev"
+
+import collections

python/testSrc/com/jetbrains/python/PyClassNameCompletionTest.java

@@ -96,6 +96,11 @@ public class PyClassNameCompletionTest extends PyTestCase {
     doTest();
   }
 
+  // PY-23475
+  public void testImportAddedAfterModuleLevelDunder() {
+    doTest();
+  }
+
   // PY-20976
   public void testOrderingLexicographicalBaseline() {
     doTestCompletionOrder("a.foo", "b.foo");

python/testSrc/com/jetbrains/python/PyQuickFixTest.java

@@ -186,6 +186,11 @@ public class PyQuickFixTest extends PyTestCase {
     doInspectionTest(PyFromFutureImportInspection.class, PyBundle.message("QFIX.move.from.future.import"), true, true);
   }
 
+  // PY-23475
+  public void testMoveFromFutureImportAboveModuleLevelDunder() {
+    doInspectionTest(PyFromFutureImportInspection.class, PyBundle.message("QFIX.move.from.future.import"), true, true);
+  }
+
   public void testComparisonWithNone() {
     doInspectionTest(PyComparisonWithNoneInspection.class, PyBundle.message("QFIX.replace.equality"), true, true);
   }