From 85aa8c42ba57d4c3731a4b4d4d61a823d347b7ed Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Tue, 17 May 2011 18:37:17 +0200
Subject: [PATCH] fixed calculation of relative level in incomplete from ...
 import statements (PY-3409)

---
 .../psi/impl/PyFromImportStatementImpl.java      | 16 ++++++++--------
 .../completion/pep328/package/__init__.py        |  0
 .../pep328/package/subpackage1/__init__.py       |  0
 .../pep328/package/subpackage1/moduleX.after.py  |  1 +
 .../pep328/package/subpackage1/moduleX.py        |  1 +
 .../pep328/package/subpackage2/__init__.py       |  0
 .../pep328/package/subpackage2/moduleZ.py        |  0
 .../jetbrains/python/PythonCompletionTest.java   |  7 +++++++
 8 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 python/testData/completion/pep328/package/__init__.py
 create mode 100644 python/testData/completion/pep328/package/subpackage1/__init__.py
 create mode 100644 python/testData/completion/pep328/package/subpackage1/moduleX.after.py
 create mode 100644 python/testData/completion/pep328/package/subpackage1/moduleX.py
 create mode 100644 python/testData/completion/pep328/package/subpackage2/__init__.py
 create mode 100644 python/testData/completion/pep328/package/subpackage2/moduleZ.py

diff --git a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
index 0c6fc66c907b..4b7d15e5263d 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyFromImportStatementImpl.java
@@ -97,15 +97,15 @@ public class PyFromImportStatementImpl extends PyBaseElementImpl<PyFromImportSta
     if (stub != null) {
       return stub.getRelativeLevel();
     }
-    // crude but OK for reasonable cases, and in unreasonably complex error cases this number is moot anyway. 
+
     int result = 0;
-    PsiElement import_kwd = findChildByType(PyTokenTypes.IMPORT_KEYWORD);
-    if (import_kwd != null) {
-      ASTNode seeker = import_kwd.getNode();
-      while (seeker != null) {
-        if (seeker.getElementType() == PyTokenTypes.DOT) result += 1;
-        seeker = seeker.getTreePrev();
-      }
+    ASTNode seeker = getNode().getFirstChildNode();
+    while(seeker != null && (seeker.getElementType() == PyTokenTypes.FROM_KEYWORD || seeker.getElementType() == TokenType.WHITE_SPACE)) {
+      seeker = seeker.getTreeNext();
+    }
+    while (seeker != null && seeker.getElementType() == PyTokenTypes.DOT) {
+      result++;
+      seeker = seeker.getTreeNext();
     }
     return result;
   }
diff --git a/python/testData/completion/pep328/package/__init__.py b/python/testData/completion/pep328/package/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/completion/pep328/package/subpackage1/__init__.py b/python/testData/completion/pep328/package/subpackage1/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/completion/pep328/package/subpackage1/moduleX.after.py b/python/testData/completion/pep328/package/subpackage1/moduleX.after.py
new file mode 100644
index 000000000000..3f0d87a3ac7c
--- /dev/null
+++ b/python/testData/completion/pep328/package/subpackage1/moduleX.after.py
@@ -0,0 +1 @@
+from ..subpackage2.moduleZ import <caret>
\ No newline at end of file
diff --git a/python/testData/completion/pep328/package/subpackage1/moduleX.py b/python/testData/completion/pep328/package/subpackage1/moduleX.py
new file mode 100644
index 000000000000..1e9f9b6be9d2
--- /dev/null
+++ b/python/testData/completion/pep328/package/subpackage1/moduleX.py
@@ -0,0 +1 @@
+from ..subpackage2.mo<caret>
\ No newline at end of file
diff --git a/python/testData/completion/pep328/package/subpackage2/__init__.py b/python/testData/completion/pep328/package/subpackage2/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testData/completion/pep328/package/subpackage2/moduleZ.py b/python/testData/completion/pep328/package/subpackage2/moduleZ.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
index 5401090efda1..afe6abd1459b 100644
--- a/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
+++ b/python/testSrc/com/jetbrains/python/PythonCompletionTest.java
@@ -352,4 +352,11 @@ public class PythonCompletionTest extends PyLightFixtureTestCase {
   public void testNoneInArgList() {  // PY-3464
     doTest3K();
   }
+
+  public void testPep328Completion() {  // PY-3409
+    myFixture.copyDirectoryToProject("completion/pep328", "pep328");
+    myFixture.configureByFile("pep328/package/subpackage1/moduleX.py");
+    myFixture.completeBasic();
+    myFixture.checkResultByFile("completion/pep328/package/subpackage1/moduleX.after.py");
+  }
 }