Skip to content

Commit b687a5c

Browse files
committed
Fix incremental step for aggregate diagnostics
1 parent 30a0c44 commit b687a5c

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/ObservablePropertyGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
using System.Collections.Generic;
65
using System.Collections.Immutable;
76
using System.Linq;
87
using System.Text;
@@ -51,7 +50,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
5150
.Where(static item => item.Hierarchy is not null);
5251

5352
// Output the diagnostics
54-
context.ReportDiagnostics(propertyInfoWithErrors.Select(static (item, _) => item.Info.Errors.AsImmutableArray()));
53+
context.ReportDiagnostics(propertyInfoWithErrors.Select(static (item, _) => item.Info.Errors));
5554

5655
// Get the filtered sequence to enable caching
5756
IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<PropertyInfo> Info)> propertyInfo =

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// See the LICENSE file in the project root for more information.
44

55
using System;
6-
using System.Collections.Generic;
76
using System.Collections.Immutable;
87
using System.Linq;
98
using System.Text;
@@ -92,7 +91,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
9291
.Where(static item => item is not null)!;
9392

9493
// Emit the diagnostic, if needed
95-
context.ReportDiagnostics(generationInfoWithErrors.Select(static (item, _) => item.Errors.AsImmutableArray()));
94+
context.ReportDiagnostics(generationInfoWithErrors.Select(static (item, _) => item.Errors));
9695

9796
// Get the filtered sequence to enable caching
9897
IncrementalValuesProvider<(HierarchyInfo Hierarchy, bool IsSealed, TInfo Info)> generationInfo =

CommunityToolkit.Mvvm.SourceGenerators/Extensions/DiagnosticsExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void ReportDiagnostics(this IncrementalGeneratorInitializationCont
6767
/// </summary>
6868
/// <param name="context">The input <see cref="IncrementalGeneratorInitializationContext"/> instance.</param>
6969
/// <param name="diagnostics">The input <see cref="IncrementalValuesProvider{TValues}"/> sequence of diagnostics.</param>
70-
public static void ReportDiagnostics(this IncrementalGeneratorInitializationContext context, IncrementalValuesProvider<ImmutableArray<DiagnosticInfo>> diagnostics)
70+
public static void ReportDiagnostics(this IncrementalGeneratorInitializationContext context, IncrementalValuesProvider<EquatableArray<DiagnosticInfo>> diagnostics)
7171
{
7272
context.RegisterSourceOutput(diagnostics, static (context, diagnostics) =>
7373
{

CommunityToolkit.Mvvm.SourceGenerators/Input/RelayCommandGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
4848
.Where(static item => item.Hierarchy is not null)!;
4949

5050
// Output the diagnostics
51-
context.ReportDiagnostics(commandInfoWithErrors.Select(static (item, _) => item.Info.Errors.AsImmutableArray()));
51+
context.ReportDiagnostics(commandInfoWithErrors.Select(static (item, _) => item.Info.Errors));
5252

5353
// Get the filtered sequence to enable caching
5454
IncrementalValuesProvider<(HierarchyInfo Hierarchy, Result<CommandInfo> Info)> commandInfo =

0 commit comments

Comments
 (0)