Calculate TypeParameterKind based on the container type (dotnet#54104)

MykolaBalakin · Jun 23, 2021 · 070feb0 · 070feb0
1 parent 8b768a1
commit 070feb0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/...ompilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs b/...ompilers/CSharp/Portable/Symbols/Synthesized/SynthesizedSubstitutedTypeParameterSymbol.cs
@@ -30,6 +30,8 @@ public override bool IsImplicitlyDeclared
  get { return true; }
  }
 
+ public override TypeParameterKind TypeParameterKind => ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : TypeParameterKind.Type;
+
  internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
  {
  base.AddSynthesizedAttributes(moduleBuilder, ref attributes);

diff --git a/...ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs b/...ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.cs
@@ -45,7 +45,7 @@ public override int Ordinal
 
  public override TypeParameterKind TypeParameterKind
  {
- get { return TypeParameterKind.Type; }
+ get { return ContainingSymbol is MethodSymbol ? TypeParameterKind.Method : TypeParameterKind.Type; }
  }
 
  public override bool HasConstructorConstraint

diff --git a/...ssionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb b/...ssionEvaluator/VisualBasic/Source/ExpressionCompiler/Symbols/SimpleTypeParameterSymbol.vb
@@ -42,7 +42,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ExpressionEvaluator
 
  Public Overrides ReadOnly Property TypeParameterKind As TypeParameterKind
  Get
- Return TypeParameterKind.Type
+ Return If(TypeOf Me.ContainingSymbol Is MethodSymbol, TypeParameterKind.Method, TypeParameterKind.Type)
  End Get
  End Property