[Monodevelop-patches-list] r2187 - in trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding: . Parser

[commit-watcher at mono-cvs.ximian.com]

Author: jluke
Date: 2005-01-28 19:47:09 -0500 (Fri, 28 Jan 2005)
New Revision: 2187

Modified:
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
   trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
Log:
fix static property completion bug


Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-01-29 00:21:30 UTC (rev 2186)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/ChangeLog	2005-01-29 00:47:09 UTC (rev 2187)
@@ -1,5 +1,12 @@
 2005-01-28  John Luke  <john.luke at gmail.com>
 
+	* Parser/Resolver.cs: remove incorrect special case
+	for properties that made them visible to completion
+	incorrectly on static to instance and vice-versa
+	fixes bug# 69741
+
+2005-01-28  John Luke  <john.luke at gmail.com>
+
 	* Parser/Parser.cs: update to CanParse
 	* Parser/*.cs: update some minor fixes from SD
 

Modified: trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs
===================================================================
--- trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs	2005-01-29 00:21:30 UTC (rev 2186)
+++ trunk/MonoDevelop/Core/src/AddIns/BackendBindings/CSharpBinding/Parser/Resolver.cs	2005-01-29 00:47:09 UTC (rev 2187)
@@ -68,7 +68,7 @@
 		
 		public IReturnType internalResolve(IParserService parserService, string expression, int caretLineNumber, int caretColumn, string fileName, string fileContent)
 		{
-			Console.WriteLine("Start Resolving");
+			//Console.WriteLine("Start Resolving");
 			if (expression == null) {
 				return null;
 			}
@@ -85,7 +85,7 @@
 			if (fileCompilationUnit == null) {
 //				ICSharpCode.SharpRefactory.Parser.Parser fileParser = new ICSharpCode.SharpRefactory.Parser.Parser();
 //				fileParser.Parse(new Lexer(new StringReader(fileContent)));
-				Console.WriteLine("!Warning: no parseinformation!");
+				Console.WriteLine("Warning: no parse information!");
 				return null;
 			}
 			/*
@@ -226,7 +226,7 @@
 				return new ResolveResult(namespaces);
 			}
 			
-			Console.WriteLine("Not in Using");
+			//Console.WriteLine("Not in Using");
 			IReturnType type = internalResolve (parserService, expression, caretLineNumber, caretColumn, fileName, fileContent);
 			IClass returnClass = SearchType (type.FullyQualifiedName, cu);
 			if (returnClass == null) {
@@ -245,7 +245,7 @@
 				string[] namespaces = parserService.GetNamespaceList(project, n, true);
 				return new ResolveResult(namespaces, classes);
 			}
-			Console.WriteLine("Returning Result!");
+			//Console.WriteLine("Returning Result!");
 			if (returnClass.FullyQualifiedName == "System.Void")
 				return null;
 			return new ResolveResult(returnClass, ListMembers(new ArrayList(), returnClass));
@@ -272,15 +272,6 @@
 				if (MustBeShowen(curType, p)) {
 					members.Add(p);
 //					Console.WriteLine("Member added");
-				} else {
-					//// for some public static properties msutbeshowen is false, so additional check
-					//// this is lame fix because curType doesn't allow to find out if to show only
-					//// static public or simply public properties
-					if (((AbstractMember)p).ReturnType!=null) {
-						// if public add it to completion window
-						if (((AbstractDecoration)p).IsPublic) members.Add(p);
-//						Console.WriteLine("Property {0} added", p.FullyQualifiedName);
-					}
 				}
 			}
 //			Console.WriteLine("ADDING METHODS!!!");