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

Fixes NullReferenceException when trying to access InstanceInfo.InstanceAttributes #282

Merged
merged 1 commit into from
Oct 19, 2018
Merged

Fixes NullReferenceException when trying to access InstanceInfo.InstanceAttributes #282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/Analysis/Engine/Impl/Values/InstanceInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down