Author: mhutch
Date: 2007-12-03 20:06:38 -0500 (Mon, 03 Dec 2007)
New Revision: 90613

Modified:
   trunk/monodevelop/Extras/CSharpBinding/ChangeLog
   trunk/monodevelop/Extras/CSharpBinding/Gui/CSharpTextEditorExtension.cs
Log:
* Gui/CSharpTextEditorExtension.cs: Fix for "Bug 345774 - "override"
  statement completion include members internal to another
  assembly.".

Modified: trunk/monodevelop/Extras/CSharpBinding/ChangeLog
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-12-04 00:26:42 UTC 
(rev 90612)
+++ trunk/monodevelop/Extras/CSharpBinding/ChangeLog    2007-12-04 01:06:38 UTC 
(rev 90613)
@@ -1,3 +1,8 @@
+2007-12-03  Michael Hutchinson <[EMAIL PROTECTED]> 
+
+       * Gui/CSharpTextEditorExtension.cs: Fix for "Bug 345774 - "override"
+         statement completion include members internal to another assembly.".
+
 2007-12-01  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * Gui/CSharpTextEditorExtension.cs: Implement completion of symbols when

Modified: 
trunk/monodevelop/Extras/CSharpBinding/Gui/CSharpTextEditorExtension.cs
===================================================================
--- trunk/monodevelop/Extras/CSharpBinding/Gui/CSharpTextEditorExtension.cs     
2007-12-04 00:26:42 UTC (rev 90612)
+++ trunk/monodevelop/Extras/CSharpBinding/Gui/CSharpTextEditorExtension.cs     
2007-12-04 01:06:38 UTC (rev 90613)
@@ -947,18 +947,26 @@
                                ArrayList list = isInterface ? interfaceMembers 
: classMembers;
                                
                                foreach (IMethod m in baseCls.Methods) {
+                                       if (m.IsInternal && 
motherClass.SourceProject != null && motherClass.SourceProject != 
m.DeclaringType.SourceProject)
+                                               continue;
                                        if ((isInterface || m.IsVirtual || 
m.IsAbstract) && !m.IsSealed && CanOverrideMethod (motherClass, m))
                                                list.Add (m);
                                }
                                foreach (IProperty m in baseCls.Properties) {
+                                       if (m.IsInternal && 
motherClass.SourceProject != null && motherClass.SourceProject != 
m.DeclaringType.SourceProject)
+                                               continue;
                                        if ((isInterface || m.IsVirtual || 
m.IsAbstract) && !m.IsSealed && CanOverrideProperty (motherClass, m))
                                                list.Add (m);
                                }
                                foreach (IIndexer m in baseCls.Indexer) {
+                                       if (m.IsInternal && 
motherClass.SourceProject != null && motherClass.SourceProject != 
m.DeclaringType.SourceProject)
+                                               continue;
                                        if ((isInterface || m.IsVirtual || 
m.IsAbstract) && !m.IsSealed && CanOverrideIndexer (motherClass, m))
                                                list.Add (m);
                                }
                                foreach (IEvent m in baseCls.Events) {
+                                       if (m.IsInternal && 
motherClass.SourceProject != null && motherClass.SourceProject != 
m.DeclaringType.SourceProject)
+                                               continue;
                                        if ((isInterface || m.IsVirtual || 
m.IsAbstract) && !m.IsSealed)
                                                list.Add (m);
                                }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to