Skip to content

Commit 381cb19

Browse files
Poker-sangPoker-sang
committed
fix type
1 parent 123f151 commit 381cb19

File tree

4 files changed

+77
-39
lines changed

4 files changed

+77
-39
lines changed

‎CommunityToolkit.Tooling.SampleGen.Tests/ToolkitSampleGeneratedPaneTests.cs‎

Lines changed: 33 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ public void PaneOption_GeneratesEnumProperty()
9191
namespace MyApp
9292
{
9393
[ToolkitSampleEnumOption<Windows.UI.Xaml.Controls.Visibility>("MyVisibility", Title = "Visibility")]
94-
9594
[ToolkitSample(id: nameof(Sample), "Test Sample", description: "")]
9695
public partial class Sample : Windows.UI.Xaml.Controls.UserControl
9796
{
@@ -123,24 +122,35 @@ public enum Visibility { Visible = 3, Collapsed = 7 }
123122
result.AssertDiagnosticsAre();
124123
result.AssertNoCompilationErrors();
125124

126-
Assert.AreEqual(result.Compilation.GetFileContentsByName("ToolkitSampleRegistry.g.cs"), """
125+
Assert.AreEqual("""
127126
#nullable enable
128127
namespace CommunityToolkit.Tooling.SampleGen;
129128
130129
public static class ToolkitSampleRegistry
131130
{
132131
public static System.Collections.Generic.Dictionary<string, CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata> Listing { get; } = new()
133132
{
134-
["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null, new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[] { new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMultiChoiceOptionMetadataViewModel(name: "MyVisibility", options: new[] { new CommunityToolkit.Tooling.SampleGen.Attributes.MultiChoiceOption("Visible", 3),new CommunityToolkit.Tooling.SampleGen.Attributes.MultiChoiceOption("Collapsed", 7) }, title: "Visibility") })
133+
["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null,
134+
new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[]
135+
{
136+
new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMultiChoiceOptionMetadataViewModel(name: "MyVisibility",
137+
options: new[]
138+
{
139+
new CommunityToolkit.Tooling.SampleGen.Attributes.MultiChoiceOption("Visible", Windows.UI.Xaml.Controls.Visibility.Visible),
140+
new CommunityToolkit.Tooling.SampleGen.Attributes.MultiChoiceOption("Collapsed", Windows.UI.Xaml.Controls.Visibility.Collapsed)
141+
}, title: "Visibility")
142+
})
135143
};
136144
}
137-
""", "Unexpected code generated");
145+
""",
146+
result.Compilation.GetFileContentsByName("ToolkitSampleRegistry.g.cs"),
147+
"Unexpected code generated");
138148
}
139149

140150
[TestMethod]
141151
public void PaneOption_GeneratesTitleProperty()
142152
{
143-
// The sample registry is designed to be declared in the sample project, and generated in the project head where its displayed in the UI as data.
153+
// The sample registry is designed to be declared in the sample project, and generated in the project head where it's displayed in the UI as data.
144154
// To test the contents of the generated sample registry, we must replicate this setup.
145155
var sampleProjectAssembly = """
146156
using System.ComponentModel;
@@ -153,9 +163,7 @@ namespace MyApp
153163
[ToolkitSample(id: nameof(Sample), "Test Sample", description: "")]
154164
public partial class Sample : Windows.UI.Xaml.Controls.UserControl
155165
{
156-
public Sample()
157-
{
158-
}
166+
public Sample() { }
159167
}
160168
}
161169
@@ -179,18 +187,24 @@ public class UserControl { }
179187
result.AssertDiagnosticsAre();
180188
result.AssertNoCompilationErrors();
181189

182-
Assert.AreEqual(result.Compilation.GetFileContentsByName("ToolkitSampleRegistry.g.cs"), """
183-
#nullable enable
184-
namespace CommunityToolkit.Tooling.SampleGen;
185-
186-
public static class ToolkitSampleRegistry
187-
{
188-
public static System.Collections.Generic.Dictionary<string, CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata> Listing { get; } = new()
190+
Assert.AreEqual("""
191+
#nullable enable
192+
namespace CommunityToolkit.Tooling.SampleGen;
193+
194+
public static class ToolkitSampleRegistry
189195
{
190-
["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null, new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[] { new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleNumericOptionMetadataViewModel(name: "TextSize", initial: 12, min: 8, max: 48, step: 2, showAsNumberBox: false, title: "FontSize") })
191-
};
192-
}
193-
""", "Unexpected code generated");
196+
public static System.Collections.Generic.Dictionary<string, CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata> Listing { get; } = new()
197+
{
198+
["Sample"] = new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleMetadata("Sample", "Test Sample", "", typeof(MyApp.Sample), () => new MyApp.Sample(), null, null,
199+
new CommunityToolkit.Tooling.SampleGen.Metadata.IGeneratedToolkitSampleOptionViewModel[]
200+
{
201+
new CommunityToolkit.Tooling.SampleGen.Metadata.ToolkitSampleNumericOptionMetadataViewModel(name: "TextSize", initial: 12, min: 8, max: 48, step: 2, showAsNumberBox: false, title: "FontSize")
202+
})
203+
};
204+
}
205+
""",
206+
result.Compilation.GetFileContentsByName("ToolkitSampleRegistry.g.cs"),
207+
"Unexpected code generated");
194208
}
195209

196210
[TestMethod]

‎CommunityToolkit.Tooling.SampleGen/Attributes/ToolkitSampleMultiChoiceOptionAttribute.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ public ToolkitSampleMultiChoiceOptionAttribute(string bindingName, params string
4040
/// Creates a new instance of <see cref="ToolkitSampleMultiChoiceOptionAttribute"/>.
4141
/// </summary>
4242
/// <param name="bindingName">The name of the generated property, which you can bind to in XAML.</param>
43+
/// <param name="typeName"></param>
4344
/// <param name="choices">A list of the choices to display to the user. Can be literal values, or labeled values. Use a " : " separator (single colon surrounded by at least 1 whitespace) to separate a label from a value.</param>
44-
public ToolkitSampleMultiChoiceOptionAttribute(string bindingName, List<(string, object)> choices)
45+
internal ToolkitSampleMultiChoiceOptionAttribute(string bindingName, string typeName, MultiChoiceOption[] choices)
4546
: base(bindingName, null)
4647
{
47-
TypeName = "int";
48-
Choices = choices.Select(x => new MultiChoiceOption(x.Item1, x.Item2)).ToArray();
48+
TypeName = typeName;
49+
Choices = choices;
4950
}
5051

5152
/// <summary>

‎CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Sample.cs‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,12 @@ void Execute(IncrementalValuesProvider<ISymbol> types, bool skipDiagnostics = fa
6868
if (x.AttributeData.AttributeClass.TypeArguments.FirstOrDefault() is { } typeSymbol)
6969
{
7070
var parameters = x.AttributeData.ConstructorArguments.Select(GeneratorExtensions.PrepareParameterTypeForActivator).ToList();
71-
var members = typeSymbol.GetMembers().OfType<IFieldSymbol>().Select(t => (t.Name, t.ConstantValue!)).ToList();
71+
var members = typeSymbol.GetMembers().OfType<IFieldSymbol>().Select(t => new MultiChoiceOption(t.Name, t.ToDisplayString())).ToArray();
72+
parameters.Add(typeSymbol.ToDisplayString());
7273
parameters.Add(members);
73-
var multiChoiceOptionAttribute = (ToolkitSampleMultiChoiceOptionAttribute)Activator.CreateInstance(typeof(ToolkitSampleMultiChoiceOptionAttribute), parameters.ToArray());
74+
var multiChoiceOptionAttribute = (ToolkitSampleMultiChoiceOptionAttribute)Activator.CreateInstance(
75+
typeof(ToolkitSampleMultiChoiceOptionAttribute), BindingFlags.NonPublic | BindingFlags.Instance,
76+
null, parameters.ToArray(), null);
7477
item = (x.Symbol, multiChoiceOptionAttribute);
7578
}
7679
}
@@ -298,7 +301,7 @@ private static void ReportGeneratedMultiChoiceOptionsPaneDiagnostics(SourceProdu
298301
{
299302
foreach (var item in generatedOptionPropertyData)
300303
{
301-
if (item.Item2 is ToolkitSampleMultiChoiceOptionAttribute multiChoiceAttr && multiChoiceAttr.Choices.Length == 0)
304+
if (item.Item2 is ToolkitSampleMultiChoiceOptionAttribute { Choices.Length: 0 })
302305
{
303306
ctx.ReportDiagnostic(Diagnostic.Create(DiagnosticDescriptors.SamplePaneMultiChoiceOptionWithNoChoices, item.Item1.Locations.FirstOrDefault(), item.Item2.Title));
304307
}
@@ -315,7 +318,7 @@ public static class ToolkitSampleRegistry
315318
{
316319
public static System.Collections.Generic.Dictionary<string, {{typeof(ToolkitSampleMetadata).FullName}}> Listing { get; } = new()
317320
{
318-
{{string.Join(",\n ", sampleMetadata.Select(MetadataToRegistryCall).ToArray())}}
321+
{{string.Join(",\n", sampleMetadata.Select(MetadataToRegistryCall).ToArray())}}
319322
};
320323
}
321324
""";
@@ -326,11 +329,16 @@ private static string MetadataToRegistryCall(KeyValuePair<string, ToolkitSampleR
326329
var metadata = kvp.Value;
327330
var sampleControlTypeParam = $"typeof({metadata.SampleAssemblyQualifiedName})";
328331
var sampleControlFactoryParam = $"() => new {metadata.SampleAssemblyQualifiedName}()";
329-
var generatedSampleOptionsParam = $"new {typeof(IGeneratedToolkitSampleOptionViewModel).FullName}[] {{ {string.Join(", ", BuildNewGeneratedSampleOptionMetadataSource(metadata).ToArray())} }}";
330332
var sampleOptionsParam = metadata.SampleOptionsAssemblyQualifiedName is null ? "null" : $"typeof({metadata.SampleOptionsAssemblyQualifiedName})";
331333
var sampleOptionsPaneFactoryParam = metadata.SampleOptionsAssemblyQualifiedName is null ? "null" : $"x => new {metadata.SampleOptionsAssemblyQualifiedName}(({metadata.SampleAssemblyQualifiedName})x)";
332334

333-
return @$"[""{kvp.Key}""] = new {typeof(ToolkitSampleMetadata).FullName}(""{metadata.Id}"", ""{metadata.DisplayName}"", ""{metadata.Description}"", {sampleControlTypeParam}, {sampleControlFactoryParam}, {sampleOptionsParam}, {sampleOptionsPaneFactoryParam}, {generatedSampleOptionsParam})";
335+
return $$"""
336+
["{{kvp.Key}}"] = new {{typeof(ToolkitSampleMetadata).FullName}}("{{metadata.Id}}", "{{metadata.DisplayName}}", "{{metadata.Description}}", {{sampleControlTypeParam}}, {{sampleControlFactoryParam}}, {{sampleOptionsParam}}, {{sampleOptionsPaneFactoryParam}},
337+
new {{typeof(IGeneratedToolkitSampleOptionViewModel).FullName}}[]
338+
{
339+
{{string.Join(",\n", BuildNewGeneratedSampleOptionMetadataSource(metadata).ToArray())}}
340+
})
341+
""";
334342
}
335343

336344
private static IEnumerable<string> BuildNewGeneratedSampleOptionMetadataSource(ToolkitSampleRecord sample)
@@ -340,13 +348,22 @@ private static IEnumerable<string> BuildNewGeneratedSampleOptionMetadataSource(T
340348
yield return item switch
341349
{
342350
ToolkitSampleMultiChoiceOptionAttribute multiChoiceAttr =>
343-
$@"new {typeof(ToolkitSampleMultiChoiceOptionMetadataViewModel).FullName}(name: ""{multiChoiceAttr.Name}"", options: new[] {{ {string.Join(",", multiChoiceAttr.Choices.Select(x => $@"new {typeof(MultiChoiceOption).FullName}(""{x.Label}"", {(x.Value is string ? $"\"{x.Value}\"" : x.Value)})").ToArray())} }}, title: ""{multiChoiceAttr.Title}"")",
351+
$$"""
352+
new {{typeof(ToolkitSampleMultiChoiceOptionMetadataViewModel).FullName}}(name: "{{multiChoiceAttr.Name}}",
353+
options: new[]
354+
{
355+
{{string.Join(",\n", multiChoiceAttr.Choices.Select(x =>
356+
$"""
357+
new {typeof(MultiChoiceOption).FullName}("{x.Label}", {(multiChoiceAttr.TypeName is "string" ? $"\"{x.Value}\"" : x.Value)})
358+
""").ToArray())}}
359+
}, title: "{{multiChoiceAttr.Title}}")
360+
""",
344361
ToolkitSampleBoolOptionAttribute boolAttribute =>
345-
$@"new {typeof(ToolkitSampleBoolOptionMetadataViewModel).FullName}(name: ""{boolAttribute.Name}"", defaultState: {boolAttribute.DefaultState?.ToString().ToLower()}, title: ""{boolAttribute.Title}"")",
362+
$@" new {typeof(ToolkitSampleBoolOptionMetadataViewModel).FullName}(name: ""{boolAttribute.Name}"", defaultState: {boolAttribute.DefaultState?.ToString().ToLower()}, title: ""{boolAttribute.Title}"")",
346363
ToolkitSampleNumericOptionAttribute numericAttribute =>
347-
$@"new {typeof(ToolkitSampleNumericOptionMetadataViewModel).FullName}(name: ""{numericAttribute.Name}"", initial: {numericAttribute.Initial}, min: {numericAttribute.Min}, max: {numericAttribute.Max}, step: {numericAttribute.Step}, showAsNumberBox: {numericAttribute.ShowAsNumberBox.ToString().ToLower()}, title: ""{numericAttribute.Title}"")",
364+
$@" new {typeof(ToolkitSampleNumericOptionMetadataViewModel).FullName}(name: ""{numericAttribute.Name}"", initial: {numericAttribute.Initial}, min: {numericAttribute.Min}, max: {numericAttribute.Max}, step: {numericAttribute.Step}, showAsNumberBox: {numericAttribute.ShowAsNumberBox.ToString().ToLower()}, title: ""{numericAttribute.Title}"")",
348365
ToolkitSampleTextOptionAttribute textAttribute =>
349-
$@"new {typeof(ToolkitSampleTextOptionMetadataViewModel).FullName}(name: ""{textAttribute.Name}"", placeholderText: ""{textAttribute.PlaceholderText}"", title: ""{textAttribute.Title}"")",
366+
$@" new {typeof(ToolkitSampleTextOptionMetadataViewModel).FullName}(name: ""{textAttribute.Name}"", placeholderText: ""{textAttribute.PlaceholderText}"", title: ""{textAttribute.Title}"")",
350367
_ => throw new NotSupportedException($"Unsupported or unhandled type {item.GetType()}.")
351368
};
352369
}

‎CommunityToolkit.Tooling.SampleGen/ToolkitSampleOptionGenerator.cs‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,16 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
4040
if (x.AttributeData.AttributeClass?.ContainingNamespace.ToDisplayString() == typeof(ToolkitSampleEnumOptionAttribute<>).Namespace
4141
&& x.AttributeData.AttributeClass?.MetadataName == typeof(ToolkitSampleEnumOptionAttribute<>).Name)
4242
{
43-
var parameters = x.AttributeData.ConstructorArguments.Select(GeneratorExtensions.PrepareParameterTypeForActivator).ToList();
44-
parameters.Add(new List<(string, object)>());
45-
var multiChoiceOptionAttribute = (ToolkitSampleMultiChoiceOptionAttribute)Activator.CreateInstance(typeof(ToolkitSampleMultiChoiceOptionAttribute), parameters.ToArray());
46-
item = (multiChoiceOptionAttribute, x.Symbol, typeof(ToolkitSampleMultiChoiceOptionMetadataViewModel));
43+
if (x.AttributeData.AttributeClass.TypeArguments.FirstOrDefault() is { } typeSymbol)
44+
{
45+
var parameters = x.AttributeData.ConstructorArguments.Select(GeneratorExtensions.PrepareParameterTypeForActivator).ToList();
46+
parameters.Add(typeSymbol.ToDisplayString());
47+
parameters.Add(Array.Empty<MultiChoiceOption>());
48+
var multiChoiceOptionAttribute = (ToolkitSampleMultiChoiceOptionAttribute)Activator.CreateInstance(
49+
typeof(ToolkitSampleMultiChoiceOptionAttribute), BindingFlags.NonPublic | BindingFlags.Instance,
50+
null, parameters.ToArray(), null);
51+
item = (multiChoiceOptionAttribute, x.Symbol, typeof(ToolkitSampleMultiChoiceOptionMetadataViewModel));
52+
}
4753
}
4854
else if (x.AttributeData.TryReconstructAs<ToolkitSampleBoolOptionAttribute>() is { } boolOptionAttribute)
4955
{
@@ -186,13 +192,13 @@ public partial class {{containingClassSymbol.Name}}
186192
{
187193
public {{typeName}} {{propertyName}}
188194
{
189-
get => (({{typeName}})(({{viewModelType.FullName}})GeneratedPropertyMetadata!.First(x => x.Name == "{{propertyName}}"))!.Value!)!;
195+
get => ({{typeName}})(({{viewModelType.FullName}})GeneratedPropertyMetadata!.First(x => x.Name is "{{propertyName}}"))!.Value!;
190196
set
191197
{
192-
if (GeneratedPropertyMetadata?.FirstOrDefault(x => x.Name == nameof({{propertyName}})) is {{viewModelType.FullName}} metadata)
198+
if (GeneratedPropertyMetadata?.FirstOrDefault(x => x.Name is "{{propertyName}}") is {{viewModelType.FullName}} metadata)
193199
{
194200
metadata.Value = value;
195-
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof({{propertyName}})));
201+
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("{{propertyName}}"));
196202
}
197203
}
198204
}

0 commit comments

Comments
 (0)