From ac83233dc22743d83155b0479ad91ac65411fc4b Mon Sep 17 00:00:00 2001
From: Volodymyr Shkolka <ztBlackGad@gmail.com>
Date: Fri, 10 Jul 2020 13:54:09 +0300
Subject: [PATCH] Add ability to specify active debugger attachment instead of
 passive (#61)

---
 CliFx/ApplicationConfiguration.cs | 12 ++++++++++--
 CliFx/CliApplication.cs           | 15 +++++++++++++--
 CliFx/CliApplicationBuilder.cs    |  6 ++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/CliFx/ApplicationConfiguration.cs b/CliFx/ApplicationConfiguration.cs
index 243f268..7a7e7cd 100644
--- a/CliFx/ApplicationConfiguration.cs
+++ b/CliFx/ApplicationConfiguration.cs
@@ -17,22 +17,30 @@ namespace CliFx
         /// Whether debug mode is allowed in this application.
         /// </summary>
         public bool IsDebugModeAllowed { get; }
-
+        
         /// <summary>
         /// Whether preview mode is allowed in this application.
         /// </summary>
         public bool IsPreviewModeAllowed { get; }
 
+        /// <summary>
+        /// Prompt debugger launch when application is in debug mode
+        /// </summary>
+        public bool PromptDebuggerLaunchInDebugMode { get; }
+
         /// <summary>
         /// Initializes an instance of <see cref="ApplicationConfiguration"/>.
         /// </summary>
         public ApplicationConfiguration(
             IReadOnlyList<Type> commandTypes,
-            bool isDebugModeAllowed, bool isPreviewModeAllowed)
+            bool isDebugModeAllowed, 
+            bool isPreviewModeAllowed, 
+            bool promptDebuggerLaunchInDebugMode)
         {
             CommandTypes = commandTypes;
             IsDebugModeAllowed = isDebugModeAllowed;
             IsPreviewModeAllowed = isPreviewModeAllowed;
+            PromptDebuggerLaunchInDebugMode = promptDebuggerLaunchInDebugMode;
         }
     }
 }
\ No newline at end of file
diff --git a/CliFx/CliApplication.cs b/CliFx/CliApplication.cs
index 6dff82d..d8c84b7 100644
--- a/CliFx/CliApplication.cs
+++ b/CliFx/CliApplication.cs
@@ -125,8 +125,19 @@ namespace CliFx
                 // Debug mode
                 if (_configuration.IsDebugModeAllowed && input.IsDebugDirectiveSpecified)
                 {
-                    // Ensure debugger is attached and continue
-                    await WaitForDebuggerAsync();
+                    if (_configuration.PromptDebuggerLaunchInDebugMode)
+                    {
+                        // Prompt debugger launcher dialog
+                        if (!Debugger.IsAttached)
+                        {
+                            Debugger.Launch();
+                        }
+                    }
+                    else
+                    {
+                        // Ensure debugger is attached and continue
+                        await WaitForDebuggerAsync();
+                    }
                 }
 
                 // Preview mode
diff --git a/CliFx/CliApplicationBuilder.cs b/CliFx/CliApplicationBuilder.cs
index 9c6724b..0405576 100644
--- a/CliFx/CliApplicationBuilder.cs
+++ b/CliFx/CliApplicationBuilder.cs
@@ -16,6 +16,7 @@ namespace CliFx
         private readonly HashSet<Type> _commandTypes = new HashSet<Type>();
 
         private bool _isDebugModeAllowed = true;
+        private bool _promptDebuggerLaunch = false;
         private bool _isPreviewModeAllowed = true;
         private string? _title;
         private string? _executableName;
@@ -78,9 +79,10 @@ namespace CliFx
         /// <summary>
         /// Specifies whether debug mode (enabled with [debug] directive) is allowed in the application.
         /// </summary>
-        public CliApplicationBuilder AllowDebugMode(bool isAllowed = true)
+        public CliApplicationBuilder AllowDebugMode(bool isAllowed = true, bool promptDebuggerLaunch = false)
         {
             _isDebugModeAllowed = isAllowed;
+            _promptDebuggerLaunch = promptDebuggerLaunch;
             return this;
         }
 
@@ -166,7 +168,7 @@ namespace CliFx
             _typeActivator ??= new DefaultTypeActivator();
 
             var metadata = new ApplicationMetadata(_title, _executableName, _versionText, _description);
-            var configuration = new ApplicationConfiguration(_commandTypes.ToArray(), _isDebugModeAllowed, _isPreviewModeAllowed);
+            var configuration = new ApplicationConfiguration(_commandTypes.ToArray(), _isDebugModeAllowed, _isPreviewModeAllowed, _promptDebuggerLaunch);
 
             return new CliApplication(metadata, configuration, _console, _typeActivator);
         }