jakebailey
diff --git a/‎.gitattributes‎
Lines changed: 1 addition & 0 deletions b/‎.gitattributes‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎build/Common.Build.Core.settings‎
Lines changed: 2 additions & 2 deletions b/‎build/Common.Build.Core.settings‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Definitions/IAnalyzable.cs‎
Lines changed: 7 additions & 0 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Definitions/IAnalyzable.cs‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Callables.cs‎
Lines changed: 0 additions & 1 deletion b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Callables.cs‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Collections.cs‎
Lines changed: 7 additions & 7 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Collections.cs‎
Lines changed: 7 additions & 7 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Constants.cs‎
Lines changed: 1 addition & 1 deletion b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Constants.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Generics.cs‎
Lines changed: 15 additions & 19 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Generics.cs‎
Lines changed: 15 additions & 19 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Operators.cs‎
Lines changed: 2 additions & 2 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.Operators.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.cs‎
Lines changed: 18 additions & 14 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Evaluation/ExpressionEval.cs‎
Lines changed: 18 additions & 14 deletions
diff --git a/‎src/Analysis/Ast/Impl/Analyzer/Handlers/AssignmentHandler.cs‎
Lines changed: 3 additions & 3 deletions b/‎src/Analysis/Ast/Impl/Analyzer/Handlers/AssignmentHandler.cs‎
Lines changed: 3 additions & 3 deletions
@@ -0,0 +1 @@
+*.json -diff
@@ -9,8 +9,8 @@
   </PropertyGroup>
 
   <!-- This file is shared across desktop .NET and .NET Core builds. 
-        Please do not put Windows-specific or dekstop-specific settings
-        here (these incluse C#, C++ or VSSDK settings and targets -->
+        Please do not put Windows-specific or desktop-specific settings
+        here (these include C#, C++ or VS SDK settings and targets -->
   <PropertyGroup>
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
 
@@ -13,11 +13,18 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
+using Microsoft.Python.Analysis.Dependencies;
+
 namespace Microsoft.Python.Analysis.Analyzer {
     /// <summary>
     /// Represents document that can be analyzed asynchronously.
     /// </summary>
     internal interface IAnalyzable {
+        /// <summary>
+        /// Returns object that can calculate dependencies of this entry.
+        /// </summary>
+        IDependencyProvider DependencyProvider { get; }
+
         /// <summary>
         /// Notifies document that analysis is about to begin.
         /// </summary>
 
@@ -17,7 +17,6 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Python.Analysis.Documents;
-using Microsoft.Python.Analysis.Extensions;
 using Microsoft.Python.Analysis.Modules;
 using Microsoft.Python.Analysis.Types;
 using Microsoft.Python.Analysis.Values;
 
@@ -62,7 +62,7 @@ public IMember GetValueFromList(ListExpression expression) {
                 var value = GetValueFromExpression(item) ?? UnknownType;
                 contents.Add(value);
             }
-            return PythonCollectionType.CreateList(Module.Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);
+            return PythonCollectionType.CreateList(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);
         }
 
         public IMember GetValueFromDictionary(DictionaryExpression expression) {
@@ -72,7 +72,7 @@ public IMember GetValueFromDictionary(DictionaryExpression expression) {
                 var value = GetValueFromExpression(item.SliceStop) ?? UnknownType;
                 contents[key] = value;
             }
-            return new PythonDictionary(Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);
+            return new PythonDictionary(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);
         }
 
         private IMember GetValueFromTuple(TupleExpression expression) {
@@ -81,7 +81,7 @@ private IMember GetValueFromTuple(TupleExpression expression) {
                 var value = GetValueFromExpression(item) ?? UnknownType;
                 contents.Add(value);
             }
-            return PythonCollectionType.CreateTuple(Module.Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);
+            return PythonCollectionType.CreateTuple(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);
         }
 
         public IMember GetValueFromSet(SetExpression expression) {
@@ -90,7 +90,7 @@ public IMember GetValueFromSet(SetExpression expression) {
                 var value = GetValueFromExpression(item) ?? UnknownType;
                 contents.Add(value);
             }
-            return PythonCollectionType.CreateSet(Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);
+            return PythonCollectionType.CreateSet(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);
         }
 
         public IMember GetValueFromGenerator(GeneratorExpression expression) {
@@ -110,14 +110,14 @@ public IMember GetValueFromComprehension(Comprehension node) {
                 switch (node) {
                     case ListComprehension lc:
                         var v1 = GetValueFromExpression(lc.Item) ?? UnknownType;
-                        return PythonCollectionType.CreateList(Interpreter, new[] { v1 });
+                        return PythonCollectionType.CreateList(Module, new[] { v1 });
                     case SetComprehension sc:
                         var v2 = GetValueFromExpression(sc.Item) ?? UnknownType;
-                        return PythonCollectionType.CreateSet(Interpreter, new[] { v2 });
+                        return PythonCollectionType.CreateSet(Module, new[] { v2 });
                     case DictionaryComprehension dc:
                         var k = GetValueFromExpression(dc.Key) ?? UnknownType;
                         var v = GetValueFromExpression(dc.Value) ?? UnknownType;
-                        return new PythonDictionary(new PythonDictionaryType(Interpreter), new Dictionary<IMember, IMember> { { k, v } });
+                        return new PythonDictionary(new PythonDictionaryType(Interpreter.ModuleResolution.BuiltinsModule), new Dictionary<IMember, IMember> { { k, v } });
                 }
 
                 return UnknownType;
 
@@ -23,7 +23,7 @@
 
 namespace Microsoft.Python.Analysis.Analyzer.Evaluation {
     internal sealed partial class ExpressionEval {
-        public IPythonInstance GetConstantFromLiteral(Expression expr, LookupOptions options) {
+        public IPythonInstance GetConstantFromLiteral(Expression expr) {
             if (expr is ConstantExpression ce) {
                 switch (ce.Value) {
                     case string s:
 
@@ -62,11 +62,12 @@ private IMember GetValueFromGeneric(IMember target, Expression expr) {
         }
 
         /// <summary>
-        /// Returns whether the arguments to Generic are valid
+        /// Determines if arguments to Generic are valid
         /// </summary>
+        // TODO: move check to GenericClassBase. This requires extensive changes to SpecificTypeConstructor.
         private bool GenericClassParameterValid(IReadOnlyList<IGenericTypeParameter> genericTypeArgs, IReadOnlyList<IMember> args, Expression expr) {
-            // All arguments to Generic must be type parameters
-            // e.g. Generic[T, str] throws a runtime error
+            // All arguments to Generic must be type parameters	
+            // e.g. Generic[T, str] throws a runtime error	
             if (genericTypeArgs.Count != args.Count) {
                 ReportDiagnostics(Module.Uri, new DiagnosticsEntry(
                     Resources.GenericNotAllTypeParameters,
@@ -77,14 +78,14 @@ private bool GenericClassParameterValid(IReadOnlyList<IGenericTypeParameter> gen
                 return false;
             }
 
-            // All arguments to Generic must be distinct
+            // All arguments to Generic must be distinct	
             if (genericTypeArgs.Distinct().Count() != genericTypeArgs.Count) {
                 ReportDiagnostics(Module.Uri, new DiagnosticsEntry(
-                   Resources.GenericNotAllUnique,
-                   GetLocation(expr).Span,
-                   ErrorCodes.TypingGenericArguments,
-                   Severity.Warning,
-                   DiagnosticSource.Analysis));
+                    Resources.GenericNotAllUnique,
+                    GetLocation(expr).Span,
+                    ErrorCodes.TypingGenericArguments,
+                    Severity.Warning,
+                    DiagnosticSource.Analysis));
                 return false;
             }
 
@@ -97,24 +98,19 @@ private bool GenericClassParameterValid(IReadOnlyList<IGenericTypeParameter> gen
         /// (if the former) on specific type (if the latter).
         /// </summary>
         private IMember CreateSpecificTypeFromIndex(IGenericType gt, IReadOnlyList<IMember> args, Expression expr) {
+            // TODO: move check to GenericClassBase. This requires extensive changes to SpecificTypeConstructor.
             if (gt.Name.EqualsOrdinal("Generic")) {
                 var genericTypeArgs = args.OfType<IGenericTypeParameter>().ToArray();
                 if (!GenericClassParameterValid(genericTypeArgs, args, expr)) {
                     return UnknownType;
                 }
-
-                // Generic[T1, T2, ...] expression. Create generic base for the class.
-                return new GenericClassParameter(genericTypeArgs, Module);
-            }
-
-            // For other types just use supplied arguments
-            if (args.Count > 0) {
-                return gt.CreateSpecificType(new ArgumentSet(args, expr, this));
+                // Generic[T1, T2, ...] expression. Create generic base for the class.	
+                return new GenericClassBase(genericTypeArgs, Module.Interpreter);
             }
 
-            return UnknownType;
+            // For other types just use supplied arguments	
+            return args.Count > 0 ? gt.CreateSpecificType(new ArgumentSet(args, expr, this)) : UnknownType;
         }
-
         private IReadOnlyList<IMember> EvaluateIndex(IndexExpression expr) {
             var indices = new List<IMember>();
             if (expr.Index is TupleExpression tex) {
 
@@ -105,9 +105,9 @@ private IMember GetValueFromBinaryOp(Expression expr) {
 
                 switch (leftTypeId) {
                     case BuiltinTypeId.List:
-                        return PythonCollectionType.CreateConcatenatedList(Module.Interpreter, lc, rc);
+                        return PythonCollectionType.CreateConcatenatedList(Module, lc, rc);
                     case BuiltinTypeId.Tuple:
-                        return PythonCollectionType.CreateConcatenatedTuple(Module.Interpreter, lc, rc);
+                        return PythonCollectionType.CreateConcatenatedTuple(Module, lc, rc);
                 }
             }
 
 
@@ -55,6 +55,7 @@ public ExpressionEval(IServiceContainer services, IPythonModule module, PythonAs
         public ModuleSymbolTable SymbolTable { get; } = new ModuleSymbolTable();
         public IPythonType UnknownType => Interpreter.UnknownType;
         public Location DefaultLocation { get; }
+        public IPythonModule BuiltinsModule => Interpreter.ModuleResolution.BuiltinsModule;
 
         public LocationInfo GetLocationInfo(Node node) => node?.GetLocation(this) ?? LocationInfo.Empty;
 
@@ -188,7 +189,7 @@ public IMember GetValueFromExpression(Expression expr, LookupOptions options = L
                     m = null;
                     break;
                 default:
-                    m = GetValueFromBinaryOp(expr) ?? GetConstantFromLiteral(expr, options);
+                    m = GetValueFromBinaryOp(expr) ?? GetConstantFromLiteral(expr);
                     break;
             }
             if (m == null) {
@@ -236,29 +237,32 @@ private IMember GetValueFromMember(MemberExpression expr) {
                 return null;
             }
 
-            IPythonInstance instance = null;
             var m = GetValueFromExpression(expr.Target);
-            if (m is IPythonType typeInfo) {
-                var member = typeInfo.GetMember(expr.Name);
-                // If container is class/type info rather than the instance, then the method is an unbound function.
-                // Example: C.f where f is a method of C. Compare to C().f where f is bound to the instance of C.
-                if (member is PythonFunctionType f && !f.IsStatic && !f.IsClassMethod) {
-                    f.AddReference(GetLocationOfName(expr));
-                    return f.ToUnbound();
-                }
-                instance = new PythonInstance(typeInfo);
+            if (m == null) {
+                return UnknownType;
             }
 
-            instance = instance ?? m as IPythonInstance;
-            var type = m?.GetPythonType(); // Try inner type
-
+            var type = m.GetPythonType();
             var value = type?.GetMember(expr.Name);
             type?.AddMemberReference(expr.Name, this, GetLocationOfName(expr));
 
             if (type is IPythonModule) {
                 return value;
             }
 
+            IPythonInstance instance = null;
+            if (m == type) {
+                // If container is class/type info rather than the instance, then the method is an unbound function.
+                // Example: C.f where f is a method of C. Compare to C().f where f is bound to the instance of C.
+                if (value is PythonFunctionType f && f.DeclaringType != null && !f.IsStatic && !f.IsClassMethod) {
+                    f.AddReference(GetLocationOfName(expr));
+                    return f.ToUnbound();
+                }
+                instance = new PythonInstance(type);
+            }
+
+            instance = instance ?? m as IPythonInstance;
+
             // Class type GetMember returns a type. However, class members are
             // mostly instances (consider self.x = 1, x is an instance of int).
             // However, it is indeed possible to have them as types, like in
 
@@ -58,14 +58,14 @@ public void HandleAssignment(AssignmentStatement node) {
             }
 
             foreach (var ne in node.Left.OfType<NameExpression>()) {
+                IScope scope;
                 if (Eval.CurrentScope.NonLocals[ne.Name] != null) {
-                    Eval.LookupNameInScopes(ne.Name, out var scope, LookupOptions.Nonlocal);
+                    Eval.LookupNameInScopes(ne.Name, out scope, LookupOptions.Nonlocal);
                     scope?.Variables[ne.Name].Assign(value, Eval.GetLocationOfName(ne));
                     continue;
                 }
-
                 if (Eval.CurrentScope.Globals[ne.Name] != null) {
-                    Eval.LookupNameInScopes(ne.Name, out var scope, LookupOptions.Global);
+                    Eval.LookupNameInScopes(ne.Name, out scope, LookupOptions.Global);
                     scope?.Variables[ne.Name].Assign(value, Eval.GetLocationOfName(ne));
                     continue;
                 }
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public IMember GetValueFromList(ListExpression expression) {`
`62`	`62`	`var value = GetValueFromExpression(item) ?? UnknownType;`
`63`	`63`	`contents.Add(value);`
`64`	`64`	`}`
`65`		`- return PythonCollectionType.CreateList(Module.Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);`
	`65`	`+ return PythonCollectionType.CreateList(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`public IMember GetValueFromDictionary(DictionaryExpression expression) {`
`@@ -72,7 +72,7 @@ public IMember GetValueFromDictionary(DictionaryExpression expression) {`
`72`	`72`	`var value = GetValueFromExpression(item.SliceStop) ?? UnknownType;`
`73`	`73`	`contents[key] = value;`
`74`	`74`	`}`
`75`		`- return new PythonDictionary(Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);`
	`75`	`+ return new PythonDictionary(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`private IMember GetValueFromTuple(TupleExpression expression) {`
`@@ -81,7 +81,7 @@ private IMember GetValueFromTuple(TupleExpression expression) {`
`81`	`81`	`var value = GetValueFromExpression(item) ?? UnknownType;`
`82`	`82`	`contents.Add(value);`
`83`	`83`	`}`
`84`		`- return PythonCollectionType.CreateTuple(Module.Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);`
	`84`	`+ return PythonCollectionType.CreateTuple(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public IMember GetValueFromSet(SetExpression expression) {`
`@@ -90,7 +90,7 @@ public IMember GetValueFromSet(SetExpression expression) {`
`90`	`90`	`var value = GetValueFromExpression(item) ?? UnknownType;`
`91`	`91`	`contents.Add(value);`
`92`	`92`	`}`
`93`		`- return PythonCollectionType.CreateSet(Interpreter, contents, exact: expression.Items.Count <= MaxCollectionSize);`
	`93`	`+ return PythonCollectionType.CreateSet(Module, contents, exact: expression.Items.Count <= MaxCollectionSize);`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`public IMember GetValueFromGenerator(GeneratorExpression expression) {`
`@@ -110,14 +110,14 @@ public IMember GetValueFromComprehension(Comprehension node) {`
`110`	`110`	`switch (node) {`
`111`	`111`	`case ListComprehension lc:`
`112`	`112`	`var v1 = GetValueFromExpression(lc.Item) ?? UnknownType;`
`113`		`- return PythonCollectionType.CreateList(Interpreter, new[] { v1 });`
	`113`	`+ return PythonCollectionType.CreateList(Module, new[] { v1 });`
`114`	`114`	`case SetComprehension sc:`
`115`	`115`	`var v2 = GetValueFromExpression(sc.Item) ?? UnknownType;`
`116`		`- return PythonCollectionType.CreateSet(Interpreter, new[] { v2 });`
	`116`	`+ return PythonCollectionType.CreateSet(Module, new[] { v2 });`
`117`	`117`	`case DictionaryComprehension dc:`
`118`	`118`	`var k = GetValueFromExpression(dc.Key) ?? UnknownType;`
`119`	`119`	`var v = GetValueFromExpression(dc.Value) ?? UnknownType;`
`120`		`- return new PythonDictionary(new PythonDictionaryType(Interpreter), new Dictionary<IMember, IMember> { { k, v } });`
	`120`	`+ return new PythonDictionary(new PythonDictionaryType(Interpreter.ModuleResolution.BuiltinsModule), new Dictionary<IMember, IMember> { { k, v } });`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`return UnknownType;`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,9 @@ private IMember GetValueFromBinaryOp(Expression expr) {`
`105`	`105`
`106`	`106`	`switch (leftTypeId) {`
`107`	`107`	`case BuiltinTypeId.List:`
`108`		`- return PythonCollectionType.CreateConcatenatedList(Module.Interpreter, lc, rc);`
	`108`	`+ return PythonCollectionType.CreateConcatenatedList(Module, lc, rc);`
`109`	`109`	`case BuiltinTypeId.Tuple:`
`110`		`- return PythonCollectionType.CreateConcatenatedTuple(Module.Interpreter, lc, rc);`
	`110`	`+ return PythonCollectionType.CreateConcatenatedTuple(Module, lc, rc);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ public void HandleAssignment(AssignmentStatement node) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`foreach (var ne in node.Left.OfType<NameExpression>()) {`
	`61`	`+ IScope scope;`
`61`	`62`	`if (Eval.CurrentScope.NonLocals[ne.Name] != null) {`
`62`		`- Eval.LookupNameInScopes(ne.Name, out var scope, LookupOptions.Nonlocal);`
	`63`	`+ Eval.LookupNameInScopes(ne.Name, out scope, LookupOptions.Nonlocal);`
`63`	`64`	`scope?.Variables[ne.Name].Assign(value, Eval.GetLocationOfName(ne));`
`64`	`65`	`continue;`
`65`	`66`	`}`
`66`		`-`
`67`	`67`	`if (Eval.CurrentScope.Globals[ne.Name] != null) {`
`68`		`- Eval.LookupNameInScopes(ne.Name, out var scope, LookupOptions.Global);`
	`68`	`+ Eval.LookupNameInScopes(ne.Name, out scope, LookupOptions.Global);`
`69`	`69`	`scope?.Variables[ne.Name].Assign(value, Eval.GetLocationOfName(ne));`
`70`	`70`	`continue;`
`71`	`71`	`}`