Skip to content

Filter nested types properly #66

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

Open
MichalPetryka wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Filter nested types properly #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions Disasmo/Utils/SymbolUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,10 @@ public static DisasmoSymbolInfo FromSymbol(ISymbol symbol)
string prefix = "";
ISymbol containingType = symbol as ITypeSymbol ?? symbol.ContainingType;

// match all for nested types
if (containingType.ContainingType is { })
prefix = "*";

else if (containingType.ContainingNamespace?.Name is { Length: > 0 } containingNamespace)
if (containingType.ContainingNamespace?.MetadataName is { Length: > 0 } containingNamespace)
prefix = containingNamespace + ".";

prefix += containingType.MetadataName;

if (containingType is INamedTypeSymbol { IsGenericType: true })
prefix += "*";
prefix += GetTypeNameFilter(containingType);

if (symbol is IMethodSymbol ms)
{
Expand Down Expand Up @@ -61,5 +54,15 @@ public static DisasmoSymbolInfo FromSymbol(ISymbol symbol)
methodName = "*";
}
return new DisasmoSymbolInfo(target, hostType, methodName);

static string GetTypeNameFilter(ISymbol type)
{
string filter = type.MetadataName;
if (type is INamedTypeSymbol { IsGenericType: true })
filter += "*";
if (type.ContainingType is { } containingType)
filter = $"{GetTypeNameFilter(containingType)}+{filter}";
return filter;
}
}
}