added option to also auto enable the extension when a suo entry is fo…

…und and made this the default (Fixes #160)
MBulli · Feb 25, 2024 · dfd28ab · dfd28ab
1 parent bbc8bf4
commit dfd28ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/CmdArgsOptionPage.cs b/SmartCmdArgs/SmartCmdArgs.Shared/CmdArgsOptionPage.cs
@@ -33,6 +33,9 @@ public enum InactiveDisableMode
     [TypeConverter(typeof(EnumDescriptionTypeConverter))]
     public enum EnableBehaviour
     {
+        [Description("Enable if a *.arg.json file or an entry in the *.suo file is found")]
+        EnableIfArgJsonOrSuoEntryIsFound,
+
         [Description("Enable if a *.arg.json file is found")]
         EnableIfArgJsonIsFound,
 
@@ -79,7 +82,7 @@ public CmdArgsOptionPage() : base()
         [Category("General")]
         [DisplayName("Enable Behaviour")]
         [Description("Choose whether the extension should enable automatically or ask the user for permission first.")]
-        [DefaultValue(EnableBehaviour.EnableIfArgJsonIsFound)]
+        [DefaultValue(EnableBehaviour.EnableIfArgJsonOrSuoEntryIsFound)]
         public EnableBehaviour EnableBehaviour
         {
             get => _enableBehaviour;

diff --git a/SmartCmdArgs/SmartCmdArgs.Shared/Services/LifeCycleService.cs b/SmartCmdArgs/SmartCmdArgs.Shared/Services/LifeCycleService.cs
@@ -105,11 +105,17 @@ private bool GetDefaultEnabled()
                     return false;
 
                 case EnableBehaviour.EnableIfArgJsonIsFound: 
-                    return optionsSettings.VcsSupportEnabled 
-                        && fileStorage.GetAllArgJsonFileNames().Any(File.Exists);
+                    return JsonFileExists();
+
+                case EnableBehaviour.EnableIfArgJsonOrSuoEntryIsFound:
+                    return JsonFileExists() || suoDataService.SuoDataJson?.ProjectArguments.Any() == true;
 
                 default: return false;
             }
+
+            bool JsonFileExists() =>
+                optionsSettings.VcsSupportEnabled
+                && fileStorage.GetAllArgJsonFileNames().Any(File.Exists);
         }
 
         public void UpdateDisabledScreen()