Merge 44273fe into f0d6304

mkaring · web-flow · commit ed9fdf7c0441 · 2020-08-16T21:11:15.000+02:00
diff --git a/Confuser.Renamer/BAML/BAMLAnalyzer.cs b/Confuser.Renamer/BAML/BAMLAnalyzer.cs
@@ -261,6 +261,11 @@ void AddTypeSigReference(TypeSig typeSig, INameReference<IDnlibDef> reference) {
 			}
 		}
 
+		void AddPropertyDefReference(PropertyDef propertyDef, INameReference<PropertyDef> reference) {
+			service.ReduceRenameMode(propertyDef, RenameMode.Letters);
+			service.AddReference(propertyDef, reference);
+		}
+
 		void ProcessBAMLElement(BamlElement root, BamlElement elem) {
 			ProcessElementHeader(elem);
 			ProcessElementBody(root, elem);
@@ -609,11 +614,17 @@ void AnalyzePropertyPathProperty(PropertyPathPartUpdater part) {
 			var typeName = part.GetTypeName();
 			var propertyName = part.GetPropertyName();
 			if (!string.IsNullOrWhiteSpace(typeName)) {
-				var sig = ResolveType(typeName, out var prefix);
-				if (sig != null && context.Modules.Contains((ModuleDefMD) sig.ToBasicTypeDefOrRef().ResolveTypeDefThrow().Module)) {
-					var reference = new BAMLPathTypeReference(xmlnsCtx, sig, part);
+				var sig = ResolveType(typeName, out _);
+				var basicTypeDef = sig?.ToBasicTypeDefOrRef().ResolveTypeDef();
+				if (!(basicTypeDef is null) && context.Modules.Contains(basicTypeDef.Module as ModuleDefMD)) {
+					var propDef = basicTypeDef.FindPropertyCheckBaseType(propertyName);
+					var reference = new BAMLPathTypeReference(xmlnsCtx, sig, propDef, part);
 					AddTypeSigReference(sig, reference);
-					return;
+
+					if (!(propDef is null)) {
+						AddPropertyDefReference(propDef, reference);
+						return; // Return to avoid blocking renaming of the property.
+					}
 				}
 			}
 
diff --git a/Confuser.Renamer/References/BAMLPathTypeReference.cs b/Confuser.Renamer/References/BAMLPathTypeReference.cs
@@ -7,10 +7,11 @@
 using dnlib.DotNet;
 
 namespace Confuser.Renamer.References {
-	internal sealed class BAMLPathTypeReference : INameReference<TypeDef> {
+	internal sealed class BAMLPathTypeReference : INameReference<TypeDef>, INameReference<PropertyDef> {
 		PropertyPathPartUpdater? PropertyInfo { get; }
 		PropertyPathIndexUpdater? IndexerInfo { get; }
 		private readonly TypeSig sig;
+		readonly PropertyDef prop;
 		private readonly BAMLAnalyzer.XmlNsContext xmlnsCtx;
 
 		public bool ShouldCancelRename => false;
@@ -26,8 +27,10 @@ private BAMLPathTypeReference(BAMLAnalyzer.XmlNsContext xmlnsCtx, TypeSig sig) {
 		public BAMLPathTypeReference(BAMLAnalyzer.XmlNsContext xmlnsCtx, TypeSig sig, PropertyPathIndexUpdater indexerInfo) : this(xmlnsCtx, sig) => 
 			IndexerInfo = indexerInfo;
 
-		public BAMLPathTypeReference(BAMLAnalyzer.XmlNsContext xmlnsCtx, TypeSig sig, PropertyPathPartUpdater propertyInfo) : this(xmlnsCtx, sig) => 
+		public BAMLPathTypeReference(BAMLAnalyzer.XmlNsContext xmlnsCtx, TypeSig sig, PropertyDef property, PropertyPathPartUpdater propertyInfo) : this(xmlnsCtx, sig) {
 			PropertyInfo = propertyInfo;
+			prop = property;
+		}
 
 		public bool UpdateNameReference(ConfuserContext context, INameService service) {
 			string name = sig.ReflectionName;
@@ -43,7 +46,7 @@ public bool UpdateNameReference(ConfuserContext context, INameService service) {
 			else {
 				Debug.Assert(PropertyInfo != null, nameof(PropertyInfo) + " != null");
 				var info = PropertyInfo.Value;
-				var propertyName = info.GetPropertyName();
+				var propertyName = prop?.Name ?? info.GetPropertyName();
 				var newName = string.Format(CultureInfo.InvariantCulture, "({0}.{1})", name, propertyName);
 				if (string.Equals(info.Name, newName, StringComparison.Ordinal)) return false;
 				info.Name = newName;
