Merge pull request #282 from losttech/fixes/InstanceAttributesNull

Fixes NullReferenceException when trying to access InstanceInfo.InstanceAttributes
microsoft · Oct 19, 2018 · 6d4659f · 6d4659f
2 parents 45f8796 + 7816414
commit 6d4659f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Analysis/Engine/Impl/Values/InstanceInfo.cs b/src/Analysis/Engine/Impl/Values/InstanceInfo.cs
@@ -17,6 +17,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.PythonTools.Analysis.Analyzer;
+using Microsoft.PythonTools.Analysis.Infrastructure;
 using Microsoft.PythonTools.Interpreter;
 using Microsoft.PythonTools.Parsing;
 using Microsoft.PythonTools.Parsing.Ast;
@@ -93,9 +94,9 @@ private static void MergeTypes(Dictionary<string, IAnalysisSet> res, string key,
         }
 
         public IReadOnlyDictionary<string, VariableDef> InstanceAttributes 
-            => _instanceAttrs.ToDictionary(k => k.Key, v => v.Value);
+            => _instanceAttrs.MaybeEnumerate().ToDictionary(k => k.Key, v => v.Value);
         IReadOnlyDictionary<string, IVariableDefinition> IInstanceInfo.InstanceAttributes
-            => InstanceAttributes.ToDictionary(kvp => kvp.Key, kvp => kvp.Value as IVariableDefinition);
+            => _instanceAttrs.MaybeEnumerate().ToDictionary(kvp => kvp.Key, kvp => kvp.Value as IVariableDefinition);
 
         public PythonAnalyzer ProjectState => ClassInfo.AnalysisUnit.State;