Browse Source

Fixed failing unit test.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
8942cd5f2c
  1. 11
      ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

11
ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs

@ -553,6 +553,7 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
void AddTypesAndNamespaces (CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Predicate<ITypeDefinition> typePred = null, Predicate<IMember> memberPred = null) void AddTypesAndNamespaces (CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Predicate<ITypeDefinition> typePred = null, Predicate<IMember> memberPred = null)
{ {
var currentType = state.CurrentTypeDefinition ?? this.currentType; var currentType = state.CurrentTypeDefinition ?? this.currentType;
var currentMember = state.CurrentMember ?? this.currentMember;
if (currentType != null) { if (currentType != null) {
for (var ct = currentType; ct != null; ct = ct.DeclaringTypeDefinition) { for (var ct = currentType; ct != null; ct = ct.DeclaringTypeDefinition) {
foreach (var nestedType in ct.NestedTypes) { foreach (var nestedType in ct.NestedTypes) {
@ -564,12 +565,12 @@ namespace ICSharpCode.NRefactory.CSharp.Completion
} }
} }
} }
if (currentMember != null) {
foreach (var member in currentType.Resolve (ctx).GetMembers (ctx)) { foreach (var member in currentType.Resolve (ctx).GetMembers (ctx)) {
if (memberPred == null || memberPred (member)) if (memberPred == null || memberPred (member))
wrapper.AddMember (member); wrapper.AddMember (member);
}
} }
foreach (var p in currentType.TypeParameters) { foreach (var p in currentType.TypeParameters) {
wrapper.AddTypeParameter (p); wrapper.AddTypeParameter (p);
} }

Loading…
Cancel
Save