From 8a7504345801cbd4c043cf74edfa0e7b2f69921e Mon Sep 17 00:00:00 2001
From: Mikhail Golubev <mikhail.golubev@jetbrains.com>
Date: Thu, 13 Nov 2014 17:29:08 +0300
Subject: [PATCH] Improve javadoc for PointInImport and clean up a bit in
 ResolveImportUtil

---
 .../com/jetbrains/python/psi/resolve/PointInImport.java  | 6 ++++--
 .../jetbrains/python/psi/resolve/ResolveImportUtil.java  | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java b/python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
index bdddb3cf129a..d89f1cba7024 100644
--- a/python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
+++ b/python/psi-api/src/com/jetbrains/python/psi/resolve/PointInImport.java
@@ -22,12 +22,14 @@ public enum PointInImport {
   NONE,
 
   /**
-   * The reference is inside import and refers to a module
+   * The reference is inside import and it's either source qualifier in {@code from REFERENCE import ...}
+   * or imported name itself in {@code import REFERENCE}.
    */
   AS_MODULE,
 
   /**
-   * The reference is inside import and refers to a name imported from a module
+   * The reference is inside import and refers to a name imported from a module, i.e. it's concrete imported name in
+   * import statement of form {@code from somewhere import REFERENCE}, not the optional alias part.
    */
   AS_NAME
 }
diff --git a/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java b/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
index e2ea4a797317..4c6535cacd5a 100644
--- a/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
+++ b/python/src/com/jetbrains/python/psi/resolve/ResolveImportUtil.java
@@ -392,17 +392,16 @@ public class ResolveImportUtil {
   /**
    * @param element what we test (identifier, reference, import element, etc)
    * @return the how the element relates to an enclosing import statement, if any
+   * @see com.jetbrains.python.psi.resolve.PointInImport
    */
+  @NotNull
   public static PointInImport getPointInImport(@NotNull PsiElement element) {
-    PsiElement parent = PsiTreeUtil.getNonStrictParentOfType(
-      element,
-      PyImportElement.class, PyFromImportStatement.class
-    );
+    final PsiElement parent = PsiTreeUtil.getNonStrictParentOfType(element, PyImportElement.class, PyFromImportStatement.class);
     if (parent instanceof PyFromImportStatement) {
       return PointInImport.AS_MODULE; // from foo ...
     }
     if (parent instanceof PyImportElement) {
-      PsiElement statement = parent.getParent();
+      final PsiElement statement = parent.getParent();
       if (statement instanceof PyImportStatement) {
         return PointInImport.AS_MODULE; // import foo,...
       }