wip

Author: fabioz

plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/revisited/modules/SourceModule.java

@@ -66,6 +66,7 @@
 import org.python.pydev.parser.jython.ast.Module;
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.parser.jython.ast.Str;
+import org.python.pydev.parser.jython.ast.TypeAlias;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.parser.visitors.NodeUtils;
 import org.python.pydev.parser.visitors.TypeInfo;
@@ -1010,6 +1011,17 @@ private Definition[] findDefinition(ICompletionState state, int line, int col, f
                         toRet.add(new Definition(tok, scopeVisitor.scope, this, true));
                         continue;
                     }
+
+                    if (sourceToken.getFoundInTypeAlias() != null) {
+                        TypeAlias node = sourceToken.getFoundInTypeAlias();
+                        String target = tok.getRepresentation();
+                        toRet.add(
+                                FindDefinitionModelVisitor.getAssignDefinition(node, target, 0, line, col,
+                                        scopeVisitor.scope, this,
+                                        -1));
+                        continue;
+                    }
+
                     if (sourceTokenAst instanceof Assign) {
                         Assign node = (Assign) sourceTokenAst;
                         String target = tok.getRepresentation();

plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/revisited/modules/SourceToken.java

@@ -33,6 +33,7 @@
 import org.python.pydev.parser.jython.ast.ImportFrom;
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.parser.jython.ast.NameTok;
+import org.python.pydev.parser.jython.ast.TypeAlias;
 import org.python.pydev.parser.jython.ast.keywordType;
 import org.python.pydev.parser.visitors.NodeUtils;
 import org.python.pydev.shared_core.callbacks.ICallback;
@@ -364,6 +365,8 @@ public FunctionDef getAliased() {
 
     private Call foundInCall;
 
+    private TypeAlias foundInTypeAlias;
+
     public void setDefinition(Definition d) {
         this.definition = d;
     }
@@ -396,4 +399,12 @@ public Assign getDummyAssignFromParam() {
         return dummyAssignFromParam;
     }
 
+    public void setFoundInTypeAlias(TypeAlias node) {
+        this.foundInTypeAlias = node;
+    }
+
+    public TypeAlias getFoundInTypeAlias() {
+        return foundInTypeAlias;
+    }
+
 }

plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/revisited/visitors/FindDefinitionModelVisitor.java

@@ -39,6 +39,7 @@
 import org.python.pydev.parser.jython.ast.NamedExpr;
 import org.python.pydev.parser.jython.ast.Subscript;
 import org.python.pydev.parser.jython.ast.Tuple;
+import org.python.pydev.parser.jython.ast.TypeAlias;
 import org.python.pydev.parser.jython.ast.aliasType;
 import org.python.pydev.parser.jython.ast.comprehensionType;
 import org.python.pydev.parser.jython.ast.exprType;
@@ -549,6 +550,22 @@ public static AssignDefinition getAssignDefinition(Assign node, String target, i
                 unpackPos);
     }
 
+    public static AssignDefinition getAssignDefinition(TypeAlias node, String target, int targetPos, int line, int col,
+            ILocalScope scope, IModule module, int unpackPos) {
+        exprType nodeValue = node.value;
+        exprType nodeType = NodeUtils.extractOptionalValueSubscript(node.type);
+        String value = NodeUtils.getFullRepresentationString(nodeValue);
+        String type = NodeUtils.getFullRepresentationString(nodeType);
+        if (value == null) {
+            value = "";
+        }
+        if (type == null) {
+            type = "";
+        }
+        return new AssignDefinition(value, type, target, targetPos, node, line, col, scope, module, nodeValue, nodeType,
+                unpackPos);
+    }
+
     public static int findUnpackPos(Assign foundInAssign, String representation) {
         if (foundInAssign.targets != null) {
             if (foundInAssign.targets.length > 0) {

plugins/org.python.pydev.ast/src/org/python/pydev/ast/codecompletion/revisited/visitors/GlobalModelVisitor.java

@@ -30,6 +30,7 @@
 import org.python.pydev.parser.jython.ast.Name;
 import org.python.pydev.parser.jython.ast.Str;
 import org.python.pydev.parser.jython.ast.Tuple;
+import org.python.pydev.parser.jython.ast.TypeAlias;
 import org.python.pydev.parser.jython.ast.exprType;
 import org.python.pydev.parser.visitors.NodeUtils;
 import org.python.pydev.shared_core.structure.FastStack;
@@ -145,6 +146,13 @@ public Object visitCall(Call node) throws Exception {
         return null;
     }
 
+    @Override
+    public Object visitTypeAlias(TypeAlias node) throws Exception {
+        SourceToken token = addToken(node.name);
+        token.setFoundInTypeAlias(node);
+        return null;
+    }
+
     /**
      * Visiting some name
      *

plugins/org.python.pydev/tests/pysrc/extendable/typecheck/__init__.py

@@ -0,0 +1,5 @@
+class FooClass:
+    def foo_method(self):
+        pass
+ 
+type FooType = FooClass

plugins/org.python.pydev/tests/pysrc/extendable/typecheck/typemod.py

@@ -96,4 +96,11 @@ class C:
         assertEquals(29, messages[0].getStartCol(doc));
     }
 
+    public void testImportTypeAlias() {
+        doc = new Document("from extendable.typecheck.typemod import FooType\n" +
+                "print(FooType)\n");
+
+        checkNoError();
+    }
+
 }