Skip to content

Add [field:] and [property:] support for [RelayCommand] methods #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sergio0694 merged 6 commits into from
Mar 9, 2023
Merged

Add [field:] and [property:] support for [RelayCommand] methods #630

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b8ee5a
Add SymbolInfoExtensions extensions, minor code tweaks
Sergio0694 Mar 8, 2023
1320475
Add support for forwarded field/property command attributes
Sergio0694 Mar 8, 2023
41100e2
Add SyntaxTokenExtensions, minor code refactoring
Sergio0694 Mar 8, 2023
476a163
Add RelayCommandAttributeWithFieldOrPropertyTargetDiagnosticSuppressor
Sergio0694 Mar 8, 2023
fd7fa69
Add unit tests for forwarded [RelayCommand] attributes
Sergio0694 Mar 8, 2023
13ce990
Remove SingleOrDefault() use in SymbolInfo extension
Sergio0694 Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Remove SingleOrDefault() use in SymbolInfo extension
  • Loading branch information
@Sergio0694
Sergio0694 committed Mar 8, 2023
commit 13ce99005a05487e593f72bb122713318a567944
13 changes: 10 additions & 3 deletions src/CommunityToolkit.Mvvm.SourceGenerators/Extensions/SymbolInfoExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// See the LICENSE file in the project root for more information.

using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Microsoft.CodeAnalysis;

namespace CommunityToolkit.Mvvm.SourceGenerators.Extensions;
Expand All @@ -26,8 +25,16 @@ internal static class SymbolInfoExtensions
/// </remarks>
public static bool TryGetAttributeTypeSymbol(this SymbolInfo symbolInfo, [NotNullWhen(true)] out INamedTypeSymbol? typeSymbol)
{
if ((symbolInfo.Symbol ?? symbolInfo.CandidateSymbols.SingleOrDefault()) is not ISymbol attributeSymbol ||
(attributeSymbol as INamedTypeSymbol ?? attributeSymbol.ContainingType) is not INamedTypeSymbol resultingSymbol)
ISymbol? attributeSymbol = symbolInfo.Symbol;

// If no symbol is selected and there is a single candidate symbol, use that
if (attributeSymbol is null && symbolInfo.CandidateSymbols is [ISymbol candidateSymbol])
{
attributeSymbol = candidateSymbol;
}

// Extract the symbol from either the current one or the containing type
if ((attributeSymbol as INamedTypeSymbol ?? attributeSymbol?.ContainingType) is not INamedTypeSymbol resultingSymbol)
{
typeSymbol = null;

Expand Down