PY-19674 Treat all relative (with dots) "from" imports as application local imports

python/src/com/jetbrains/python/codeInsight/imports/AddImportHelper.java

@@ -225,6 +225,9 @@ public class AddImportHelper {
       if (fromImportStatement.isFromFuture()) {
         return ImportPriority.FUTURE;
       }
+      if (fromImportStatement.getRelativeLevel() > 0) {
+        return ImportPriority.PROJECT;
+      }
       resolved = fromImportStatement.resolveImportSource();
     }
     else {

python/testData/optimizeImports/alphabeticalOrder.after.py

@@ -16,6 +16,7 @@ from alphabet import B, A
 from alphabet import C
 from alphabet import D
 from b import func
+
 from . import m1
 from . import m4, m5
 from .pkg import m3

python/testData/optimizeImports/disableAlphabeticalOrder.after.py

@@ -12,12 +12,13 @@ from alphabet import D
 from b import func
 from
 import foo # broken
-from . import m1
 import # broken
 from alphabet import *
-from .. import m2
 from alphabet import C
 from alphabet import B, A
+
+from . import m1
+from .. import m2
 from .pkg import m3
 from . import m4, m5
 

python/testData/optimizeImports/unresolvedRelativeImportsShouldBeInProjectGroup/pkg/main.after.py

@@ -0,0 +1,6 @@
+import re
+
+from . import foo
+from .module import A
+
+print(re, foo, A)

python/testData/optimizeImports/unresolvedRelativeImportsShouldBeInProjectGroup/pkg/main.py

@@ -0,0 +1,5 @@
+import re
+from . import foo
+from .module import A
+
+print(re, foo, A)

python/testSrc/com/jetbrains/python/PyOptimizeImportsTest.java

@@ -182,6 +182,15 @@ public class PyOptimizeImportsTest extends PyTestCase {
     doTest();
   }
 
+  // PY-19674
+  public void testUnresolvedRelativeImportsShouldBeInProjectGroup() {
+    final String testName = getTestName(true);
+    myFixture.copyDirectoryToProject(testName, "");
+    myFixture.configureByFile("pkg/main.py");
+    OptimizeImportsAction.actionPerformedImpl(DataManager.getInstance().getDataContext(myFixture.getEditor().getContentComponent()));
+    myFixture.checkResultByFile(testName + "/pkg/main.after.py");
+  }
+
   private void doTest() {
     myFixture.configureByFile(getTestName(true) + ".py");
     OptimizeImportsAction.actionPerformedImpl(DataManager.getInstance().getDataContext(myFixture.getEditor().getContentComponent()));