fix: use static closures

chickensoft-games · Aug 23, 2024 · ddd191c · ddd191c
1 parent 2a92fc6
commit ddd191c
Show file tree

Hide file tree

Showing 23 changed files with 178 additions and 176 deletions.
diff --git a/....Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_A_BaseClass.g.cs b/....Generator/Chickensoft.Introspection.Generator.TypeGenerator/BaseClasses_A_BaseClass.g.cs
@@ -23,7 +23,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((BaseClass)obj).Name,
+        Getter: static (object obj) => ((BaseClass)obj).Name,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/TestCases_SetOnlyPropertyE303C8557E.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/TestCases_SetOnlyPropertyE303C8557E.g.cs
@@ -22,7 +22,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         IsInit: false,
         IsRequired: false,
         Getter: null,
-        Setter: (object obj, object? value) => ((SetOnlyProperty)obj).Value = (string)value!,
+        Setter: static (object obj, object? value) => ((SetOnlyProperty)obj).Value = (string)value!,
         GenericType: new GenericType(
           OpenType: typeof(string),
           ClosedType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/Tests_TestCases_BaseModel6634CD33B5.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/Tests_TestCases_BaseModel6634CD33B5.g.cs
@@ -24,8 +24,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((BaseModel)obj).Name,
-        Setter: (object obj, object? value) => ((BaseModel)obj).Name = (string)value!,
+        Getter: static (object obj) => ((BaseModel)obj).Name,
+        Setter: static (object obj, object? value) => ((BaseModel)obj).Name = (string)value!,
         GenericType: new GenericType(
           OpenType: typeof(string),
           ClosedType: typeof(string),

diff --git a/...trospection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/TypeRegistry.g.cs b/...trospection.Generator/Chickensoft.Introspection.Generator.TypeGenerator/TypeRegistry.g.cs
diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/_MyContainerClass_MyModel67E837FC39.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/_MyContainerClass_MyModel67E837FC39.g.cs
@@ -25,8 +25,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Age",
           IsInit: false,
           IsRequired: false,
-          Getter: (object obj) => ((MyModel)obj).Age,
-          Setter: (object obj, object? value) => ((MyModel)obj).Age = (int)value,
+          Getter: static (object obj) => ((MyModel)obj).Age,
+          Setter: static (object obj, object? value) => ((MyModel)obj).Age = (int)value,
           GenericType: new GenericType(
             OpenType: typeof(int),
             ClosedType: typeof(int),
@@ -44,8 +44,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Name",
           IsInit: false,
           IsRequired: false,
-          Getter: (object obj) => ((MyModel)obj).Name,
-          Setter: (object obj, object? value) => ((MyModel)obj).Name = (string)value!,
+          Getter: static (object obj) => ((MyModel)obj).Name,
+          Setter: static (object obj, object? value) => ((MyModel)obj).Name = (string)value!,
           GenericType: new GenericType(
             OpenType: typeof(string),
             ClosedType: typeof(string),
@@ -79,8 +79,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
 
       [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
       public System.Collections.Generic.IReadOnlyDictionary<System.Type, System.Action<object>> MixinHandlers { get; } = new System.Collections.Generic.Dictionary<System.Type, System.Action<object>>() {
-        [typeof(IMyMixin)] = (obj) => ((IMyMixin)obj).Handler(), 
-        [typeof(IMySecondMixin)] = (obj) => ((IMySecondMixin)obj).Handler()
+        [typeof(IMyMixin)] = static (obj) => ((IMyMixin)obj).Handler(), 
+        [typeof(IMySecondMixin)] = static (obj) => ((IMySecondMixin)obj).Handler()
       };
 
 

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/_Tests_TestCases_SomeType31193CB4B4.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/_Tests_TestCases_SomeType31193CB4B4.g.cs
@@ -33,7 +33,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
 
     [System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
     public System.Collections.Generic.IReadOnlyDictionary<System.Type, System.Action<object>> MixinHandlers { get; } = new System.Collections.Generic.Dictionary<System.Type, System.Action<object>>() {
-      [typeof(ISomeMixin)] = (obj) => ((ISomeMixin)obj).Handler()
+      [typeof(ISomeMixin)] = static (obj) => ((ISomeMixin)obj).Handler()
     };
 
 

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/er2_DeeplyNestedBaseClassAC795ED913.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/er2_DeeplyNestedBaseClassAC795ED913.g.cs
@@ -25,7 +25,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
             Name: "DeepName",
             IsInit: true,
             IsRequired: true,
-            Getter: (object obj) => ((DeeplyNestedBaseClass)obj).DeepName,
+            Getter: static (object obj) => ((DeeplyNestedBaseClass)obj).DeepName,
             Setter: null,
             GenericType: new GenericType(
               OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/her_A_B_C_D_SomeBaseClassECA01F390E.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/her_A_B_C_D_SomeBaseClassECA01F390E.g.cs
@@ -27,7 +27,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "Identifier",
                 IsInit: true,
                 IsRequired: true,
-                Getter: (object obj) => ((SomeBaseClass)obj).Identifier,
+                Getter: static (object obj) => ((SomeBaseClass)obj).Identifier,
                 Setter: null,
                 GenericType: new GenericType(
                   OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/or_Tests_TestCases_MyType1CDCCD6086.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/or_Tests_TestCases_MyType1CDCCD6086.g.cs
@@ -28,8 +28,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "MyProperty",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((MyType)obj).MyProperty,
-        Setter: (object obj, object? value) => ((MyType)obj).MyProperty = (string)value!,
+        Getter: static (object obj) => ((MyType)obj).MyProperty,
+        Setter: static (object obj, object? value) => ((MyType)obj).MyProperty = (string)value!,
         GenericType: new GenericType(
           OpenType: typeof(string),
           ClosedType: typeof(string),
@@ -51,7 +51,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "NoAttributeSoNoMetadata",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((MyType)obj).NoAttributeSoNoMetadata,
+        Getter: static (object obj) => ((MyType)obj).NoAttributeSoNoMetadata,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(int),
@@ -67,8 +67,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "OptionalFloat",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((MyType)obj).OptionalFloat,
-        Setter: (object obj, object? value) => ((MyType)obj).OptionalFloat = (Nullable<float>)value,
+        Getter: static (object obj) => ((MyType)obj).OptionalFloat,
+        Setter: static (object obj, object? value) => ((MyType)obj).OptionalFloat = (Nullable<float>)value,
         GenericType: new GenericType(
           OpenType: typeof(Nullable<>),
           ClosedType: typeof(Nullable<float>),
@@ -94,8 +94,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "OptionalInt",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((MyType)obj).OptionalInt,
-        Setter: (object obj, object? value) => ((MyType)obj).OptionalInt = (int)value,
+        Getter: static (object obj) => ((MyType)obj).OptionalInt,
+        Setter: static (object obj, object? value) => ((MyType)obj).OptionalInt = (int)value,
         GenericType: new GenericType(
           OpenType: typeof(int),
           ClosedType: typeof(int),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/s_AttributesWithNamedArgs21E465F742.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/s_AttributesWithNamedArgs21E465F742.g.cs
@@ -24,7 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((AttributesWithNamedArgs)obj).Name,
+        Getter: static (object obj) => ((AttributesWithNamedArgs)obj).Name,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/s_TestCases_InitArgsModel651DDFA4A7.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/s_TestCases_InitArgsModel651DDFA4A7.g.cs
@@ -24,8 +24,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Address",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((InitArgsModel)obj).Address,
-        Setter: (object obj, object? value) => ((InitArgsModel)obj).Address = (string)value,
+        Getter: static (object obj) => ((InitArgsModel)obj).Address,
+        Setter: static (object obj, object? value) => ((InitArgsModel)obj).Address = (string)value,
         GenericType: new GenericType(
           OpenType: typeof(string),
           ClosedType: typeof(string),
@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((InitArgsModel)obj).Age,
+        Getter: static (object obj) => ((InitArgsModel)obj).Age,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(int),
@@ -62,7 +62,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Description",
         IsInit: true,
         IsRequired: false,
-        Getter: (object obj) => ((InitArgsModel)obj).Description,
+        Getter: static (object obj) => ((InitArgsModel)obj).Description,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),
@@ -81,7 +81,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "HasAttended",
         IsInit: true,
         IsRequired: false,
-        Getter: (object obj) => ((InitArgsModel)obj).HasAttended,
+        Getter: static (object obj) => ((InitArgsModel)obj).HasAttended,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(InitArgsEnum),
@@ -100,8 +100,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "IsAttending",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((InitArgsModel)obj).IsAttending,
-        Setter: (object obj, object? value) => ((InitArgsModel)obj).IsAttending = (InitArgsEnum)value!,
+        Getter: static (object obj) => ((InitArgsModel)obj).IsAttending,
+        Setter: static (object obj, object? value) => ((InitArgsModel)obj).IsAttending = (InitArgsEnum)value!,
         GenericType: new GenericType(
           OpenType: typeof(InitArgsEnum),
           ClosedType: typeof(InitArgsEnum),
@@ -119,7 +119,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((InitArgsModel)obj).Name,
+        Getter: static (object obj) => ((InitArgsModel)obj).Name,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/s_TestCases_PropertyModel4D221791B1.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/s_TestCases_PropertyModel4D221791B1.g.cs
@@ -21,7 +21,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Value",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((PropertyModel)obj).Value,
+        Getter: static (object obj) => ((PropertyModel)obj).Value,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/sts_TestCases_Collections23D60571D5.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/sts_TestCases_Collections23D60571D5.g.cs
@@ -24,7 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "NestedCollections",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((Collections)obj).NestedCollections,
+        Getter: static (object obj) => ((Collections)obj).NestedCollections,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(Dictionary<,>),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_DerivedModel2583598D69.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_DerivedModel2583598D69.g.cs
@@ -24,8 +24,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: false,
         IsRequired: false,
-        Getter: (object obj) => ((DerivedModel)obj).Age,
-        Setter: (object obj, object? value) => ((DerivedModel)obj).Age = (int)value!,
+        Getter: static (object obj) => ((DerivedModel)obj).Age,
+        Setter: static (object obj, object? value) => ((DerivedModel)obj).Age = (int)value!,
         GenericType: new GenericType(
           OpenType: typeof(int),
           ClosedType: typeof(int),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_PartialModelED2F9C08D8.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/ts_TestCases_PartialModelED2F9C08D8.g.cs
@@ -24,7 +24,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Age",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((PartialModel)obj).Age,
+        Getter: static (object obj) => ((PartialModel)obj).Age,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(int),
@@ -43,7 +43,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
         Name: "Name",
         IsInit: true,
         IsRequired: true,
-        Getter: (object obj) => ((PartialModel)obj).Name,
+        Getter: static (object obj) => ((PartialModel)obj).Name,
         Setter: null,
         GenericType: new GenericType(
           OpenType: typeof(string),

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/wo_IThree_Four_NestedType7FDE758058.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/wo_IThree_Four_NestedType7FDE758058.g.cs
@@ -32,8 +32,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "MyProperty",
                 IsInit: false,
                 IsRequired: false,
-                Getter: (object obj) => ((NestedType)obj).MyProperty,
-                Setter: (object obj, object? value) => ((NestedType)obj).MyProperty = (string)value!,
+                Getter: static (object obj) => ((NestedType)obj).MyProperty,
+                Setter: static (object obj, object? value) => ((NestedType)obj).MyProperty = (string)value!,
                 GenericType: new GenericType(
                   OpenType: typeof(string),
                   ClosedType: typeof(string),
@@ -55,8 +55,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "OptionalFloat",
                 IsInit: false,
                 IsRequired: false,
-                Getter: (object obj) => ((NestedType)obj).OptionalFloat,
-                Setter: (object obj, object? value) => ((NestedType)obj).OptionalFloat = (float)value,
+                Getter: static (object obj) => ((NestedType)obj).OptionalFloat,
+                Setter: static (object obj, object? value) => ((NestedType)obj).OptionalFloat = (float)value,
                 GenericType: new GenericType(
                   OpenType: typeof(float),
                   ClosedType: typeof(float),
@@ -74,8 +74,8 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
                 Name: "OptionalInt",
                 IsInit: false,
                 IsRequired: false,
-                Getter: (object obj) => ((NestedType)obj).OptionalInt,
-                Setter: (object obj, object? value) => ((NestedType)obj).OptionalInt = (int)value,
+                Getter: static (object obj) => ((NestedType)obj).OptionalInt,
+                Setter: static (object obj, object? value) => ((NestedType)obj).OptionalInt = (int)value,
                 GenericType: new GenericType(
                   OpenType: typeof(int),
                   ClosedType: typeof(int),

diff --git a/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs b/Chickensoft.Introspection.Generator/src/models/DeclaredProperty.cs
@@ -34,15 +34,16 @@ public void Write(IndentedTextWriter writer, string typeSimpleNameClosed) {
     var propertyValue = "value" + (IsNullable ? "" : "!");
 
     var getter = HasGetter
-      ? $"(object obj) => (({typeSimpleNameClosed})obj).{Name}"
+      ? $"static (object obj) => (({typeSimpleNameClosed})obj).{Name}"
       : "null";
 
     var setter = HasSetter
       ? (
         IsInit
           ? "null"
-          : $"(object obj, object? value) => (({typeSimpleNameClosed})obj)" +
-          $".{Name} = ({GenericType.ClosedType}){propertyValue}"
+          : $"static (object obj, object? value) => " +
+            $"(({typeSimpleNameClosed})obj)" +
+            $".{Name} = ({GenericType.ClosedType}){propertyValue}"
       )
       : "null";
 

diff --git a/Chickensoft.Introspection.Generator/src/models/DeclaredType.cs b/Chickensoft.Introspection.Generator/src/models/DeclaredType.cs
@@ -268,8 +268,9 @@ bool knownToBeAccessibleFromGlobalScope
   ) {
     const string prefix = "Chickensoft.Introspection";
     var name = $"\"{Reference.SimpleNameClosed}\"";
-    var genericTypeGetter = $"(r) => r.Receive<{FullNameClosed}>()";
-    var factory = $"() => System.Activator.CreateInstance<{FullNameClosed}>()";
+    var genericTypeGetter = $"static (r) => r.Receive<{FullNameClosed}>()";
+    var factory =
+      $"static () => System.Activator.CreateInstance<{FullNameClosed}>()";
     var metatype = $"new {FullNameClosed}.{Constants.METATYPE_IMPL}()";
     var id = Id ?? "";
     var version = $"{Version}";
@@ -481,7 +482,7 @@ IEnumerable<DeclaredType> baseTypes
     writer.WriteCommaSeparatedList(
       orderedMixins,
       (mixin) => writer.Write(
-        $"[typeof({mixin})] = (obj) => (({mixin})obj).Handler()"
+        $"[typeof({mixin})] = static (obj) => (({mixin})obj).Handler()"
       ),
       multiline: true
     );

diff --git a/...hickensoft.Introspection.Generator.TypeGenerator/Tests_TypeGraphTest_Model4FF6A4782E.g.cs b/...hickensoft.Introspection.Generator.TypeGenerator/Tests_TypeGraphTest_Model4FF6A4782E.g.cs
@@ -31,7 +31,7 @@ public class MetatypeMetadata : Chickensoft.Introspection.IMetatype {
           Name: "Name",
           IsInit: false,
           IsRequired: false,
-          Getter: (object obj) => ((Model)obj).Name,
+          Getter: static (object obj) => ((Model)obj).Name,
           Setter: null,
           GenericType: new GenericType(
             OpenType: typeof(string),