Renamed attribute to avoid issues with MS version

Author: distantcam

readme.md

@@ -105,15 +105,15 @@ public PostConstructMethod(IService service)
 
 ### Keyed Services
 
-When using `Microsoft.Extensions.DependencyInjection` you can mark fields and properties with `[FromKeyedServicesAttribute]` and it will be included in the constructor.
+When using `Microsoft.Extensions.DependencyInjection` you can mark fields and properties with `[AutoKeyedService]` and it will be included in the constructor.
 
 <!-- snippet: KeyedService -->
 <a id='snippet-KeyedService'></a>
 ```cs
 [AutoConstruct]
 public partial class KeyedExampleClass
 {
-    [FromKeyedServices("key")]
+    [AutoKeyedService("key")]
     private readonly IService _keyedService;
 }
 ```

readme.source.md

@@ -37,7 +37,7 @@ snippet: PostConstructGeneratedCode
 
 ### Keyed Services
 
-When using `Microsoft.Extensions.DependencyInjection` you can mark fields and properties with `[FromKeyedServicesAttribute]` and it will be included in the constructor.
+When using `Microsoft.Extensions.DependencyInjection` you can mark fields and properties with `[AutoKeyedService]` and it will be included in the constructor.
 
 snippet: KeyedService
 

src/AutoCtor.Attributes/AutoConstructAttribute.cs

@@ -26,4 +26,4 @@ public sealed class AutoConstructIgnoreAttribute : Attribute;
 
 [AttributeUsage(Field | Property | Parameter, Inherited = false)]
 [Conditional("AUTOCTOR_USAGES")]
-public sealed class FromKeyedServicesAttribute(object? key) : Attribute;
+public sealed class AutoKeyedServiceAttribute(object? key) : Attribute;

src/AutoCtor.Example/BasicExamples.cs

@@ -99,7 +99,7 @@ public partial class PropertyExamples
 [AutoConstruct]
 public partial class KeyedExampleClass
 {
-    [FromKeyedServices("key")]
+    [AutoKeyedService("key")]
     private readonly IService _keyedService;
 }
 

src/AutoCtor.Shared/Helpers/CodeBuilder.InterpolatedStringHandler.cs

@@ -52,9 +52,8 @@ private void AppendCommaSeparated(IEnumerable<string> items)
 
     private void AppendCommaIndented(IEnumerable<string> items)
     {
-        var count = items.Count();
-
-        if (count < 3)
+        var length = items.Sum(s => s.Length);
+        if (length < 60)
         {
             AppendCommaSeparated(items);
             return;

src/AutoCtor.Shared/Helpers/GeneratorUtilities.cs

@@ -77,7 +77,8 @@ public static bool IsMethodDeclaration(SyntaxNode node, CancellationToken cancel
     public static string? GetServiceKey(ISymbol symbol)
     {
         var keyedService = symbol.GetAttributes()
-            .Where(a => a.AttributeClass?.ToDisplayString() == AttributeNames.FromKeyedServices)
+            .Where(a => a.AttributeClass?.ToDisplayString() == AttributeNames.AutoKeyedService
+                || a.AttributeClass?.ToDisplayString() == "Microsoft.Extensions.DependencyInjection.FromKeyedServicesAttribute")
             .FirstOrDefault();
 
         if (keyedService != null)

src/AutoCtor.Shared/Models/AttributeNames.cs

@@ -3,5 +3,5 @@
     public const string AutoConstruct = "AutoCtor.AutoConstructAttribute";
     public const string AutoPostConstruct = "AutoCtor.AutoPostConstructAttribute";
     public const string AutoConstructIgnore = "AutoCtor.AutoConstructIgnoreAttribute";
-    public const string FromKeyedServices = "AutoCtor.FromKeyedServicesAttribute";
+    public const string AutoKeyedService = "AutoCtor.AutoKeyedServiceAttribute";
 }

src/AutoCtor.Tests/Examples/BaseTest.ExamplesGeneratedCode#TheClass.g.verified.cs

@@ -9,11 +9,7 @@ partial class TheClass
 {
 	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute]
 	[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-	public TheClass(
-		int number,
-		string text,
-		bool flag
-	) : base(number, text)
+	public TheClass(int number, string text, bool flag) : base(number, text)
 	{
 		this._flag = flag;
 	}

src/AutoCtor.Tests/Examples/FriendlyParameterNamesTest.ExamplesGeneratedCode#FriendlyParameterNamesTest.g.verified.cs

@@ -9,11 +9,7 @@ partial class FriendlyParameterNamesTest
 {
 	[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute]
 	[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-	public FriendlyParameterNamesTest(
-		int underscorePrefix,
-		int camelCase,
-		int PascalCase
-	)
+	public FriendlyParameterNamesTest(int underscorePrefix, int camelCase, int PascalCase)
 	{
 		this._underscorePrefix = underscorePrefix;
 		this.camelCase = camelCase;

src/AutoCtor.Tests/Examples/InheritanceTest.ExamplesGeneratedCode#A.g.verified.cs

@@ -15,12 +15,7 @@ public A(
 		global::IServiceC serviceC,
 		global::IServiceB serviceB,
 		global::IServiceA serviceA
-	) : base(
-		serviceE,
-		serviceD,
-		serviceC,
-		serviceB
-	)
+	) : base(serviceE, serviceD, serviceC, serviceB)
 	{
 		this._serviceA = serviceA;
 	}