Skip to content
This repository has been archived by the owner on Sep 24, 2020. It is now read-only.

Commit

Permalink
Fixed failing unit test.
Browse files Browse the repository at this point in the history
  • Loading branch information
Mike Krüger committed Oct 25, 2011
1 parent 2cfd9b2 commit 8942cd5
Showing 1 changed file with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -553,6 +553,7 @@ void AddContextCompletion (CompletionDataWrapper wrapper, CSharpResolver state,
void AddTypesAndNamespaces (CompletionDataWrapper wrapper, CSharpResolver state, AstNode node, Predicate<ITypeDefinition> typePred = null, Predicate<IMember> memberPred = null)
{
var currentType = state.CurrentTypeDefinition ?? this.currentType;
var currentMember = state.CurrentMember ?? this.currentMember;
if (currentType != null) {
for (var ct = currentType; ct != null; ct = ct.DeclaringTypeDefinition) {
foreach (var nestedType in ct.NestedTypes) {
Expand All @@ -564,12 +565,12 @@ void AddTypesAndNamespaces (CompletionDataWrapper wrapper, CSharpResolver state,
}
}
}

foreach (var member in currentType.Resolve (ctx).GetMembers (ctx)) {
if (memberPred == null || memberPred (member))
wrapper.AddMember (member);
if (currentMember != null) {
foreach (var member in currentType.Resolve (ctx).GetMembers (ctx)) {
if (memberPred == null || memberPred (member))
wrapper.AddMember (member);
}
}

foreach (var p in currentType.TypeParameters) {
wrapper.AddTypeParameter (p);
}
Expand Down

0 comments on commit 8942cd5

Please sign in to comment.