Merge branch '2018.9'

MikhailArkhipov · MikhailArkhipov · commit 58827c26981d · 2018-09-28T09:55:16.000-07:00
diff --git a/src/Analysis/Engine/Impl/Interpreter/Ast/AstAnalysisFunctionWalker.cs b/src/Analysis/Engine/Impl/Interpreter/Ast/AstAnalysisFunctionWalker.cs
@@ -65,7 +65,7 @@ public void Walk() {
             var self = GetSelf();
             _selfType = (self as AstPythonConstant)?.Type as AstPythonType;
 
-            _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation));
+            _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation).ExcludeDefault());
 
             _scope.PushScope();
             if (self != null) {
@@ -163,7 +163,7 @@ public override bool Walk(IfStatement node) {
         }
 
         public override bool Walk(ReturnStatement node) {
-            foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression))) {
+            foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression)).ExcludeDefault()) {
                 _overload.ReturnTypes.Add(type);
             }
             return true; // We want to evaluate all code so all private variables in __new__ get defined

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public void Walk() {`
`65`	`65`	`var self = GetSelf();`
`66`	`66`	`_selfType = (self as AstPythonConstant)?.Type as AstPythonType;`
`67`	`67`
`68`		`- _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation));`
	`68`	`+ _overload.ReturnTypes.AddRange(_scope.GetTypesFromAnnotation(_target.ReturnAnnotation).ExcludeDefault());`
`69`	`69`
`70`	`70`	`_scope.PushScope();`
`71`	`71`	`if (self != null) {`
`@@ -163,7 +163,7 @@ public override bool Walk(IfStatement node) {`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`public override bool Walk(ReturnStatement node) {`
`166`		`- foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression))) {`
	`166`	`+ foreach (var type in _scope.GetTypesFromValue(_scope.GetValueFromExpression(node.Expression)).ExcludeDefault()) {`
`167`	`167`	`_overload.ReturnTypes.Add(type);`
`168`	`168`	`}`
`169`	`169`	`return true; // We want to evaluate all code so all private variables in __new__ get defined`