Merge pull request #44 from mika-f/integrations/unity

src/Plana.CLI/Commands/ObfuscateCommand.cs

@@ -133,7 +133,7 @@ private async Task<List<IPlanaPlugin>> ParseExtraArguments(InvocationContext con
         foreach (var (plugin, attr) in container.Items)
         {
             var enabler = new Option<bool>($"--{attr.Id}", () => false, $"enable {plugin.Name} plugin");
-            allPluginOptions.Add(new PlanaPluginOption(attr.Id, $"enable {plugin.Name} plugin", false));
+            allPluginOptions.Add(new PlanaPluginOption(attr.Id, plugin.Name, $"enable {plugin.Name} plugin", false));
 
             try
             {
@@ -170,7 +170,10 @@ private async Task<List<IPlanaPlugin>> ParseExtraArguments(InvocationContext con
         if (context.ParseResult.GetValueForOption(GlobalCommandLineOptions.RetrieveArgs))
         {
             foreach (var o in allPluginOptions)
-                Console.WriteLine($"Id={o.Name}, Name={o.FriendlyName}, Type={o.ValueType.FullName}, Required={false}, Description={o.Description}");
+                if (o.Description == $"enable {o.FriendlyName} plugin")
+                    Console.WriteLine($"Id={o.Name}, Name={o.FriendlyName}, Type={o.ValueType.FullName}, Required={false}, Description=SEPARATOR");
+                else
+                    Console.WriteLine($"Id={o.Name}, Name={o.FriendlyName}, Type={o.ValueType.FullName}, Required={false}, Description={o.Description}");
 
             throw new ControlledGlobalExitException();
         }

src/Plana.Composition.RenameSymbols.Tests/RenameSymbolsPluginTest.cs

@@ -17,7 +17,7 @@ public async Task CanInstantiateWithDefaults()
 
         Assert.NotNull(instance);
         Assert.Equal("Rename Symbols", instance.Name);
-        Assert.Equal(8, instance.Options.Count);
+        Assert.Equal(7, instance.Options.Count);
 
         Assert.False(instance.IsEnableClassNameRenaming);
         Assert.False(instance.IsEnableFieldsRenaming);
@@ -26,6 +26,5 @@ public async Task CanInstantiateWithDefaults()
         Assert.False(instance.IsEnablePropertiesRenaming);
         Assert.False(instance.IsEnableVariablesRenaming);
         Assert.False(instance.KeepOriginalNameInInspector);
-        Assert.False(instance.KeepOriginalNameWithSendCustomEvent);
     }
 }

src/Plana.Composition.RenameSymbols.Tests/RenameSymbolsPluginTest_Fields.cs

@@ -23,8 +23,8 @@ public async Task RenameFields_ExternalReference()
         var implementation = await container.GetSourceByPathAsync("Plana.Composition.RenameSymbols/RenameSymbolsPlugin.cs");
         var reference = await container.GetSourceByPathAsync("Plana.Composition.RenameSymbols.Tests/RenameSymbolsPluginTest.cs");
 
-        // IsEnableClassNameRenaming -> _0x4b78aef3
-        const string identifier = "_0x4b78aef3";
+        // IsEnableClassNameRenaming -> _0x935f5b12
+        const string identifier = "_0x935f5b12";
 
         var declaration = await implementation.GetFirstSyntax<FieldDeclarationSyntax>(w => w.HasModifier(SyntaxKind.InternalKeyword));
         Assert.Equal(identifier, declaration.Declaration.Variables[0].Identifier.ToString());
@@ -56,8 +56,8 @@ public async Task RenameFields_InternalReference()
 
         var implementation = await container.GetSourceByTypeAsync(typeof(MeaningEqualitySymbolComparator));
 
-        // SymbolDisplayFormat -> _0xd5e5660c
-        const string identifier = "_0xd5e5660c";
+        // SymbolDisplayFormat -> _0xcb375677
+        const string identifier = "_0xcb375677";
 
         var declaration = await implementation.GetFirstSyntax<FieldDeclarationSyntax>(w => w.HasModifiers(SyntaxKind.PrivateKeyword, SyntaxKind.StaticKeyword, SyntaxKind.ReadOnlyKeyword));
         Assert.Equal(identifier, declaration.Declaration.Variables[0].Identifier.ToString());

src/Plana.Composition.RenameSymbols.Tests/RenameSymbolsPluginTest_Variables.cs

@@ -20,8 +20,8 @@ public async Task RenameVariables_ForEachStatement()
 
         var implementation = await container.GetSourceByTypeAsync(typeof(Obfuscator));
 
-        // instance -> _0xcdfa050c
-        const string identifier = "_0xcdfa050c";
+        // instance -> _0x3a050ac8
+        const string identifier = "_0x3a050ac8";
 
         var @foreach = await implementation.GetFirstSyntax<ForEachStatementSyntax>();
         Assert.Equal(identifier, @foreach.Identifier.ToFullString());
@@ -38,8 +38,8 @@ public async Task RenameVariables_PrimaryConstructor()
 
         var implementation = await container.GetSourceByTypeAsync(typeof(AnnotationComment));
 
-        // AnnotationComment.Annotation -> _0x5038b7aa
-        const string identifier = "_0x5038b7aa";
+        // AnnotationComment.Annotation -> _0xd660581b
+        const string identifier = "_0xd660581b";
 
         var declaration = await implementation.GetFirstSyntax<RecordDeclarationSyntax>();
         var constructor = declaration.ParameterList!.Parameters[0];

src/Plana.Composition.RenameSymbols/CSharpSymbolsWalker.cs

@@ -13,7 +13,7 @@
 
 namespace Plana.Composition.RenameSymbols;
 
-internal class CSharpSymbolsWalker(IDocument document, IPlanaSecureRandom random, bool isRenameNamespaces, bool isRenameClasses, bool isRenameProperties, bool isRenameFields, bool isRenameMethods, bool isRenameMethodsWithEvents, bool isRenameVariables, Dictionary<ISymbol, string> dict)
+internal class CSharpSymbolsWalker(IDocument document, IPlanaSecureRandom random, bool isRenameNamespaces, bool isRenameClasses, bool isRenameProperties, bool isRenameFields, bool isRenameMethods, bool isRenameVariables, Dictionary<ISymbol, string> dict)
     : CSharpSyntaxWalker
 {
     private static readonly List<string> Messages =

src/Plana.Composition.RenameSymbols/RenameSymbolsPlugin.cs

@@ -22,11 +22,10 @@ public class RenameSymbolsPlugin : IPlanaPlugin2
     private static readonly PlanaPluginOption Namespace = new("rename-namespaces", "Rename Namespaces", "rename namespaces, not supports file-scoped namespaces", false);
     private static readonly PlanaPluginOption ClassName = new("rename-classes", "Rename Classes", "rename classes", false);
     private static readonly PlanaPluginOption Properties = new("rename-properties", "Rename Properties", "rename properties", false);
-    private static readonly PlanaPluginOption Fields = new("rename-fields", "rename fields", false);
-    private static readonly PlanaPluginOption Methods = new("rename-methods", "rename methods", false);
-    private static readonly PlanaPluginOption WithSendCustomEvent = new("with-send-custom-event", "rename all methods", false);
-    private static readonly PlanaPluginOption Variables = new("rename-variables", "rename local variables", false);
-    private static readonly PlanaPluginOption KeepNameOnInspector = new("enum-attributes", "add UnityEngine.InspectorName to enum members, without already specified", false);
+    private static readonly PlanaPluginOption Fields = new("rename-fields", "Rename Fields", "rename fields", false);
+    private static readonly PlanaPluginOption Methods = new("rename-methods", "Rename Methods", "rename methods", false);
+    private static readonly PlanaPluginOption Variables = new("rename-variables", "Rename Variables", "rename local variables", false);
+    private static readonly PlanaPluginOption KeepNameOnInspector = new("enum-attributes", "Keep Inspector Name of Enums", "add UnityEngine.InspectorName to enum members, without already specified", false);
 
     private readonly Dictionary<ISymbol, string> _dict = new(MeaningEqualitySymbolComparator.Default);
 
@@ -37,9 +36,8 @@ public class RenameSymbolsPlugin : IPlanaPlugin2
     internal bool IsEnablePropertiesRenaming;
     internal bool IsEnableVariablesRenaming;
     internal bool KeepOriginalNameInInspector;
-    internal bool KeepOriginalNameWithSendCustomEvent;
 
-    public IReadOnlyCollection<IPlanaPluginOption> Options => new List<IPlanaPluginOption> { Namespace, ClassName, Properties, Fields, Methods, WithSendCustomEvent, Variables, KeepNameOnInspector }.AsReadOnly();
+    public IReadOnlyCollection<IPlanaPluginOption> Options => new List<IPlanaPluginOption> { Namespace, ClassName, Properties, Fields, Methods, Variables, KeepNameOnInspector }.AsReadOnly();
 
     public string Name => "Rename Symbols";
 
@@ -50,7 +48,6 @@ public void BindParameters(IPlanaPluginParameterBinder binder)
         IsEnablePropertiesRenaming = binder.GetValue(Properties);
         IsEnableFieldsRenaming = binder.GetValue(Fields);
         IsEnableMethodsRenaming = binder.GetValue(Methods);
-        KeepOriginalNameWithSendCustomEvent = binder.GetValue(WithSendCustomEvent);
         IsEnableVariablesRenaming = binder.GetValue(Variables);
         KeepOriginalNameInInspector = binder.GetValue(KeepNameOnInspector);
     }
@@ -67,7 +64,6 @@ public async Task ObfuscateAsync(IPlanaPluginRunContext context)
                 IsEnablePropertiesRenaming,
                 IsEnableFieldsRenaming,
                 IsEnableMethodsRenaming,
-                KeepOriginalNameWithSendCustomEvent,
                 IsEnableVariablesRenaming,
                 _dict
             );

src/Plana.Integrations.Unity/.gitignore

@@ -78,8 +78,8 @@ crashlytics-build.properties
 /UIElementsSchema/
 
 # externals
-/[Aa]ssets/NatsunekoLaboratory/Plana/Plugins/*
-!/[Aa]ssets/NatsunekoLaboratory/Plana/Plugins/*.meta
+/[Aa]ssets/NatsunekoLaboratory/Plana/Plugins/**/*.*
+!/[Aa]ssets/NatsunekoLaboratory/Plana/Plugins/**/*.meta
 /[Aa]ssets/NatsunekoLaboratory/UStyled.meta
 /[Aa]ssets/NatsunekoLaboratory/UStyled/*
 /[Aa]ssets/ObfuscateTest.meta

src/Plana.Integrations.Unity/Assets/NatsunekoLaboratory/Plana/Editor/Models/Abstractions/CommandBase.cs

@@ -15,7 +15,7 @@ namespace NatsunekoLaboratory.Plana.Models.Abstractions
 {
     internal class CommandBase
     {
-        private const string Guid = "300a45c7c5134854a88ad90d52d3a119";
+        private const string Guid = "185d3059c6896f043bb50e0eb319fa67";
         private static readonly string Path;
 
         static CommandBase()

src/Plana.Integrations.Unity/Assets/NatsunekoLaboratory/Plana/Editor/Models/ObfuscateCommand.cs

@@ -96,7 +96,7 @@ public ObfuscateCommand(FileSystemInfo workspace, DirectoryInfo plugins, bool is
                 var friendlyName = property.Value.FriendlyName;
                 var description = property.Value.Description;
 
-                if ($"enable {arg} plugin" == description)
+                if (description == "SEPARATOR")
                     cur = arg;
 
                 if (string.IsNullOrWhiteSpace(cur))

src/Plana.Integrations.Unity/Assets/NatsunekoLaboratory/Plana/Editor/PlanaEditor.cs

@@ -318,10 +318,10 @@ private FileInfo GetProjectScopeWorkspace(FileInfo fi)
             return GetCSharpProjectWorkspace(filename);
         }
 
-        private FileInfo GetCSharpProjectWorkspace(string name)
+        private FileInfo GetCSharpProjectWorkspace(string project)
         {
             var path = Application.dataPath;
-            return new FileInfo(Path.GetFullPath(Path.Combine(path, "..", $"{name}.csproj")));
+            return new FileInfo(Path.GetFullPath(Path.Combine(path, "..", $"{project}.csproj")));
         }
 
         private void UpdateObfuscateButton()