Improved USS, templates, creating new scripts

Assets/Editor Default Resources/RicUtils/Common.uss

@@ -0,0 +1,4 @@
+.hidden{
+	height: 0px;
+	visibility: hidden;
+}

Assets/Editor Default Resources/RicUtils/TabBar.uss

@@ -1,8 +1,3 @@
-.hidden{
-	height: 0px;
-	visibility: hidden;
-}
-
 .tabBar{
 	flex-direction: row;
 	background-color: #1e1e1e;

Assets/RicUtils/Editor/CustomEditor/AvailableScriptableObjectCustomEditor.cs

@@ -6,7 +6,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace RicUtils.Editor.CustomEditor
+namespace RicUtils.Editor.CustomEditors
 {
     [UnityEditor.CustomEditor(typeof(AvailableScriptableObject<>), true)]
     [CanEditMultipleObjects]

Assets/RicUtils/Editor/CustomEditor/CustomScriptableObjectCustomEditor.cs

@@ -5,7 +5,7 @@
 using UnityEditor;
 using UnityEngine;
 
-namespace RicUtils.Editor.CustomEditor
+namespace RicUtils.Editor.CustomEditors
 {
     [UnityEditor.CustomEditor(typeof(GenericScriptableObject), true)]
     [CanEditMultipleObjects]

Assets/RicUtils/Editor/Templates/Script-NewAvailableScriptableObject.cs.txt

@@ -7,6 +7,6 @@ using RicUtils.ScriptableObjects;
     #ROOTNAMESPACEBEGIN#
 public class #SCRIPTNAME# : AvailableScriptableObject<#SCRIPTABLEOBJECT#>
 {
-
+	#NOTRIM#
 }
 #ROOTNAMESPACEEND#

Assets/RicUtils/Editor/Templates/Script-NewGenericEditorWindow.cs.txt

@@ -16,17 +16,17 @@ public class #SCRIPTNAME# : GenericEditorWindow<#SCRIPTABLEOBJECT#, #AVAILABLESC
 
     protected override void DrawGUI()
     {
-
+        #NOTRIM#
     }
 
     protected override void LoadScriptableObject(#SCRIPTABLEOBJECT# so, bool isNull)
     {
-
+        #NOTRIM#
     }
 
     protected override void CreateAsset(ref #SCRIPTABLEOBJECT# asset)
     {
-
+        #NOTRIM#
     }
 }
 #ROOTNAMESPACEEND#

Assets/RicUtils/Editor/Templates/Script-NewGenericScriptableObject.cs.txt

@@ -7,6 +7,6 @@ using RicUtils.ScriptableObjects;
     #ROOTNAMESPACEBEGIN#
 public class #SCRIPTNAME# : GenericScriptableObject
 {
-
+	#NOTRIM#
 }
 #ROOTNAMESPACEEND#

Assets/RicUtils/Editor/Elements/AdvButton.cs → Assets/RicUtils/Editor/UIElements/AdvButton.cs

@@ -4,7 +4,7 @@
 using UnityEngine.Scripting;
 using UnityEngine.UIElements;
 
-namespace RicUtils.Editor
+namespace RicUtils.Editor.UIElements
 {
     // web* src: https://gist.github.com/andrew-raphael-lukasik/69c7858e39e22f197ca51b318b218cc7
     [Preserve]

Assets/RicUtils/Editor/Elements/TabBar.cs → Assets/RicUtils/Editor/UIElements/TabBar.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using UnityEngine.UIElements;
 
-namespace RicUtils.Editor.Elements
+namespace RicUtils.Editor.UIElements
 {
     public class TabBar
     {

Assets/RicUtils/Editor/Elements/TabData.cs → Assets/RicUtils/Editor/UIElements/TabData.cs

@@ -1,6 +1,6 @@
 using UnityEngine.UIElements;
 
-namespace RicUtils.Editor.Elements
+namespace RicUtils.Editor.UIElements
 {
     public struct TabData
     {

Assets/RicUtils/Editor/Utilities/DoCreateScriptAsset.cs

@@ -13,119 +13,13 @@ public class DoCreateScriptAsset : EndNameEditAction
     {
         public override void Action(int instanceId, string pathName, string resourceFile)
         {
-            Object o = CreateScriptAssetFromTemplate(pathName, resourceFile);
+            Object o = FileUtilities.CreateScriptAssetFromTemplate(pathName, resourceFile, CustomReplaces);
             ProjectWindowUtil.ShowCreatedAsset(o);
         }
 
-        private Object CreateScriptAssetFromTemplate(string pathName, string resourceFile)
-        {
-            string content = File.ReadAllText(resourceFile);
-            var method = typeof(ProjectWindowUtil).GetMethod("CreateScriptAssetWithContent", BindingFlags.Static | BindingFlags.NonPublic);
-            return (Object)method.Invoke(null, new object[] { pathName, PreprocessScriptAssetTemplate(pathName, content) });
-        }
-
-        // https://github.com/Unity-Technologies/UnityCsReference/blob/master/Editor/Mono/ProjectWindow/ProjectWindowUtil.cs
-        private string PreprocessScriptAssetTemplate(string pathName, string resourceContent)
-        {
-            string rootNamespace = null;
-
-            if (Path.GetExtension(pathName) == ".cs")
-            {
-                rootNamespace = CompilationPipeline.GetAssemblyRootNamespaceFromScriptPath(pathName);
-            }
-
-            string content = resourceContent;
-
-            // #NOTRIM# is a special marker that is used to mark the end of a line where we want to leave whitespace. prevent editors auto-stripping it by accident.
-            content = content.Replace("#NOTRIM#", "");
-
-            // macro replacement
-            string baseFile = Path.GetFileNameWithoutExtension(pathName);
-
-            content = content.Replace("#NAME#", baseFile);
-            string baseFileNoSpaces = baseFile.Replace(" ", "");
-            content = content.Replace("#SCRIPTNAME#", baseFileNoSpaces);
-
-            content = CustomReplaces(content);
-
-            content = RemoveOrInsertNamespace(content, rootNamespace);
-
-            // if the script name begins with an uppercase character we support a lowercase substitution variant
-            if (char.IsUpper(baseFileNoSpaces, 0))
-            {
-                baseFileNoSpaces = char.ToLower(baseFileNoSpaces[0]) + baseFileNoSpaces.Substring(1);
-                content = content.Replace("#SCRIPTNAME_LOWER#", baseFileNoSpaces);
-            }
-            else
-            {
-                // still allow the variant, but change the first character to upper and prefix with "my"
-                baseFileNoSpaces = "my" + char.ToUpper(baseFileNoSpaces[0]) + baseFileNoSpaces.Substring(1);
-                content = content.Replace("#SCRIPTNAME_LOWER#", baseFileNoSpaces);
-            }
-
-            return content;
-        }
-
         protected virtual string CustomReplaces(string content)
         {
             return content;
         }
-
-        private string RemoveOrInsertNamespace(string content, string rootNamespace)
-        {
-            var rootNamespaceBeginTag = "#ROOTNAMESPACEBEGIN#";
-            var rootNamespaceEndTag = "#ROOTNAMESPACEEND#";
-
-            if (!content.Contains(rootNamespaceBeginTag) || !content.Contains(rootNamespaceEndTag))
-                return content;
-
-            if (string.IsNullOrEmpty(rootNamespace))
-            {
-                content = Regex.Replace(content, $"((\\r\\n)|\\n)[ \\t]*{rootNamespaceBeginTag}[ \\t]*", string.Empty);
-                content = Regex.Replace(content, $"((\\r\\n)|\\n)[ \\t]*{rootNamespaceEndTag}[ \\t]*", string.Empty);
-
-                return content;
-            }
-
-            // Use first found newline character as newline for entire file after replace.
-            var newline = content.Contains("\r\n") ? "\r\n" : "\n";
-            var contentLines = new List<string>(content.Split(new[] { "\r\n", "\r", "\n" }, System.StringSplitOptions.None));
-
-            int i = 0;
-
-            for (; i < contentLines.Count; ++i)
-            {
-                if (contentLines[i].Contains(rootNamespaceBeginTag))
-                    break;
-            }
-
-            var beginTagLine = contentLines[i];
-
-            // Use the whitespace between beginning of line and #ROOTNAMESPACEBEGIN# as identation.
-            var indentationString = beginTagLine.Substring(0, beginTagLine.IndexOf("#"));
-
-            contentLines[i] = $"namespace {rootNamespace}";
-            contentLines.Insert(i + 1, "{");
-
-            i += 2;
-
-            for (; i < contentLines.Count; ++i)
-            {
-                var line = contentLines[i];
-
-                if (string.IsNullOrEmpty(line) || line.Trim().Length == 0)
-                    continue;
-
-                if (line.Contains(rootNamespaceEndTag))
-                {
-                    contentLines[i] = "}";
-                    break;
-                }
-
-                contentLines[i] = $"{indentationString}{line}";
-            }
-
-            return string.Join(newline, contentLines.ToArray());
-        }
     }
 }

Assets/RicUtils/Editor/Utilities/EditorGUIHelper.cs

@@ -1,4 +1,4 @@
-using RicUtils.Editor.Elements;
+using RicUtils.Editor.UIElements;
 using System.Collections;
 using System.Linq;
 using System.Reflection;
@@ -407,5 +407,10 @@ public static TabBar AddTabBar(this VisualElement root)
 
             return tabBar;
         }
+
+        public static void AddCommonStylesheet(this VisualElement root)
+        {
+            root.AddStylesheet("RicUtils/Common.uss");
+        }
     }
 }