Skip to content
This repository was archived by the owner on Apr 14, 2022. It is now read-only.

Commit 6d4659f

Browse files
author
Mikhail Arkhipov
authored
Merge pull request #282 from losttech/fixes/InstanceAttributesNull
Fixes NullReferenceException when trying to access InstanceInfo.InstanceAttributes
2 parents 45f8796 + 7816414 commit 6d4659f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/Analysis/Engine/Impl/Values/InstanceInfo.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Collections.Generic;
1818
using System.Linq;
1919
using Microsoft.PythonTools.Analysis.Analyzer;
20+
using Microsoft.PythonTools.Analysis.Infrastructure;
2021
using Microsoft.PythonTools.Interpreter;
2122
using Microsoft.PythonTools.Parsing;
2223
using Microsoft.PythonTools.Parsing.Ast;
@@ -93,9 +94,9 @@ private static void MergeTypes(Dictionary<string, IAnalysisSet> res, string key,
9394
}
9495

9596
public IReadOnlyDictionary<string, VariableDef> InstanceAttributes
96-
=> _instanceAttrs.ToDictionary(k => k.Key, v => v.Value);
97+
=> _instanceAttrs.MaybeEnumerate().ToDictionary(k => k.Key, v => v.Value);
9798
IReadOnlyDictionary<string, IVariableDefinition> IInstanceInfo.InstanceAttributes
98-
=> InstanceAttributes.ToDictionary(kvp => kvp.Key, kvp => kvp.Value as IVariableDefinition);
99+
=> _instanceAttrs.MaybeEnumerate().ToDictionary(kvp => kvp.Key, kvp => kvp.Value as IVariableDefinition);
99100

100101
public PythonAnalyzer ProjectState => ClassInfo.AnalysisUnit.State;
101102

0 commit comments

Comments
 (0)