Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix url of SearchMsdn when do search with generic types and .ctor methods #2343

Merged
merged 2 commits into from
Mar 19, 2021
Merged

Fix url of SearchMsdn when do search with generic types and .ctor methods #2343

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2a0f01
Fix url of SearchMsdn when do search with generic types and .ctor met…
yyjdelete Mar 19, 2021
dd06b9a
Disallow members of delegate or enum for SearchMSDN
yyjdelete Mar 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 23 additions & 12 deletions ILSpy/Commands/SearchMsdnContextMenuEntry.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@ public bool IsEnabled(TextViewContext context)
if (node is EventTreeNode eventNode && (!eventNode.IsPublicAPI || !IsAccessible(eventNode.EventDefinition)))
return false;

if (node is FieldTreeNode fieldNode && (!fieldNode.IsPublicAPI || !IsAccessible(fieldNode.FieldDefinition)))
if (node is FieldTreeNode fieldNode && (!fieldNode.IsPublicAPI || !IsAccessible(fieldNode.FieldDefinition) || IsDelegateOrEnumMember(fieldNode.FieldDefinition)))
return false;

if (node is PropertyTreeNode propertyNode && (!propertyNode.IsPublicAPI || !IsAccessible(propertyNode.PropertyDefinition)))
return false;

if (node is MethodTreeNode methodNode && (!methodNode.IsPublicAPI || !IsAccessible(methodNode.MethodDefinition)))
if (node is MethodTreeNode methodNode && (!methodNode.IsPublicAPI || !IsAccessible(methodNode.MethodDefinition) || IsDelegateOrEnumMember(methodNode.MethodDefinition)))
return false;

if (node is NamespaceTreeNode namespaceNode && string.IsNullOrEmpty(namespaceNode.Name))
Expand All @@ -87,6 +87,20 @@ bool IsAccessible(IEntity entity)
}
}

bool IsDelegateOrEnumMember(IMember member)
{
if (member.DeclaringTypeDefinition == null)
return false;
switch (member.DeclaringTypeDefinition.Kind)
{
case TypeKind.Delegate:
case TypeKind.Enum:
return true;
default:
return false;
}
}

public void Execute(TextViewContext context)
{
if (context.SelectedTreeNodes != null)
Expand All @@ -102,19 +116,16 @@ public static void SearchMsdn(ILSpyTreeNode node)
{
var address = string.Empty;

var namespaceNode = node as NamespaceTreeNode;
if (namespaceNode != null)
if (node is NamespaceTreeNode namespaceNode)
{
address = string.Format(msdnAddress, namespaceNode.Name);

if (node is IMemberTreeNode memberNode)
}
else if (node is IMemberTreeNode memberNode)
{
var member = memberNode.Member;
var memberName = string.Empty;

if (member.DeclaringType == null)
memberName = member.FullName;
else
memberName = string.Format("{0}.{1}", member.DeclaringType.FullName, member.Name);
var memberName = member.ReflectionName.Replace('`', '-').Replace('+', '.');
if (memberName.EndsWith("..ctor", System.StringComparison.Ordinal))
memberName = memberName.Substring(0, memberName.Length - 5) + "-ctor";

address = string.Format(msdnAddress, memberName);
}
Expand Down