← Back to branch summary

~ubuntu-branches/ubuntu/utopic/monodevelop/utopic

« back to all changes in this revision

Viewing changes to src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-10-10 14:50:04 UTC
  • mfrom: (10.3.4)
  • Revision ID: package-import@ubuntu.com-20131010145004-80l130sny21b17sb
Tags: 4.0.12+dfsg-1
http://bugs.debian.org/714246
* [5dcb6e1] Fix debian/watch for new source tarball name format
* [5c68cb5] Refresh list of files removed by get-orig-source to 
  reflect 4.0.12
* [96d60a0] Imported Upstream version 4.0.12+dfsg
* [b989752] Refresh debian/patches/no_appmenu to ensure it applies
* [2a4c351] Ensure every assembly in external/ is cleaned properly
* [92762f7] Add more excluded Mac-specific modulerefs
* [bc698ba] Add symlinks to NUnit assemblies (Closes: #714246)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/MemberCollector.cs
34
34
{
35
35
        public static class MemberCollector
36
36
        {
37
 
 
38
37
                static bool MatchParameters (IMember a, IMember b)
39
38
                {
40
39
                        return MatchParameters (a as IParameterizedMember, b as IParameterizedMember);
84
83
 
85
84
/*                      // Filter out shadowed members.
86
85
                        // class A { public string Foo { get; set; } } class B : A { public string Foo { get; set; } }
87
 
                        if (member.EntityType == EntityType.Property || !(member is IParameterizedMember)) {
 
86
                        if (member.SymbolKind == SymbolKind.Property || !(member is IParameterizedMember)) {
88
87
                                members = members.Where (m => m == member || m.DeclaringType.Kind == TypeKind.Interface);
89
88
                        }*/
90
89
 
105
104
                public static IEnumerable<IMember> CollectMembers (Solution solution, IMember member, ReferenceFinder.RefactoryScope scope,
106
105
                                                                                                                   bool includeOverloads = true, bool matchDeclaringType = false)
107
106
                {
108
 
                        if (solution == null || member.EntityType == EntityType.Destructor || member.EntityType == EntityType.Operator)
 
107
                        if (solution == null || member.SymbolKind == SymbolKind.Destructor || member.SymbolKind == SymbolKind.Operator)
109
108
                                return new [] { member };
110
109
 
111
 
                        if (member.EntityType == EntityType.Constructor) {
 
110
                        if (member.SymbolKind == SymbolKind.Constructor) {
112
111
                                if (includeOverloads)
113
 
                                        return member.DeclaringType.GetMembers (m => m.EntityType == EntityType.Constructor, GetMemberOptions.IgnoreInheritedMembers);
 
112
                                        return member.DeclaringType.GetMembers (m => m.SymbolKind == SymbolKind.Constructor, GetMemberOptions.IgnoreInheritedMembers);
114
113
                                return new [] { member };
115
114
                        }
116
115