Fixed SD2-479.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@563 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/Libraries/ICSharpCode.TextEditor/Project/Src/Gui/IconBarMargin.cs

@@ -21,9 +21,13 @@ namespace ICSharpCode.TextEditor
 	/// </summary>
 	public class IconBarMargin : AbstractMargin
 	{
+		const int iconBarWidth = 18;
+		
+		static readonly Size iconBarSize = new Size(iconBarWidth, -1);
+		
 		public override Size Size {
 			get {
-				return new Size(20, -1);
+				return iconBarSize;
 			}
 		}
 		
@@ -84,12 +88,11 @@ namespace ICSharpCode.TextEditor
 		#region Drawing functions
 		public void DrawBreakpoint(Graphics g, int y, bool isEnabled)
 		{
-			int delta = 1;
-			int radius = Math.Min(Size.Width, textArea.TextView.FontHeight);
-			Rectangle rect = new Rectangle(delta,
-			                               y,
-			                               radius,
-			                               radius);
+			int diameter = Math.Min(iconBarWidth - 2, textArea.TextView.FontHeight);
+			Rectangle rect = new Rectangle(1,
+			                               y + (textArea.TextView.FontHeight - diameter) / 2,
+			                               diameter,
+			                               diameter);
 			
 			
 			using (GraphicsPath path = new GraphicsPath()) {

src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMOutputVisitor.cs

@@ -660,7 +660,8 @@ namespace ICSharpCode.NRefactory.Parser
 		public override object Visit(IdentifierExpression expression, object data)
 		{
 			if (IsField(expression.Identifier)) {
-				return new CodeVariableReferenceExpression(expression.Identifier);
+				return new CodeFieldReferenceExpression(new CodeThisReferenceExpression(), expression.Identifier);
+				//return new CodeVariableReferenceExpression(expression.Identifier);
 			}
 			return new CodeVariableReferenceExpression(expression.Identifier);
 		}
@@ -905,7 +906,10 @@ namespace ICSharpCode.NRefactory.Parser
 			while (fieldReferenceExpression.TargetObject is FieldReferenceExpression) {
 				fieldReferenceExpression = (FieldReferenceExpression)fieldReferenceExpression.TargetObject;
 			}
-			return fieldReferenceExpression.TargetObject is IdentifierExpression;
+			IdentifierExpression identifier = fieldReferenceExpression.TargetObject as IdentifierExpression;
+			if (identifier != null)
+				return !IsField(identifier.Identifier);
+			return false;
 		}
 		
 		bool IsField(string identifier)

src/Libraries/NRefactory/Project/Src/Output/CodeDOM/CodeDOMVerboseOutputGenerator.cs

@@ -26,7 +26,11 @@ namespace ICSharpCode.NRefactory.Parser
 
 		protected override void OutputType(CodeTypeReference typeRef)
 		{
-			Output.Write("[CodeTypeReference: {0}]", typeRef.ToString());
+			Output.Write("[CodeTypeReference: {0}", typeRef.BaseType);
+			if (typeRef.ArrayRank > 0) {
+				Output.Write(" Rank:" + typeRef.ArrayRank);
+			}
+			Output.Write("]");
 		}
 		
 		protected override void GenerateArrayCreateExpression(CodeArrayCreateExpression e)
@@ -56,6 +60,20 @@ namespace ICSharpCode.NRefactory.Parser
 			Output.Write("]");
 		}
 		
+		protected override void GenerateMethodReferenceExpression(CodeMethodReferenceExpression e)
+		{
+			Output.Write("[CodeMethodReferenceExpression: Name={0}, Target=", e.MethodName);
+			this.GenerateExpression(e.TargetObject);
+			Output.Write("]");
+		}
+		
+		protected override void GenerateEventReferenceExpression(CodeEventReferenceExpression e)
+		{
+			Output.Write("[CodeEventReferenceExpression: Name={0}, Target=", e.EventName);
+			this.GenerateExpression(e.TargetObject);
+			Output.Write("]");
+		}
+		
 		protected override void GenerateArgumentReferenceExpression(CodeArgumentReferenceExpression e)
 		{
 			Output.Write("[CodeArgumentReferenceExpression: {0}]", e.ToString());
@@ -83,17 +101,15 @@ namespace ICSharpCode.NRefactory.Parser
 		
 		protected override void GenerateMethodInvokeExpression(CodeMethodInvokeExpression e)
 		{
-			Output.Write("[CodeMethodInvokeExpression: {0}]", e.ToString());
-		}
-		
-		protected override void GenerateMethodReferenceExpression(CodeMethodReferenceExpression e) 
-		{
-			Output.Write("[CodeMethodReferenceExpression: {0}]", e.ToString());
-		}
-		
-		protected override void GenerateEventReferenceExpression(CodeEventReferenceExpression e) 
-		{
-			Output.Write("[CodeEventReferenceExpression: {0}]", e.ToString());
+			Output.Write("[CodeMethodInvokeExpression: Method=");
+			GenerateMethodReferenceExpression(e.Method);
+			Output.Write(", Parameters=");
+			bool first = true;
+			foreach (CodeExpression expr in e.Parameters) {
+				if (first) first = false; else Output.Write(", ");
+				this.GenerateExpression(expr);
+			}
+			Output.Write("]");
 		}
 		
 		protected override void GenerateDelegateInvokeExpression(CodeDelegateInvokeExpression e)
@@ -104,7 +120,9 @@ namespace ICSharpCode.NRefactory.Parser
 		protected override void GenerateObjectCreateExpression(CodeObjectCreateExpression e)
 		{
 			Output.Write("[CodeObjectCreateExpression: Type={0}, Parameters=", e.CreateType.BaseType);
+			bool first = true;
 			foreach (CodeExpression expr in e.Parameters) {
+				if (first) first = false; else Output.Write(", ");
 				this.GenerateExpression(expr);
 			}
 			Output.Write("]");
@@ -129,8 +147,9 @@ namespace ICSharpCode.NRefactory.Parser
 		
 		protected override void GenerateExpressionStatement(CodeExpressionStatement e)
 		{
-			Output.WriteLine("[CodeExpressionStatement: {0}]", e.ToString());
-			
+			Output.Write("[CodeExpressionStatement:");
+			base.GenerateExpression(e.Expression);
+			Output.WriteLine("]");
 		}
 		
 		protected override void GenerateIterationStatement(CodeIterationStatement e)