Fix filling in guid when adding a new component/command to an existin…

…g project. Also fix creating new GH commands so it doesn't always have the project name, but the new name you typed in.
mcneel · May 2, 2018 · abc4487 · abc4487
1 parent a334327
commit abc4487
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 14 deletions.
diff --git a/MonoDevelop.RhinoDebug.csproj b/MonoDevelop.RhinoDebug.csproj
@@ -47,6 +47,7 @@
     <Compile Include="Wizard\ProvideSampleControl.cs" />
     <Compile Include="Helpers.cs" />
     <Compile Include="RhinoGlobalProperties.cs" />
+    <Compile Include="RhinoFileTemplate.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

diff --git a/Properties/AddinInfo.cs b/Properties/AddinInfo.cs
@@ -9,7 +9,7 @@
 // the same stable release of Xamarin Studio.
 [assembly:Addin(
   "RhinoXamarinStudioAddIn",
-	Version = "7.4.3.0"
+	Version = "7.4.3.1"
 )]
 
 // This controls the displayed name in the Xamarin Studio Add-In Manager...

diff --git a/Properties/Manifest.addin.xml b/Properties/Manifest.addin.xml
@@ -37,4 +37,7 @@
     <Image id="grasshopper-project" resource="MonoDevelop.RhinoDebug.Templates.Grasshopper.grasshopper-project.png" />
   </Extension>
 
+  <Extension path = "/MonoDevelop/Ide/FileTemplateTypes">
+    <FileTemplateType name = "RhinoFile" class = "MonoDevelop.RhinoDebug.RhinoFileTemplate"/>
+  </Extension>
 </ExtensionModel>
diff --git a/RhinoFileTemplate.cs b/RhinoFileTemplate.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using MonoDevelop.Ide.Templates;
+using MonoDevelop.Projects;
+using System.Text.RegularExpressions;
+
+namespace MonoDevelop.RhinoDebug
+{
+  public class RhinoFileTemplate : TextFileDescriptionTemplate
+  {
+		public override string CreateContent(Project project, Dictionary<string, string> tags, string language)
+		{
+      var content = base.CreateContent(project, tags, language);
+      var keys = new Dictionary<string, Guid>(StringComparer.OrdinalIgnoreCase);
+      return Regex.Replace(content, @"\$\{Guid\d+\}", match =>
+      {
+        if (!keys.TryGetValue(match.Value, out var key))
+        {
+          key = Guid.NewGuid();
+          keys.Add(match.Value, key);
+        }
+        return key.ToString();
+      });
+		}
+	}
+}
diff --git a/Templates/Grasshopper/EmptyComponent.cs b/Templates/Grasshopper/EmptyComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 using Grasshopper;
@@ -7,7 +7,7 @@
 
 namespace ${Namespace}
 {
-  public class ${ProjectName}Component : GH_Component
+  public class ${EscapedIdentifier} : GH_Component
   {
     /// <summary>
     /// Each implementation of GH_Component must provide a public 
@@ -16,9 +16,9 @@ public class ${ProjectName}Component : GH_Component
     /// Subcategory the panel. If you use non-existing tab or panel names, 
     /// new tabs/panels will automatically be created.
     /// </summary>
-    public ${ProjectName}Component()
-      : base("${ProjectName}", "Nickname",
-        "${ProjectName} description",
+    public ${EscapedIdentifier}()
+      : base("${EscapedIdentifier}", "Nickname",
+        "${EscapedIdentifier} description",
         "Category", "Subcategory")
     {
     }

diff --git a/Templates/Grasshopper/EmptyComponent.xft.xml b/Templates/Grasshopper/EmptyComponent.xft.xml
@@ -9,6 +9,6 @@
     <DefaultFilename>MyComponent</DefaultFilename>
   </TemplateConfiguration>
   <TemplateFiles>
-    <File name="${Name}.cs" AddStandardHeader="true" src="EmptyComponent.cs" />
+    <RhinoFile name="${Name}.cs" AddStandardHeader="true" src="EmptyComponent.cs" />
   </TemplateFiles>
 </Template>
diff --git a/Templates/Grasshopper/SimpleComponent.cs b/Templates/Grasshopper/SimpleComponent.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 using Grasshopper;
@@ -7,7 +7,7 @@
 
 namespace ${Namespace}
 {
-  public class ${ProjectName}Component : GH_Component
+  public class ${EscapedIdentifier} : GH_Component
   {
     /// <summary>
     /// Each implementation of GH_Component must provide a public 
@@ -16,8 +16,8 @@ public class ${ProjectName}Component : GH_Component
     /// Subcategory the panel. If you use non-existing tab or panel names, 
     /// new tabs/panels will automatically be created.
     /// </summary>
-    public ${ProjectName}Component()
-      : base("${ProjectName}", "ASpi",
+    public ${EscapedIdentifier}()
+      : base("${EscapedIdentifier}", "ASpi",
         "Construct an Archimedean, or arithmetic, spiral given its radii and number of turns.",
         "Curve", "Primitive")
     {

diff --git a/Templates/Rhino/EmptyCommand.cs b/Templates/Rhino/EmptyCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Rhino;
 using Rhino.Commands;
 using Rhino.Geometry;

diff --git a/Templates/Rhino/EmptyCommand.xft.xml b/Templates/Rhino/EmptyCommand.xft.xml
@@ -9,6 +9,6 @@
     <DefaultFilename>MyCommand</DefaultFilename>
   </TemplateConfiguration>
   <TemplateFiles>
-    <File name="${Name}.cs" AddStandardHeader="true" src="EmptyCommand.cs" />
+    <RhinoFile name="${Name}.cs" AddStandardHeader="true" src="EmptyCommand.cs" />
   </TemplateFiles>
 </Template>
diff --git a/Templates/Rhino/SimpleCommand.cs b/Templates/Rhino/SimpleCommand.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using Rhino;
 using Rhino.Commands;
 using Rhino.Geometry;