Skip to content

Commit 804f216

Browse files
Copilotdex3r
andcommitted
Address review: replace fragile StaticModifier with MethodModifiers in DummyMethodData
Use consistent MethodModifiers pattern ("partial" / "static partial") in DummyMethodData, matching PartialMethodEmitData approach and eliminating the fragile trailing-space convention. Co-authored-by: dex3r <[email protected]> Agent-Logs-Url: https://github.com/dex3r/EasySourceGenerators/sessions/cb205769-20ee-4e1e-9b44-3ef890163968
1 parent 0e8ada5 commit 804f216

3 files changed

Lines changed: 14 additions & 14 deletions

File tree

EasySourceGenerators.GeneratorTests/DummyImplementationEmitterTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void Emit_SingleMethodWithNamespace_ContainsNamespaceDeclaration()
1919
{
2020
new DummyMethodData(
2121
AccessibilityKeyword: "public",
22-
StaticModifier: "",
22+
MethodModifiers: "partial",
2323
ReturnTypeName: "string",
2424
MethodName: "GetValue",
2525
ParameterList: "",
@@ -46,7 +46,7 @@ public void Emit_SingleMethodWithNamespace_ContainsClosingNamespaceBrace()
4646
{
4747
new DummyMethodData(
4848
AccessibilityKeyword: "public",
49-
StaticModifier: "",
49+
MethodModifiers: "partial",
5050
ReturnTypeName: "string",
5151
MethodName: "GetValue",
5252
ParameterList: "",
@@ -75,7 +75,7 @@ public void Emit_WithoutNamespace_DoesNotContainNamespaceDeclaration()
7575
{
7676
new DummyMethodData(
7777
AccessibilityKeyword: "public",
78-
StaticModifier: "",
78+
MethodModifiers: "partial",
7979
ReturnTypeName: "void",
8080
MethodName: "DoWork",
8181
ParameterList: "",
@@ -102,7 +102,7 @@ public void Emit_ContainsTypeDeclaration()
102102
{
103103
new DummyMethodData(
104104
AccessibilityKeyword: "public",
105-
StaticModifier: "static ",
105+
MethodModifiers: "static partial",
106106
ReturnTypeName: "int",
107107
MethodName: "Calculate",
108108
ParameterList: "",
@@ -129,7 +129,7 @@ public void Emit_ContainsMethodWithPartialKeyword()
129129
{
130130
new DummyMethodData(
131131
AccessibilityKeyword: "public",
132-
StaticModifier: "",
132+
MethodModifiers: "partial",
133133
ReturnTypeName: "string",
134134
MethodName: "GetValue",
135135
ParameterList: "",
@@ -156,7 +156,7 @@ public void Emit_StaticMethod_ContainsStaticModifier()
156156
{
157157
new DummyMethodData(
158158
AccessibilityKeyword: "public",
159-
StaticModifier: "static ",
159+
MethodModifiers: "static partial",
160160
ReturnTypeName: "int",
161161
MethodName: "Compute",
162162
ParameterList: "int x",
@@ -184,7 +184,7 @@ public void Emit_ContainsBodyStatement()
184184
{
185185
new DummyMethodData(
186186
AccessibilityKeyword: "public",
187-
StaticModifier: "",
187+
MethodModifiers: "partial",
188188
ReturnTypeName: "void",
189189
MethodName: "DoWork",
190190
ParameterList: "",
@@ -211,14 +211,14 @@ public void Emit_MultipleMethodsInSameType_ContainsBothMethods()
211211
{
212212
new DummyMethodData(
213213
AccessibilityKeyword: "public",
214-
StaticModifier: "",
214+
MethodModifiers: "partial",
215215
ReturnTypeName: "string",
216216
MethodName: "First",
217217
ParameterList: "",
218218
BodyStatement: "throw new System.Exception();"),
219219
new DummyMethodData(
220220
AccessibilityKeyword: "internal",
221-
StaticModifier: "",
221+
MethodModifiers: "partial",
222222
ReturnTypeName: "int",
223223
MethodName: "Second",
224224
ParameterList: "int x",
@@ -254,7 +254,7 @@ public void Emit_StructType_ContainsStructKeyword()
254254
{
255255
new DummyMethodData(
256256
AccessibilityKeyword: "public",
257-
StaticModifier: "",
257+
MethodModifiers: "partial",
258258
ReturnTypeName: "int",
259259
MethodName: "GetValue",
260260
ParameterList: "",

EasySourceGenerators.Generators/SourceEmitting/DummyImplementationEmitter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ internal sealed record DummyTypeGroupData(
1818
/// </summary>
1919
internal sealed record DummyMethodData(
2020
string AccessibilityKeyword,
21-
string StaticModifier,
21+
string MethodModifiers,
2222
string ReturnTypeName,
2323
string MethodName,
2424
string ParameterList,
@@ -50,7 +50,7 @@ internal static string Emit(IEnumerable<DummyTypeGroupData> typeGroups)
5050

5151
foreach (DummyMethodData method in typeGroup.Methods)
5252
{
53-
builder.AppendLine($"{method.AccessibilityKeyword} {method.StaticModifier}partial {method.ReturnTypeName} {method.MethodName}({method.ParameterList}) {{");
53+
builder.AppendLine($"{method.AccessibilityKeyword} {method.MethodModifiers} {method.ReturnTypeName} {method.MethodName}({method.ParameterList}) {{");
5454
builder.AppendLine(method.BodyStatement);
5555
builder.AppendLine("}");
5656
}

EasySourceGenerators.Generators/SourceEmitting/RoslynSymbolDataMapper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ internal static IReadOnlyList<DummyTypeGroupData> ToDummyTypeGroups(IEnumerable<
7373
foreach (IMethodSymbol partialMethod in typeGroup)
7474
{
7575
string accessibility = CSharpAccessibilityKeyword.FromOrEmpty(partialMethod.DeclaredAccessibility);
76-
string staticModifier = partialMethod.IsStatic ? "static " : "";
76+
string methodModifiers = partialMethod.IsStatic ? "static partial" : "partial";
7777
string returnTypeName = partialMethod.ReturnType.ToDisplayString();
7878
string parameterList = string.Join(", ", partialMethod.Parameters.Select(
7979
parameter => $"{parameter.Type.ToDisplayString()} {parameter.Name}"));
@@ -83,7 +83,7 @@ internal static IReadOnlyList<DummyTypeGroupData> ToDummyTypeGroups(IEnumerable<
8383

8484
methods.Add(new DummyMethodData(
8585
AccessibilityKeyword: accessibility,
86-
StaticModifier: staticModifier,
86+
MethodModifiers: methodModifiers,
8787
ReturnTypeName: returnTypeName,
8888
MethodName: partialMethod.Name,
8989
ParameterList: parameterList,

0 commit comments

Comments
 (0)