From 03edb5cf5c681baca3a9b1041d07b78c1729689f Mon Sep 17 00:00:00 2001
From: Daniel Grunwald <daniel@danielgrunwald.de>
Date: Tue, 8 Feb 2011 23:06:24 +0100
Subject: [PATCH] Don't always remove "this."

---
 .../Ast/Transforms/SimplifyTypeReferences.cs             | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/ICSharpCode.Decompiler/Ast/Transforms/SimplifyTypeReferences.cs b/ICSharpCode.Decompiler/Ast/Transforms/SimplifyTypeReferences.cs
index 958af3200..f8b4e80ec 100644
--- a/ICSharpCode.Decompiler/Ast/Transforms/SimplifyTypeReferences.cs
+++ b/ICSharpCode.Decompiler/Ast/Transforms/SimplifyTypeReferences.cs
@@ -40,10 +40,11 @@ namespace Decompiler.Transforms.Ast
 					return null;
 				}
 			}
-			if (memberReferenceExpression.TargetObject is ThisReferenceExpression) {
-				ReplaceCurrentNode(new IdentifierExpression(memberReferenceExpression.MemberName));
-				return null;
-			}
+			// we can't always remove "this", the field name might conflict with a parameter/local variable
+//			if (memberReferenceExpression.TargetObject is ThisReferenceExpression) {
+//				ReplaceCurrentNode(new IdentifierExpression(memberReferenceExpression.MemberName));
+//				return null;
+//			}
 			return base.VisitMemberReferenceExpression(memberReferenceExpression, data);
 		}