fix: update indentation replacements with tabs or spaces

Assets/ScriptTemplates/71-My Scripts__Game Objects__Mono Behaviour-NewBehaviourScript.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using UnityEngine;
+
+#NAMESPACE#public class #SCRIPTNAME# : MonoBehaviour
+{
+
+}

Assets/ScriptTemplates/72-My Scripts__Game Objects__Scriptable Object-NewScriptableObject.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using UnityEngine;
+
+#NAMESPACE#public class #SCRIPTNAME# : ScriptableObject
+{
+
+}

Assets/ScriptTemplates/73-My Scripts__Entities__System-NewSystem.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using Unity.Entities;
+
+#NAMESPACE#public partial struct #SCRIPTNAME# : ISystem
+{
+
+}

Assets/ScriptTemplates/74-My Scripts__Entities__Component-NewComponent.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using Unity.Entities;
+
+#NAMESPACE#public struct #SCRIPTNAME# : IComponentData
+{
+
+}

Assets/ScriptTemplates/75-My Scripts__Entities__Authoring-NewAuthoring.cs.txt

@@ -0,0 +1,13 @@
+#SIGNATURE#using Unity.Entities;
+using UnityEngine;
+
+#NAMESPACE#public class #SCRIPTNAME# : MonoBehaviour
+{
+# #public class #SCRIPTNAME#Baker : Baker<#SCRIPTNAME#>
+# #{
+# ## #public override void Bake(#SCRIPTNAME# authoring)
+# ## #{
+# ## ## #
+# ## #}
+# #}
+}

Assets/ScriptTemplates/76-My Scripts__Entities__Managed System-NewManagedSystem.cs.txt

@@ -0,0 +1,9 @@
+#SIGNATURE#using Unity.Entities;
+
+#NAMESPACE#public partial class #SCRIPTNAME# : SystemBase
+{
+# #protected override void OnUpdate()
+# #{
+# ## #
+# #}
+}

Assets/ScriptTemplates/77-My Scripts__Entities__Managed Component-NewManagedComponent.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using Unity.Entities;
+
+#NAMESPACE#public class #SCRIPTNAME# : IComponentData
+{
+
+}

Assets/ScriptTemplates/78-My Scripts__C# Class-NewClass.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using System;
+
+#NAMESPACE#public class #SCRIPTNAME#
+{
+
+}

Assets/ScriptTemplates/79-My Scripts__C# Struct-NewStruct.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using System;
+
+#NAMESPACE#public struct #SCRIPTNAME#
+{
+
+}

Assets/ScriptTemplates/80-My Scripts__C# Enum-NewEnum.cs.txt

@@ -0,0 +1,4 @@
+#SIGNATURE##NAMESPACE#public enum #SCRIPTNAME#
+{
+
+}

Assets/ScriptTemplates/81-My Scripts__C# Interface-NewInterface.cs.txt

@@ -0,0 +1,6 @@
+#SIGNATURE#using System;
+
+#NAMESPACE#public interface #SCRIPTNAME#
+{
+
+}

Packages/manifest.json

@@ -2,6 +2,7 @@
   "dependencies": {
     "com.unity.entities": "1.0.0-pre.65",
     "com.unity.feature.development": "1.0.1",
+    "com.unity.ide.visualstudio": "2.0.20",
     "com.unity.ugui": "1.0.0",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

Packages/mygamedevtools-script-template/Editor/Data/IndentationSettings.cs

@@ -0,0 +1,50 @@
+/**
+ * IndentationSettings.cs
+ * Created by: João Borks [joao.borks@gmail.com]
+ * Created on: 2023-08-19
+ */
+
+using System;
+
+namespace MyGameDevTools.ScriptTemplates
+{
+    [Serializable]
+    public struct IndentationSettings
+    {
+        public IndentPattern IndentPattern;
+        public int IndentMultiplier;
+
+        public override bool Equals(object obj)
+        {
+            return obj is IndentationSettings settings &&
+                   IndentPattern == settings.IndentPattern &&
+                   IndentMultiplier == settings.IndentMultiplier;
+        }
+
+        public static IndentationSettings Default()
+        {
+            return new IndentationSettings
+            {
+                IndentPattern = IndentPattern.Spaces,
+                IndentMultiplier = 4
+            };
+        }
+
+        public override int GetHashCode()
+        {
+            return HashCode.Combine(IndentPattern, IndentMultiplier);
+        }
+
+        public bool IsEmpty() => this == new IndentationSettings();
+
+        public static bool operator ==(IndentationSettings left, IndentationSettings right)
+        {
+            return left.Equals(right);
+        }
+
+        public static bool operator !=(IndentationSettings left, IndentationSettings right)
+        {
+            return !(left == right);
+        }
+    }
+}

Packages/mygamedevtools-script-template/Editor/NamespaceSettings.cs → Packages/mygamedevtools-script-template/Editor/Data/NamespaceSettings.cs

@@ -14,22 +14,18 @@ public struct NamespaceSettings
         public bool Enabled;
         public bool UseAssemblyDefinition;
         public string DefaultNamespace;
-        public IndentPattern IndentPattern;
-        public int IndentMultiplier;
 
         public override bool Equals(object obj)
         {
             return obj is NamespaceSettings settings &&
                    Enabled == settings.Enabled &&
                    UseAssemblyDefinition == settings.UseAssemblyDefinition &&
-                   DefaultNamespace == settings.DefaultNamespace &&
-                   IndentPattern == settings.IndentPattern &&
-                   IndentMultiplier == settings.IndentMultiplier;
+                   DefaultNamespace == settings.DefaultNamespace;
         }
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(Enabled, UseAssemblyDefinition, DefaultNamespace, IndentPattern, IndentMultiplier);
+            return HashCode.Combine(Enabled, UseAssemblyDefinition, DefaultNamespace);
         }
 
         public bool IsValid() => !Enabled || !string.IsNullOrWhiteSpace(DefaultNamespace);

Packages/mygamedevtools-script-template/Editor/ScriptKeywordReplacer.cs

@@ -15,6 +15,7 @@ namespace MyGameDevTools.ScriptTemplates
     public class ScriptKeywordReplacer
     {
         const string _scriptNameKeyword = "#SCRIPTNAME#";
+        const string _whitespaceKeyword = "# #";
         const string _namespaceKeyword = "#NAMESPACE#";
         const string _signatureKeyword = "#SIGNATURE#";
         const string _authorKeyword = "#AUTHOR#";
@@ -56,7 +57,7 @@ public string ProcessScriptTemplate(string scriptContent, string path)
                 if (regex.IsMatch(scriptContent))
                 {
                     var match = regex.Match(scriptContent);
-                    var indentString = GetIndentReplacement();
+                    var indentString = "\n" + GetIndentReplacement();
                     var indentedMatch = match.Value.Replace("\n", indentString);
                     scriptContent = scriptContent
                         .Replace(match.Value, indentedMatch)
@@ -71,16 +72,17 @@ public string ProcessScriptTemplate(string scriptContent, string path)
             var stringBuilder = new StringBuilder(scriptContent);
             stringBuilder
                 .Replace(_signatureKeyword, _templateSettings.Signature.Enabled ? _signatureTemplate.Replace(_authorKeyword, AuthorString).Replace(_dateKeyword, DateString) : string.Empty)
-                .Replace(_scriptNameKeyword, System.IO.Path.GetFileNameWithoutExtension(path));
+                .Replace(_scriptNameKeyword, System.IO.Path.GetFileNameWithoutExtension(path))
+                .Replace(_whitespaceKeyword, GetIndentReplacement());
             return Regex.Replace(stringBuilder.ToString(), @"\r\n|\n\r|\n|\r", Environment.NewLine);
         }
 
         string GetIndentReplacement()
         {
-            string indentValue = _templateSettings.Namespace.IndentPattern == IndentPattern.Spaces ? " " : "\t";
-            var stringBuilder = new StringBuilder("\n");
+            string indentValue = _templateSettings.Indentation.IndentPattern == IndentPattern.Spaces ? " " : "\t";
+            var stringBuilder = new StringBuilder();
 
-            for (int i = 0; i < _templateSettings.Namespace.IndentMultiplier; i++)
+            for (int i = 0; i < _templateSettings.Indentation.IndentMultiplier; i++)
                 stringBuilder.Append(indentValue);
             return stringBuilder.ToString();
         }

Packages/mygamedevtools-script-template/Editor/ScriptTemplateSettings.cs

@@ -16,6 +16,7 @@ public class ScriptTemplateSettings
     {
         const string _editorPrefsKey = "com.myunitytools.script-template:settings";
 
+        public IndentationSettings Indentation;
         public SignatureSettings Signature;
         public NamespaceSettings Namespace;
 
@@ -29,12 +30,13 @@ public override bool Equals(object obj)
         {
             return obj is ScriptTemplateSettings settings &&
                    EqualityComparer<SignatureSettings>.Default.Equals(Signature, settings.Signature) &&
-                   EqualityComparer<NamespaceSettings>.Default.Equals(Namespace, settings.Namespace);
+                   EqualityComparer<NamespaceSettings>.Default.Equals(Namespace, settings.Namespace) &&
+                   EqualityComparer<IndentationSettings>.Default.Equals(Indentation, settings.Indentation);
         }
 
         public override int GetHashCode()
         {
-            return HashCode.Combine(Signature, Namespace);
+            return HashCode.Combine(Signature, Namespace, Indentation);
         }
 
         public bool IsEmpty() => Signature.IsEmpty() && Namespace.IsEmpty();