added generic

ignatandrei · ignatandrei · commit cfbf44bca847 · 2020-11-19T09:14:19.000+02:00
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,7 +10,7 @@ variables:
   solution: '**/*.sln'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
-  deployNuget: '1'
+  deployNuget: '0'
 
 steps:
 - task: NuGetToolInstaller@1
diff --git a/changelog.md b/changelog.md
@@ -4,11 +4,16 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated with 
 
-git --no-pager log --pretty=format:"%n #### [%s] %n Author %an on %ai %n%n hash %h %H" 1.1.2020.25553965..1.1.2020.27535073
+git --no-pager log --pretty=format:"%n #### [%s] %n Author %an on %ai %n%n hash %h %H" 1.1.2020.27535073..1.1.2020.27897354 
 
 More details at 
 http://msprogrammer.serviciipeweb.ro/2020/06/15/poor-software-developer-simple-changelog-for-cd/
 
+##  1.1.2020.27897354  - generate from inside class
+
+ #### [generating values inside class]
+ Author ignatandrei on 2020-11-18 23:13:59 +0200  
+
 ## 1.1.2020.27535073 debugger + download/upload blocks definitions
 
  #### [download files on local] 
diff --git a/src/NetCore2Blockly/NetCore2Blockly/TypeToGenerateFromCSharp.cs b/src/NetCore2Blockly/NetCore2Blockly/TypeToGenerateFromCSharp.cs
@@ -83,7 +83,12 @@ public override string TypeNameForBlockly
             {
 
                 var type = Nullable.GetUnderlyingType(t) ?? t;
-                return type.Name;
+                string typeName = type.Name;
+                if (type.IsGenericType)
+                {
+                    typeName = typeName.Replace("`", "_");
+                }
+                return typeName;
             }
         }
 
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/Controllers/VariousTestsController.cs b/src/NetCore2Blockly/TestBlocklyHtml/Controllers/VariousTestsController.cs
@@ -18,6 +18,11 @@
 
 namespace TestBlocklyHtml.Controllers
 {
+    public class GenericsTest<T>
+    {
+        public T t { get; set; }
+    }
+
 
     [Route("api/[controller]/[action]")]
     [ApiController]
@@ -28,15 +33,16 @@ public VariousTestsController()
         {
         }
 
+
         [HttpPost]
         public string TestInsideVariable(WithInsideClass id)
         {
             return "this is " + id.t.Ind + "=>" + id.t.a;
         }
         [HttpPost]
-        public string TestInsideVariable1(WithInsideClass id)
+        public string TestGeneric(GenericsTest<Test> id)
         {
-            return "this is " + id.t.Ind + "=>" + id.t.a;
+            return "this is " + id.t.Ind+ "=>" + id.t.a;
         }
 
         [HttpGet("{name}")]
diff --git a/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/doNotCopy/testing.js b/src/NetCore2Blockly/TestBlocklyHtml/wwwroot/doNotCopy/testing.js
@@ -2862,6 +2862,71 @@ var testBlocks =
       </block>
     </next>
   </block>
+</xml>`
+        },
+        {
+            name: "generic",
+            data:`<xml xmlns="https://developers.google.com/blockly/xml">
+  <variables>
+    <variable id="Q|gzJurns)WU=N)C0oZ}">var_AnEnum</variable>
+    <variable id="qt^W83W?Bn+2_%*A*V+l">var_Test</variable>
+    <variable id="N]NaQUz7^al6M0L[DzFK">var_GenericsTest_1</variable>
+  </variables>
+  <block type="variables_set" x="68" y="102">
+    <field name="VAR" id="Q|gzJurns)WU=N)C0oZ}">var_AnEnum</field>
+    <value name="VALUE">
+      <block type="TestBlocklyHtml_Controllers_AnEnum">
+        <field name="val_AnEnum">1</field>
+      </block>
+    </value>
+    <next>
+      <block type="variables_set">
+        <field name="VAR" id="qt^W83W?Bn+2_%*A*V+l">var_Test</field>
+        <value name="VALUE">
+          <block type="TestBlocklyHtml_Controllers_Test">
+            <value name="val_Ind">
+              <shadow type="text">
+                <field name="TEXT">asdads</field>
+              </shadow>
+            </value>
+            <value name="val_a">
+              <block type="variables_get">
+                <field name="VAR" id="Q|gzJurns)WU=N)C0oZ}">var_AnEnum</field>
+              </block>
+            </value>
+          </block>
+        </value>
+        <next>
+          <block type="variables_set">
+            <field name="VAR" id="N]NaQUz7^al6M0L[DzFK">var_GenericsTest_1</field>
+            <value name="VALUE">
+              <block type="TestBlocklyHtml_Controllers_GenericsTest\`1[[TestBlocklyHtml_Controllers_Test, TestBlocklyHtml, Version=1_0_0_0, Culture=neutral, PublicKeyToken=null]]">
+                <value name="val_t">
+                  <block type="variables_get">
+                    <field name="VAR" id="qt^W83W?Bn+2_%*A*V+l">var_Test</field>
+                  </block>
+                </value>
+              </block>
+            </value>
+            <next>
+              <block type="text_print">
+                <value name="TEXT">
+                  <block type="api_VariousTests_TestGeneric_POST">
+                    <value name="val_id">
+                      <shadow type="TestBlocklyHtml_Controllers_GenericsTest\`1[[TestBlocklyHtml_Controllers_Test, TestBlocklyHtml, Version=1_0_0_0, Culture=neutral, PublicKeyToken=null]]"></shadow>
+                      <block type="variables_get">
+                        <field name="VAR" id="N]NaQUz7^al6M0L[DzFK">var_GenericsTest_1</field>
+                      </block>
+                    </value>
+                  </block>
+                </value>
+              </block>
+            </next>
+          </block>
+        </next>
+      </block>
+    </next>
+  </block>
 </xml>`
         }
 ]

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,12 @@ public override string TypeNameForBlockly`
`83`	`83`	`{`
`84`	`84`
`85`	`85`	`var type = Nullable.GetUnderlyingType(t) ?? t;`
`86`		`- return type.Name;`
	`86`	`+ string typeName = type.Name;`
	`87`	`+ if (type.IsGenericType)`
	`88`	`+ {`
	`89`	+ typeName = typeName.Replace("`", "_");
	`90`	`+ }`
	`91`	`+ return typeName;`
`87`	`92`	`}`
`88`	`93`	`}`
`89`	`94`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,11 @@`
`18`	`18`
`19`	`19`	`namespace TestBlocklyHtml.Controllers`
`20`	`20`	`{`
	`21`	`+ public class GenericsTest<T>`
	`22`	`+ {`
	`23`	`+ public T t { get; set; }`
	`24`	`+ }`
	`25`	`+`
`21`	`26`
`22`	`27`	`[Route("api/[controller]/[action]")]`
`23`	`28`	`[ApiController]`
`@@ -28,15 +33,16 @@ public VariousTestsController()`
`28`	`33`	`{`
`29`	`34`	`}`
`30`	`35`
	`36`	`+`
`31`	`37`	`[HttpPost]`
`32`	`38`	`public string TestInsideVariable(WithInsideClass id)`
`33`	`39`	`{`
`34`	`40`	`return "this is " + id.t.Ind + "=>" + id.t.a;`
`35`	`41`	`}`
`36`	`42`	`[HttpPost]`
`37`		`- public string TestInsideVariable1(WithInsideClass id)`
	`43`	`+ public string TestGeneric(GenericsTest<Test> id)`
`38`	`44`	`{`
`39`		`- return "this is " + id.t.Ind + "=>" + id.t.a;`
	`45`	`+ return "this is " + id.t.Ind+ "=>" + id.t.a;`
`40`	`46`	`}`
`41`	`47`
`42`	`48`	`[HttpGet("{name}")]`