From 73b17a305077dd9fd794bf8fb3a5f2e4a4350735 Mon Sep 17 00:00:00 2001 From: mkrueger Date: Mon, 23 Feb 2009 09:17:15 +0000 Subject: [PATCH] * MonoDevelop.Projects.Dom/AbstractMember.cs: Fixed inner type bug. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/monodevelop@127713 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- main/src/core/MonoDevelop.Projects/ChangeLog | 5 +++++ .../MonoDevelop.Projects.Dom/AbstractMember.cs | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/main/src/core/MonoDevelop.Projects/ChangeLog b/main/src/core/MonoDevelop.Projects/ChangeLog index bf9a011b4..8896a7a2c 100644 --- a/main/src/core/MonoDevelop.Projects/ChangeLog +++ b/main/src/core/MonoDevelop.Projects/ChangeLog @@ -1,5 +1,10 @@ 2009-02-23 Mike Krüger + * MonoDevelop.Projects.Dom/AbstractMember.cs: Fixed inner type + bug. + +2009-02-23 Mike Krüger + * MonoDevelop.Projects.Dom.Parser/ProjectDom.cs: * MonoDevelop.Projects.Dom.Serialization/CodeCompletionDatabase.cs: Fixed inner type access issues. diff --git a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/AbstractMember.cs b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/AbstractMember.cs index a3a2ab211..58bd0b76a 100644 --- a/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/AbstractMember.cs +++ b/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom/AbstractMember.cs @@ -256,10 +256,13 @@ namespace MonoDevelop.Projects.Dom }*/ return includeProtected; } - // inner class - if (member.DeclaringType != null && member.DeclaringType.DeclaringType == DeclaringType) - return true; + IType declaringType = member.DeclaringType; + while (declaringType != null) { + if (declaringType.Equals (DeclaringType)) + return true; + declaringType = declaringType.DeclaringType; + } if (member is MonoDevelop.Projects.Dom.BaseResolveResult.BaseMemberDecorator) return IsPublic | IsProtected; -- 2.11.4.GIT