Lift restriction TTRESG052 (Types are now allowed inside generic types)

Author: PawelGerr

docs

@@ -42,7 +42,6 @@ public sealed class ThinktectureRuntimeExtensionsAnalyzer : DiagnosticAnalyzer
       DiagnosticsDescriptors.ExplicitEqualityComparerWithoutComparer,
       DiagnosticsDescriptors.MethodWithUseDelegateFromConstructorMustBePartial,
       DiagnosticsDescriptors.MethodWithUseDelegateFromConstructorMustNotHaveGenerics,
-      DiagnosticsDescriptors.TypeMustNotBeInsideGenericType,
       DiagnosticsDescriptors.UnionDerivedTypesMustNotBeGeneric,
       DiagnosticsDescriptors.UnionMustBeSealedOrHavePrivateConstructorsOnly,
       DiagnosticsDescriptors.UnionRecordMustBeSealed,
@@ -798,7 +797,6 @@ private static void ValidateCustomKeyMemberImplementation(
 
       CheckConstructors(context, type, mustBePrivate: false, canHavePrimaryConstructor: false);
       TypeMustBePartial(context, type);
-      TypeMustNotBeInsideGenericType(context, type, tdsLocation);
 
       var assignableMembers = type.GetAssignableFieldsAndPropertiesAndCheckForReadOnly(factory, false, true, context.CancellationToken, context)
                                   .Where(m => !m.IsStatic)
@@ -1052,7 +1050,6 @@ private static void ValidateSmartEnum(
 
       CheckConstructors(context, enumType, mustBePrivate: true, canHavePrimaryConstructor: false);
       TypeMustBePartial(context, enumType);
-      TypeMustNotBeInsideGenericType(context, enumType, tdsLocation);
 
       var items = enumType.GetEnumItems();
 
@@ -1114,12 +1111,6 @@ private static void TypeMustNotBeGeneric(SymbolAnalysisContext context, INamedTy
       }
    }
 
-   private static void TypeMustNotBeInsideGenericType(SymbolAnalysisContext context, INamedTypeSymbol type, Location tdsLocation)
-   {
-      if (type.IsNestedInGenericClass())
-         ReportDiagnostic(context, DiagnosticsDescriptors.TypeMustNotBeInsideGenericType, tdsLocation, BuildTypeName(type));
-   }
-
    private static void Check_ItemLike_StaticProperties(
       SymbolAnalysisContext context,
       INamedTypeSymbol enumType)

src/Thinktecture.Runtime.Extensions.Analyzers/CodeAnalysis/Diagnostics/ThinktectureRuntimeExtensionsAnalyzer.cs

@@ -397,7 +397,7 @@ private static SeparatedSyntaxList<ParameterSyntax> BuildMultipleParameters(int
                                                      .WithTrailingTrivia(SyntaxFactory.Space);
          }
 
-         var name = i == 0 ? "state" : "x";
+         var name = i == 0 ? Constants.Parameters.STATE : "x";
          nodesAndTokens[i * 2] = SyntaxFactory.Parameter(SyntaxFactory.Identifier(name));
       }
 

src/Thinktecture.Runtime.Extensions.Refactorings/CodeAnalysis/Refactorings/SwitchMapCompletionRefactoringProvider.cs

@@ -2,3 +2,9 @@
 
  Rule ID | Category | Severity | Notes
 ---------|----------|----------|-------
+
+### Removed Rules
+
+ Rule ID | Category | Severity | Notes
+---------|----------|----------|-------
+TTRESG052 | Thinktecture.Runtime.Extensions | Error | Types are now allowed inside generic types

src/Thinktecture.Runtime.Extensions.Roslyn.Sources/AnalyzerReleases.Unshipped.md

@@ -28,7 +28,6 @@ internal static class DiagnosticsDescriptors
    public static readonly DiagnosticDescriptor ComplexValueObjectWithStringMembersNeedsDefaultEqualityComparer = new("TTRESG049", "Complex Value Object with string members needs equality comparer", "Complex Value Object with string members needs equality comparer. Use 'DefaultStringComparison' to define the comparer. Example: [ComplexValueObject(DefaultStringComparison = StringComparison.OrdinalIgnoreCase)].", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Warning, true);
    public static readonly DiagnosticDescriptor MethodWithUseDelegateFromConstructorMustBePartial = new("TTRESG050", $"Method with '{Constants.Attributes.UseDelegateFromConstructor.NAME}' must be partial", $"The method '{{0}}' with '{Constants.Attributes.UseDelegateFromConstructor.NAME}' must be marked as partial", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);
    public static readonly DiagnosticDescriptor MethodWithUseDelegateFromConstructorMustNotHaveGenerics = new("TTRESG051", $"Method with '{Constants.Attributes.UseDelegateFromConstructor.NAME}' must not have generics", $"The method '{{0}}' with '{Constants.Attributes.UseDelegateFromConstructor.NAME}' must not have generic type parameters. Use inheritance approach instead.", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);
-   public static readonly DiagnosticDescriptor TypeMustNotBeInsideGenericType = new("TTRESG052", "The type must not be inside generic type", "Type '{0}' must not be inside a generic type", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);
    public static readonly DiagnosticDescriptor UnionDerivedTypesMustNotBeGeneric = new("TTRESG053", "Derived type of a union must not be generic", "Derived type '{0}' of a union must not be generic", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);
    public static readonly DiagnosticDescriptor UnionMustBeSealedOrHavePrivateConstructorsOnly = new("TTRESG054", "Discriminated union must be sealed or have private constructors only", "Discriminated union '{0}' must be sealed or have private constructors only", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);
    public static readonly DiagnosticDescriptor UnionRecordMustBeSealed = new("TTRESG055", "Discriminated union implemented using a record must be sealed", "Discriminated union '{0}' using a record must be sealed. Use a class for nesting unions.", Constants.ANALYZER_CATEGORY, DiagnosticSeverity.Error, true);

src/Thinktecture.Runtime.Extensions.Roslyn.Sources/CodeAnalysis/DiagnosticsDescriptors.cs

@@ -106,21 +106,6 @@ public static ImmutableArray<ContainingTypeState> GetContainingTypes(
       return types.DrainToImmutable();
    }
 
-   public static bool IsNestedInGenericClass(this INamedTypeSymbol type)
-   {
-      var containingType = type.ContainingType;
-
-      while (containingType is not null)
-      {
-         if (containingType.Arity > 0)
-            return true;
-
-         containingType = containingType.ContainingType;
-      }
-
-      return false;
-   }
-
    public static bool HasLowerAccessibility(
       this INamedTypeSymbol type,
       Accessibility accessibility,

src/Thinktecture.Runtime.Extensions.Roslyn.Sources/Extensions/NamedTypeSymbolExtensions.cs

@@ -43,7 +43,7 @@ namespace ").Append(_state.Namespace).Append(@";
 
       _sb.RenderContainingTypesStart(_state.ContainingTypes);
 
-      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty;
+      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty || _state.ContainingTypes.Any(ct => !ct.GenericParameters.IsDefaultOrEmpty);
 
       if (hasGenerics)
       {
@@ -93,14 +93,11 @@ private void GenerateFactory(string keyType, bool isString)
    public override bool CanConvert(global::System.Type typeToConvert)
    {");
 
-      if (!_state.GenericParameters.IsDefaultOrEmpty)
-      {
-         _sb.Append(@"
+      _sb.Append(@"
       if (!typeToConvert.IsGenericType || typeToConvert.IsGenericTypeDefinition)
          return false;
 
       return typeof(").AppendTypeFullyQualifiedWithoutGenerics(_state, _state.ContainingTypes).AppendGenericTypeParameters(_state, constructOpenGeneric: true).Append(") == typeToConvert.GetGenericTypeDefinition();");
-      }
 
       _sb.Append(@"
    }
@@ -114,39 +111,36 @@ public override bool CanConvert(global::System.Type typeToConvert)
          throw new global::System.ArgumentNullException(nameof(options));
 ");
 
-      if (!_state.GenericParameters.IsDefaultOrEmpty)
+      if (_state.UseSpanBasedJsonConverter)
       {
-         if (_state.UseSpanBasedJsonConverter)
-         {
-            _sb.Append(@"
+         _sb.Append(@"
 #if NET9_0_OR_GREATER
       var converterType = typeof(global::Thinktecture.Text.Json.Serialization.ThinktectureSpanParsableJsonConverter<,>).MakeGenericType(typeToConvert, typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append(@"));
 #else
       var converterType = typeof(global::Thinktecture.Text.Json.Serialization.ThinktectureJsonConverter<,>).MakeGenericType(typeToConvert, typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append(@"));
 #endif");
+      }
+      else
+      {
+         _sb.Append(@"
+      var converterType = typeof(global::Thinktecture.Text.Json.Serialization.");
+
+         if (isString)
+         {
+            _sb.Append("ThinktectureJsonConverter<,>).MakeGenericType(typeToConvert, typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append("))");
          }
          else
          {
-            _sb.Append(@"
-      var converterType = typeof(global::Thinktecture.Text.Json.Serialization.");
-
-            if (isString)
-            {
-               _sb.Append("ThinktectureJsonConverter<,>).MakeGenericType(typeToConvert, typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append("))");
-            }
-            else
-            {
-               _sb.Append("ThinktectureJsonConverter<,,>).MakeGenericType(typeToConvert, typeof(").Append(keyType).Append("), typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append("))");
-            }
-
-            _sb.Append(";");
+            _sb.Append("ThinktectureJsonConverter<,,>).MakeGenericType(typeToConvert, typeof(").Append(keyType).Append("), typeof(").AppendTypeFullyQualified(_state.AttributeInfo.ValidationError).Append("))");
          }
 
-         _sb.Append(@"
+         _sb.Append(";");
+      }
+
+      _sb.Append(@"
 
       return (global::System.Text.Json.Serialization.JsonConverter?)global::System.Activator.CreateInstance(converterType, options)
          ?? throw new global::System.Exception($""Could not create an instance of json converter of type \""{converterType.FullName}\""."");");
-      }
 
       _sb.Append(@"
    }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/KeyedJsonCodeGenerator.cs

@@ -38,7 +38,7 @@ namespace ").Append(_state.Namespace).Append(@";
 
       _sb.RenderContainingTypesStart(_state.ContainingTypes);
 
-      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty;
+      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty || _state.ContainingTypes.Any(ct => !ct.GenericParameters.IsDefaultOrEmpty);
 
       _sb.Append(@"
 [global::MessagePack.MessagePackFormatter(typeof(");

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/KeyedMessagePackCodeGenerator.cs

@@ -38,7 +38,7 @@ namespace ").Append(_state.Namespace).Append(@";
 
       _sb.RenderContainingTypesStart(_state.ContainingTypes);
 
-      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty;
+      var hasGenerics = !_state.GenericParameters.IsDefaultOrEmpty || _state.ContainingTypes.Any(ct => !ct.GenericParameters.IsDefaultOrEmpty);
 
       _sb.Append(@"
 [global::Newtonsoft.Json.JsonConverterAttribute(typeof(");
@@ -81,14 +81,11 @@ public override bool CanConvert(global::System.Type objectType)
       objectType = global::System.Nullable.GetUnderlyingType(objectType) ?? objectType;
 ");
 
-      if (!_state.GenericParameters.IsDefaultOrEmpty)
-      {
-         _sb.Append(@"
+      _sb.Append(@"
       if (!objectType.IsGenericType || objectType.IsGenericTypeDefinition)
          return false;
 
       return typeof(").AppendTypeFullyQualifiedWithoutGenerics(_state, _state.ContainingTypes).AppendGenericTypeParameters(_state, constructOpenGeneric: true).Append(@") == objectType.GetGenericTypeDefinition();");
-      }
 
       _sb.Append(@"
    }

src/Thinktecture.Runtime.Extensions.SourceGenerator/CodeAnalysis/KeyedNewtonsoftJsonCodeGenerator.cs

@@ -48,7 +48,7 @@ namespace ").Append(_state.Namespace).Append(@"
 
    private void GenerateEnum(CancellationToken cancellationToken)
    {
-      var isGeneric = !_state.GenericParameters.IsDefaultOrEmpty;
+      var isGeneric = !_state.GenericParameters.IsDefaultOrEmpty || _state.ContainingTypes.Any(ct => !ct.GenericParameters.IsDefaultOrEmpty);
 
       if (_state.KeyMember is not null && !isGeneric)
       {