FindNodeByPath: Use metadata token as identification of member/type t…

…ree nodes.
weltkante · Feb 27, 2020 · 46bb042 · 46bb042
1 parent df84ab8
commit 46bb042
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 2 deletions.
diff --git a/ILSpy/TextView/DecompilerTextView.cs b/ILSpy/TextView/DecompilerTextView.cs
@@ -581,7 +581,7 @@ public void ShowNodes(AvalonEditTextOutput textOutput, ILSpyTreeNode[] nodes, IH
 				this.nextDecompilationRun = null;
 			}
 			if (nodes != null && string.IsNullOrEmpty(textOutput.Title))
-				textOutput.Title = string.Join(", ", nodes.Select(n => n.ToString()));
+				textOutput.Title = string.Join(", ", nodes.Select(n => n.Text));
 			ShowOutput(textOutput, highlighting);
 			decompiledNodes = nodes;
 		}
@@ -772,7 +772,7 @@ void DecompileNodes(DecompilationContext context, ITextOutput textOutput)
 		{
 			var nodes = context.TreeNodes;
 			if (textOutput is ISmartTextOutput smartTextOutput) {
-				smartTextOutput.Title = string.Join(", ", nodes.Select(n => n.ToString()));
+				smartTextOutput.Title = string.Join(", ", nodes.Select(n => n.Text));
 			}
 			for (int i = 0; i < nodes.Length; i++) {
 				if (i > 0)

diff --git a/ILSpy/TreeNodes/EventTreeNode.cs b/ILSpy/TreeNodes/EventTreeNode.cs
@@ -86,5 +86,11 @@ public override bool IsPublicAPI {
 		}
 
 		IEntity IMemberTreeNode.Member => EventDefinition;
+
+		public override string ToString()
+		{
+			int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(EventDefinition.MetadataToken);
+			return "@" + token.ToString("X8");
+		}
 	}
 }
diff --git a/ILSpy/TreeNodes/FieldTreeNode.cs b/ILSpy/TreeNodes/FieldTreeNode.cs
@@ -87,5 +87,11 @@ public override bool IsPublicAPI {
 		}
 
 		IEntity IMemberTreeNode.Member => FieldDefinition;
+
+		public override string ToString()
+		{
+			int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(FieldDefinition.MetadataToken);
+			return "@" + token.ToString("X8");
+		}
 	}
 }
diff --git a/ILSpy/TreeNodes/MethodTreeNode.cs b/ILSpy/TreeNodes/MethodTreeNode.cs
@@ -112,5 +112,11 @@ public override bool IsPublicAPI {
 		}
 
 		IEntity IMemberTreeNode.Member => MethodDefinition;
+
+		public override string ToString()
+		{
+			int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(MethodDefinition.MetadataToken);
+			return "@" + token.ToString("X8");
+		}
 	}
 }
diff --git a/ILSpy/TreeNodes/PropertyTreeNode.cs b/ILSpy/TreeNodes/PropertyTreeNode.cs
@@ -93,5 +93,11 @@ public override bool IsPublicAPI {
 		}
 
 		IEntity IMemberTreeNode.Member => PropertyDefinition;
+
+		public override string ToString()
+		{
+			int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(PropertyDefinition.MetadataToken);
+			return "@" + token.ToString("X8");
+		}
 	}
 }
diff --git a/ILSpy/TreeNodes/TypeTreeNode.cs b/ILSpy/TreeNodes/TypeTreeNode.cs
@@ -154,5 +154,11 @@ static AccessOverlayIcon GetOverlayIcon(ITypeDefinition type)
 		}
 
 		IEntity IMemberTreeNode.Member => TypeDefinition;
+
+		public override string ToString()
+		{
+			int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(TypeDefinition.MetadataToken);
+			return "@" + token.ToString("X8");
+		}
 	}
 }