Browse Source

FindNodeByPath: Use metadata token as identification of member/type tree nodes.

pull/1939/head
Siegfried Pammer 6 years ago
parent
commit
46bb042e6e
  1. 4
      ILSpy/TextView/DecompilerTextView.cs
  2. 6
      ILSpy/TreeNodes/EventTreeNode.cs
  3. 6
      ILSpy/TreeNodes/FieldTreeNode.cs
  4. 6
      ILSpy/TreeNodes/MethodTreeNode.cs
  5. 6
      ILSpy/TreeNodes/PropertyTreeNode.cs
  6. 6
      ILSpy/TreeNodes/TypeTreeNode.cs

4
ILSpy/TextView/DecompilerTextView.cs

@ -581,7 +581,7 @@ namespace ICSharpCode.ILSpy.TextView @@ -581,7 +581,7 @@ namespace ICSharpCode.ILSpy.TextView
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 @@ namespace ICSharpCode.ILSpy.TextView @@ -772,7 +772,7 @@ namespace ICSharpCode.ILSpy.TextView
{
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)

6
ILSpy/TreeNodes/EventTreeNode.cs

@ -86,5 +86,11 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -86,5 +86,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
}
IEntity IMemberTreeNode.Member => EventDefinition;
public override string ToString()
{
int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(EventDefinition.MetadataToken);
return "@" + token.ToString("X8");
}
}
}

6
ILSpy/TreeNodes/FieldTreeNode.cs

@ -87,5 +87,11 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -87,5 +87,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
}
IEntity IMemberTreeNode.Member => FieldDefinition;
public override string ToString()
{
int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(FieldDefinition.MetadataToken);
return "@" + token.ToString("X8");
}
}
}

6
ILSpy/TreeNodes/MethodTreeNode.cs

@ -112,5 +112,11 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -112,5 +112,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
}
IEntity IMemberTreeNode.Member => MethodDefinition;
public override string ToString()
{
int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(MethodDefinition.MetadataToken);
return "@" + token.ToString("X8");
}
}
}

6
ILSpy/TreeNodes/PropertyTreeNode.cs

@ -93,5 +93,11 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -93,5 +93,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
}
IEntity IMemberTreeNode.Member => PropertyDefinition;
public override string ToString()
{
int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(PropertyDefinition.MetadataToken);
return "@" + token.ToString("X8");
}
}
}

6
ILSpy/TreeNodes/TypeTreeNode.cs

@ -154,5 +154,11 @@ namespace ICSharpCode.ILSpy.TreeNodes @@ -154,5 +154,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
}
IEntity IMemberTreeNode.Member => TypeDefinition;
public override string ToString()
{
int token = System.Reflection.Metadata.Ecma335.MetadataTokens.GetToken(TypeDefinition.MetadataToken);
return "@" + token.ToString("X8");
}
}
}

Loading…
Cancel
Save