Browse Source

Fix display of generic type parameters of local functions in tooltips

pull/2077/head
Siegfried Pammer 5 years ago
parent
commit
33bc9fbef4
  1. 2
      ICSharpCode.Decompiler.Tests/TestCases/Pretty/LocalFunctions.cs
  2. 4
      ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs

2
ICSharpCode.Decompiler.Tests/TestCases/Pretty/LocalFunctions.cs

@ -41,7 +41,7 @@ namespace LocalFunctions @@ -41,7 +41,7 @@ namespace LocalFunctions
#if CS90
[My]
[return: My]
int NonStaticMethod6<T3>([My] int unused)
int NonStaticMethod6<[My] T3>([My] int unused)
#else
int NonStaticMethod6<T3>(int unused)
#endif

4
ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpAmbience.cs

@ -104,7 +104,7 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor @@ -104,7 +104,7 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
if (symbol is ITypeDefinition)
WriteTypeDeclarationName((ITypeDefinition)symbol, writer, formattingPolicy);
else if (symbol is IMember && !(symbol is LocalFunctionMethod))
else if (symbol is IMember)
WriteMemberDeclarationName((IMember)symbol, writer, formattingPolicy);
else
writer.WriteIdentifier(Identifier.Create(symbol.Name));
@ -223,7 +223,7 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor @@ -223,7 +223,7 @@ namespace ICSharpCode.Decompiler.CSharp.OutputVisitor
{
TypeSystemAstBuilder astBuilder = CreateAstBuilder();
EntityDeclaration node = astBuilder.ConvertEntity(member);
if ((ConversionFlags & ConversionFlags.ShowDeclaringType) == ConversionFlags.ShowDeclaringType && member.DeclaringType != null) {
if ((ConversionFlags & ConversionFlags.ShowDeclaringType) == ConversionFlags.ShowDeclaringType && member.DeclaringType != null && !(member is LocalFunctionMethod)) {
ConvertType(member.DeclaringType, writer, formattingPolicy);
writer.WriteToken(Roles.Dot, ".");
}

Loading…
Cancel
Save