fixes an issue where online type was assinged instead of POCO (#174)

Inxton · May 16, 2023 · 8bb518c · 8bb518c
1 parent d258d03
commit 8bb518c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs b/src/AXSharp.compiler/src/AXSharp.Cs.Compiler/Onliner/CsOnlinerSourceBuilder.cs
@@ -79,11 +79,11 @@ private string ReplaceGenericSignature(IClassDeclaration? classDeclaration)
                 {
                     if (attribute.GenericTypeAssignment.isPoco)
                     {
-                       genericSignature = genericSignature.Replace(genericType, $"Pocos.{fieldDeclaresGenericType?.Type.FullyQualifiedName}");
+                       genericSignature = genericSignature.Replace(attribute.GenericTypeAssignment.type, $"Pocos.{fieldDeclaresGenericType?.Type.FullyQualifiedName}");
                     }
                     else
                     {
-                       genericSignature = genericSignature.Replace(genericType, fieldDeclaresGenericType?.Type.FullyQualifiedName);
+                       genericSignature = genericSignature.Replace(attribute.GenericTypeAssignment.type, fieldDeclaresGenericType?.Type.FullyQualifiedName);
                     }
                 }
             }

diff --git a/src/AXSharp.compiler/src/ixc/Properties/launchSettings.json b/src/AXSharp.compiler/src/ixc/Properties/launchSettings.json
@@ -10,7 +10,11 @@
     },
     "ixc-simple-template": {
       "commandName": "Project",
-      "workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\ix.framework\\src\\templates.simple\\ctrl"
+      "workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\ix.framework\\src\\templates.simple\\ctrl\\"
+    },
+    "ixc-template-ref": {
+      "commandName": "Project",
+      "workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\axopen\\src\\templates.simple\\ctrl"
     }
   }
 }
diff --git a/.../AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs b/.../AXSharp.Compiler.CsTests/samples/units/expected/.g/Onliners/class_generic_extension.g.cs
@@ -249,7 +249,7 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Generics
         }
     }
 
-    public partial class Extendee2 : Generics.Extender<Generics.SomeType, Generics.SomeType>
+    public partial class Extendee2 : Generics.Extender<Generics.SomeType, Pocos.Generics.SomeType>
     {
         public Generics.SomeType SomeType { get; }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        public partial class Extendee2 : Generics.Extender<Generics.SomeType, Generics.SomeType>
+        public partial class Extendee2 : Generics.Extender<Generics.SomeType, Pocos.Generics.SomeType>
         {
             public Generics.SomeType SomeType { get; }
@@ Expand Down @@