Browse Source

fix NRE in CreateElementList, if it's a file without a current ITypeDefinition (e.g. ResourceDictionary)

pull/45/merge
Siegfried Pammer 12 years ago
parent
commit
b738fff109
  1. 7
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs

7
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataGenerator.cs

@ -148,8 +148,11 @@ namespace ICSharpCode.XamlBinding @@ -148,8 +148,11 @@ namespace ICSharpCode.XamlBinding
bool parentAdded = false;
var utd = file.GetInnermostTypeDefinition(editor.Caret.Location);
var rtd = utd.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly)).GetDefinition();
MemberLookup memberLookup = new MemberLookup(rtd, compilation.MainAssembly);
ITypeDefinition currentTypeDef = null;
if (utd != null) {
currentTypeDef = utd.Resolve(new SimpleTypeResolveContext(compilation.MainAssembly)).GetDefinition();
}
MemberLookup memberLookup = new MemberLookup(currentTypeDef, compilation.MainAssembly);
IList<ITypeDefinition> possibleTypesInCollection = EmptyList<ITypeDefinition>.Instance;
if (rt != null && Extensions.IsListType(rt)) {

Loading…
Cancel
Save