Merge d0eec3d into 5d8e2b9

KvanTTT · web-flow · commit d2da2d101f84 · 2021-07-15T22:08:34.000Z
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -376,7 +376,7 @@ string GetSimplifiedFullName(IDnlibDef dnlibDef, bool forceShortNames = false) {
 			                 GetParam(dnlibDef, "shortNames")?.Equals("true", StringComparison.OrdinalIgnoreCase) ==
 			                 true;
 			if (shortNames) {
-				result = dnlibDef.Name;
+				result = dnlibDef is MethodDef ? (string)dnlibDef.Name : dnlibDef.FullName;
 			}
 			else {
 				if (dnlibDef is MethodDef methodDef) {
diff --git a/Tests/MethodOverloading.Test/MethodOverloadingTest.cs b/Tests/MethodOverloading.Test/MethodOverloadingTest.cs
@@ -51,8 +51,8 @@ await Run(
 					}).ToDictionary(keyValue => keyValue.Key, keyValue => keyValue.Value);
 
 					if (shortNames) {
-						Assert.Equal("Class", symbols["_OatkF4GhWlgOakbgdlaLpqEglhm"]);
-						Assert.Equal("NestedClass", symbols["_GYHfKMUMLLO9oVLM117IvfCdmUC"]);
+						Assert.Equal("MethodOverloading.Class", symbols["_iyWU2GdYVZxajP8BQlt8KKTy6qQ"]);
+						Assert.Equal("MethodOverloading.Program/NestedClass", symbols["_CZIbNVHU7wPJyGhgOcTnIUsFtC0"]);
 						Assert.Equal("OverloadedMethod", symbols["_phF8iy7Y79cwt3EaAFmJzW2bGch"]);
 					}
 					else {
diff --git a/Tests/MethodOverloading/Program.cs b/Tests/MethodOverloading/Program.cs
@@ -1,5 +1,17 @@
 using System;
 
+namespace A {
+	public static class X
+	{
+	}
+}
+
+namespace B {
+	public static class X
+	{
+	}
+}
+
 namespace MethodOverloading {
 	public interface IInterface {
 		string Method(string param);
@@ -45,6 +57,16 @@ public class BaseClass5<T> {
 	public class Class5 : BaseClass5<string>, Interface5 {
 	}
 
+	[AttributeUsage(AttributeTargets.All, AllowMultiple = true, Inherited = false)]
+	sealed class MyAttribute : Attribute
+	{
+		public MyAttribute(Type type)
+		{
+		}
+	}
+
+	[My(typeof(A.X))]
+	[My(typeof(B.X))]
 	public class Program {
 		public class NestedClass {
 			public override string ToString() => "test";

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ string GetSimplifiedFullName(IDnlibDef dnlibDef, bool forceShortNames = false) {`
`376`	`376`	`GetParam(dnlibDef, "shortNames")?.Equals("true", StringComparison.OrdinalIgnoreCase) ==`
`377`	`377`	`true;`
`378`	`378`	`if (shortNames) {`
`379`		`- result = dnlibDef.Name;`
	`379`	`+ result = dnlibDef is MethodDef ? (string)dnlibDef.Name : dnlibDef.FullName;`
`380`	`380`	`}`
`381`	`381`	`else {`
`382`	`382`	`if (dnlibDef is MethodDef methodDef) {`