Improve handling of circular and imported class bases #1497

MikhailArkhipov · 2019-08-30T21:07:12Z

Since we don't handle reassignments, improve handling of imported bases like

from Base import A, B

class A(A, B):
    def methodA(self, x):
        return x

class C(B): ...

class B(A):
    def methodB(self, x):
        return x

by declaring imported variables in regular collection as well as in special imported collection so they can be found when we need to resolve class base.

Decide on declaration or import depending on location
Implement deep filtering of circular base chains
Tests

src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Scopes.cs

src/Analysis/Ast/Impl/Types/PythonClassType.cs

src/Analysis/Ast/Impl/Types/PythonClassType.Generics.cs

src/Analysis/Ast/Impl/Types/PythonClassType.cs

src/Analysis/Ast/Impl/Extensions/EvaluatorExtensions.cs

src/Analysis/Ast/Impl/Types/PythonClassType.Generics.cs

src/Analysis/Ast/Impl/Types/PythonClassType.cs

src/Analysis/Ast/Impl/Types/PythonClassType.Generics.cs

CTrando

if all the tests pass then looks fine, tests should handle majority of cases. Make sure to start VS Code as well just in case the multithreading issues come back

CTrando · 2019-09-02T07:29:05Z

src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Scopes.cs

@@ -47,14 +47,23 @@ public void DeclareVariable(string name, IMember value, VariableSource source, N
            => DeclareVariable(name, value, source, GetLocationOfName(location), overwrite);

        public void DeclareVariable(string name, IMember value, VariableSource source, Location location, bool overwrite = true) {
+            if (source == VariableSource.Import) {
+                // Duplicate declaration so if variable gets overwritten it can still be retrieved. Consider:
+                //    from X import A


Maybe update the comment now that it loses its old context:
Store declaration source so in case if variable gets overwritten...

CTrando · 2019-09-02T07:30:39Z

src/Analysis/Ast/Impl/Types/PythonClassType.Generics.cs

@@ -60,23 +61,19 @@ internal partial class PythonClassType {
        /// </summary>
        public IPythonType CreateSpecificType(IArgumentSet args) {
            lock (_genericParameterLock) {
-                var genericTypeParameters = GetTypeParameters();
+                var newGenericTypeParameters = GetTypeParameters();


newGenericTypeParameters is not entirely accurate because GetTypeParameters just gets the parameters that need to be filled in for this class

jakebailey

LGTM, passes and VS Code works on my test projects, Cameron's command/variable naming feedback notwithstanding.

* Add test for GPy (fails) * Disambiguate bases * Handle base loops better * GPy test (on ignore) * PT feedback + test * PR feedback * Pass template class * Add declaration position extension * Pass template class * Change eval to scope * Add test for scoped import * Adjust comparison

MikhailArkhipov added 5 commits August 29, 2019 17:03

Add test for GPy (fails)

38ca65b

Disambiguate bases

bef7e5d

Handle base loops better

3e8f788

Merge master

b390c13

GPy test (on ignore)

41344cc

CTrando reviewed Aug 30, 2019

View reviewed changes

PT feedback + test

44cc5eb