Remove leftover internal helpers and adjust visibility

Author: Sergio0694

CommunityToolkit.Mvvm.SourceGenerators/Diagnostics/DiagnosticExtensions.cs

@@ -16,38 +16,6 @@ namespace CommunityToolkit.Mvvm.SourceGenerators.Diagnostics;
 /// </summary>
 internal static class DiagnosticExtensions
 {
-    /// <summary>
-    /// Adds a new diagnostics to the current compilation.
-    /// </summary>
-    /// <param name="context">The <see cref="GeneratorExecutionContext"/> instance currently in use.</param>
-    /// <param name="descriptor">The input <see cref="DiagnosticDescriptor"/> for the diagnostics to create.</param>
-    /// <param name="symbol">The source <see cref="ISymbol"/> to attach the diagnostics to.</param>
-    /// <param name="args">The optional arguments for the formatted message to include.</param>
-    public static void ReportDiagnostic(
-        this GeneratorExecutionContext context,
-        DiagnosticDescriptor descriptor,
-        ISymbol symbol,
-        params object[] args)
-    {
-        context.ReportDiagnostic(Diagnostic.Create(descriptor, symbol.Locations.FirstOrDefault(), args));
-    }
-
-    /// <summary>
-    /// Adds a new diagnostics to the current compilation.
-    /// </summary>
-    /// <param name="context">The <see cref="GeneratorExecutionContext"/> instance currently in use.</param>
-    /// <param name="descriptor">The input <see cref="DiagnosticDescriptor"/> for the diagnostics to create.</param>
-    /// <param name="node">The source <see cref="SyntaxNode"/> to attach the diagnostics to.</param>
-    /// <param name="args">The optional arguments for the formatted message to include.</param>
-    public static void ReportDiagnostic(
-        this GeneratorExecutionContext context,
-        DiagnosticDescriptor descriptor,
-        SyntaxNode node,
-        params object[] args)
-    {
-        context.ReportDiagnostic(Diagnostic.Create(descriptor, node.GetLocation(), args));
-    }
-
     /// <summary>
     /// Adds a new diagnostics to the target builder.
     /// </summary>
@@ -64,22 +32,6 @@ public static void Add(
         diagnostics.Add(Diagnostic.Create(descriptor, symbol.Locations.FirstOrDefault(), args));
     }
 
-    /// <summary>
-    /// Adds a new diagnostics to the target builder.
-    /// </summary>
-    /// <param name="diagnostics">The collection of produced <see cref="Diagnostic"/> instances.</param>
-    /// <param name="descriptor">The input <see cref="DiagnosticDescriptor"/> for the diagnostics to create.</param>
-    /// <param name="node">The source <see cref="SyntaxNode"/> to attach the diagnostics to.</param>
-    /// <param name="args">The optional arguments for the formatted message to include.</param>
-    public static void Add(
-        this ImmutableArray<Diagnostic>.Builder diagnostics,
-        DiagnosticDescriptor descriptor,
-        SyntaxNode node,
-        params object[] args)
-    {
-        diagnostics.Add(Diagnostic.Create(descriptor, node.GetLocation(), args));
-    }
-
     /// <summary>
     /// Registers an output node into an <see cref="IncrementalGeneratorInitializationContext"/> to output diagnostics.
     /// </summary>
@@ -95,24 +47,4 @@ public static void ReportDiagnostics(this IncrementalGeneratorInitializationCont
             }
         });
     }
-
-    /// <summary>
-    /// Registers an output node into an <see cref="IncrementalGeneratorInitializationContext"/> to output diagnostics.
-    /// </summary>
-    /// <param name="context">The input <see cref="IncrementalGeneratorInitializationContext"/> instance.</param>
-    /// <param name="isSupported">An <see cref="IncrementalValueProvider{TValue}"/> instance indicating support for a feature.</param>
-    /// <param name="diagnostic">The <see cref="Diagnostic"/> to emit if <paramref name="isSupported"/> fails.</param>
-    public static void ReportDiagnosticsIsNotSupported(
-        this IncrementalGeneratorInitializationContext context,
-        IncrementalValueProvider<bool> isSupported,
-        Diagnostic diagnostic)
-    {
-        context.RegisterSourceOutput(isSupported, (context, isSupported) =>
-        {
-            if (!isSupported)
-            {
-                context.ReportDiagnostic(diagnostic);
-            }
-        });
-    }
 }

CommunityToolkit.Mvvm.SourceGenerators/Extensions/AttributeDataExtensions.cs

@@ -5,13 +5,9 @@
 // This file is ported and adapted from ComputeSharp (Sergio0694/ComputeSharp),
 // more info in ThirdPartyNotices.txt in the root of the project.
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Diagnostics.Contracts;
 using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Syntax;
-using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
 
 namespace CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 
@@ -120,76 +116,4 @@ static IEnumerable<T> Enumerate(IEnumerable<TypedConstant> constants)
 
         return Enumerate(attributeData.ConstructorArguments);
     }
-
-    /// <summary>
-    /// Creates an <see cref="AttributeSyntax"/> node that is equivalent to the input <see cref="AttributeData"/> instance.
-    /// </summary>
-    /// <param name="attributeData">The input <see cref="AttributeData"/> instance to process.</param>
-    /// <returns>An <see cref="AttributeSyntax"/> replicating the data in <paramref name="attributeData"/>.</returns>
-    public static AttributeSyntax AsAttributeSyntax(this AttributeData attributeData)
-    {
-        IdentifierNameSyntax attributeType = IdentifierName(attributeData.AttributeClass!.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
-        AttributeArgumentSyntax[] arguments =
-            attributeData.ConstructorArguments
-            .Select(static arg => AttributeArgument(ToExpression(arg))).Concat(
-                attributeData.NamedArguments
-                .Select(static arg =>
-                    AttributeArgument(ToExpression(arg.Value))
-                    .WithNameEquals(NameEquals(IdentifierName(arg.Key))))).ToArray();
-
-        return Attribute(attributeType, AttributeArgumentList(SeparatedList(SeparatedList(arguments))));
-
-        static ExpressionSyntax ToExpression(TypedConstant arg)
-        {
-            if (arg.IsNull)
-            {
-                return LiteralExpression(SyntaxKind.NullLiteralExpression);
-            }
-
-            if (arg.Kind == TypedConstantKind.Array)
-            {
-                string elementType = ((IArrayTypeSymbol)arg.Type!).ElementType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat);
-
-                return
-                    ArrayCreationExpression(
-                    ArrayType(IdentifierName(elementType))
-                    .AddRankSpecifiers(ArrayRankSpecifier(SingletonSeparatedList<ExpressionSyntax>(OmittedArraySizeExpression()))))
-                    .WithInitializer(InitializerExpression(SyntaxKind.ArrayInitializerExpression)
-                    .AddExpressions(arg.Values.Select(ToExpression).ToArray()));
-            }
-
-            switch ((arg.Kind, arg.Value))
-            {
-                case (TypedConstantKind.Primitive, string text):
-                    return LiteralExpression(SyntaxKind.StringLiteralExpression, Literal(text));
-                case (TypedConstantKind.Primitive, bool flag) when flag:
-                    return LiteralExpression(SyntaxKind.TrueLiteralExpression);
-                case (TypedConstantKind.Primitive, bool):
-                    return LiteralExpression(SyntaxKind.FalseLiteralExpression);
-                case (TypedConstantKind.Primitive, object value):
-                    return LiteralExpression(SyntaxKind.NumericLiteralExpression, value switch
-                    {
-                        byte b => Literal(b),
-                        char c => Literal(c),
-                        double d => Literal(d),
-                        float f => Literal(f),
-                        int i => Literal(i),
-                        long l => Literal(l),
-                        sbyte sb => Literal(sb),
-                        short sh => Literal(sh),
-                        uint ui => Literal(ui),
-                        ulong ul => Literal(ul),
-                        ushort ush => Literal(ush),
-                        _ => throw new ArgumentException()
-                    });
-                case (TypedConstantKind.Type, ITypeSymbol type):
-                    return TypeOfExpression(IdentifierName(type.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)));
-                case (TypedConstantKind.Enum, object value):
-                    return CastExpression(
-                        IdentifierName(arg.Type!.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat)),
-                        LiteralExpression(SyntaxKind.NumericLiteralExpression, ParseToken(value.ToString())));
-                default: throw new ArgumentException();
-            }
-        }
-    }
 }

CommunityToolkit.Mvvm.SourceGenerators/Extensions/IEqualityComparerExtensions.cs

@@ -30,7 +30,7 @@ public static IEqualityComparer<ImmutableArray<T>> ForImmutableArray<T>(this IEq
     /// <summary>
     /// An <see cref="IEqualityComparer{T}"/> implementation for an <see cref="ImmutableArray{T}"/> value.
     /// </summary>
-    public sealed class Comparer<T> : IEqualityComparer<ImmutableArray<T>>
+    private sealed class Comparer<T> : IEqualityComparer<ImmutableArray<T>>
     {
         /// <summary>
         /// The <typeparamref name="T"/> comparer.

CommunityToolkit.Mvvm.SourceGenerators/Extensions/INamedTypeSymbolExtensions.cs

@@ -13,11 +13,11 @@ namespace CommunityToolkit.Mvvm.SourceGenerators.Extensions;
 internal static class INamedTypeSymbolExtensions
 {
     /// <summary>
-    /// Gets the full metadata name for a given <see cref="INamedTypeSymbol"/> instance.
+    /// Gets a valid filename for a given <see cref="INamedTypeSymbol"/> instance.
     /// </summary>
     /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
-    /// <returns>The full metadata name for <paramref name="symbol"/>.</returns>
-    public static string GetFullMetadataName(this INamedTypeSymbol symbol)
+    /// <returns>The full metadata name for <paramref name="symbol"/> that is also a valid filename.</returns>
+    public static string GetFullMetadataNameForFileName(this INamedTypeSymbol symbol)
     {
         static StringBuilder BuildFrom(ISymbol? symbol, StringBuilder builder)
         {
@@ -33,17 +33,7 @@ static StringBuilder BuildFrom(ISymbol? symbol, StringBuilder builder)
             };
         }
 
-        return BuildFrom(symbol, new StringBuilder(256)).ToString();
-    }
-
-    /// <summary>
-    /// Gets a valid filename for a given <see cref="INamedTypeSymbol"/> instance.
-    /// </summary>
-    /// <param name="symbol">The input <see cref="INamedTypeSymbol"/> instance.</param>
-    /// <returns>The full metadata name for <paramref name="symbol"/> that is also a valid filename.</returns>
-    public static string GetFullMetadataNameForFileName(this INamedTypeSymbol symbol)
-    {
-        return symbol.GetFullMetadataName().Replace('`', '-').Replace('+', '.');
+        return BuildFrom(symbol, new StringBuilder(256)).ToString().Replace('`', '-').Replace('+', '.');
     }
 
     /// <summary>
@@ -68,27 +58,4 @@ public static bool InheritsFrom(this INamedTypeSymbol typeSymbol, string name)
 
         return false;
     }
-
-    /// <summary>
-    /// Checks whether or not a given <see cref="INamedTypeSymbol"/> inherits from a specified type.
-    /// </summary>
-    /// <param name="typeSymbol">The target <see cref="INamedTypeSymbol"/> instance to check.</param>
-    /// <param name="targetTypeSymbol">The type symbol of the type to check for inheritance.</param>
-    /// <returns>Whether or not <paramref name="typeSymbol"/> inherits from <paramref name="targetTypeSymbol"/>.</returns>
-    public static bool InheritsFrom(this INamedTypeSymbol typeSymbol, INamedTypeSymbol targetTypeSymbol)
-    {
-        INamedTypeSymbol? baseType = typeSymbol.BaseType;
-
-        while (baseType != null)
-        {
-            if (SymbolEqualityComparer.Default.Equals(baseType, targetTypeSymbol))
-            {
-                return true;
-            }
-
-            baseType = baseType.BaseType;
-        }
-
-        return false;
-    }
 }

CommunityToolkit.Mvvm.SourceGenerators/Extensions/IncrementalValuesProviderExtensions.cs

@@ -97,7 +97,7 @@ internal static class IncrementalValuesProviderExtensions
     /// <summary>
     /// An <see cref="IEqualityComparer{T}"/> implementation for a value tuple.
     /// </summary>
-    public sealed class Comparer<TLeft, TRight> : IEqualityComparer<(TLeft Left, TRight Right)>
+    private sealed class Comparer<TLeft, TRight> : IEqualityComparer<(TLeft Left, TRight Right)>
     {
         /// <summary>
         /// The <typeparamref name="TLeft"/> comparer.
@@ -140,7 +140,7 @@ public int GetHashCode((TLeft Left, TRight Right) obj)
     /// <summary>
     /// An <see cref="IEqualityComparer{T}"/> implementation for a value tuple.
     /// </summary>
-    public sealed class Comparer<T1, T2, T3> : IEqualityComparer<(T1, T2, T3)>
+    private sealed class Comparer<T1, T2, T3> : IEqualityComparer<(T1, T2, T3)>
     {
         /// <summary>
         /// The <typeparamref name="T1"/> comparer.