From a25c5b764305947fd4c9d475db3118dd9b0d5c14 Mon Sep 17 00:00:00 2001
From: Mitch Capper <mitch.capper@gmail.com>
Date: Tue, 19 Jul 2022 12:38:39 -0700
Subject: [PATCH] Add option to not auto-update debug start settings when
 selected assembly changes

---
 .../DbgUI/StartDebuggingOptionsProvider.cs    |  7 +++-
 .../dnSpy.Debugger.Resources.Designer.cs      |  9 ++++
 .../Properties/dnSpy.Debugger.Resources.resx  |  3 ++
 .../Settings/DebuggerSettingsImpl.cs          | 20 +++++++++
 .../Themes/wpf.styles.templates.xaml          | 42 ++++++++++---------
 .../DebuggerSettings.cs                       |  5 +++
 6 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/StartDebuggingOptionsProvider.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/StartDebuggingOptionsProvider.cs
index b2c97f0cd9..8b80cc35a5 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/StartDebuggingOptionsProvider.cs
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/DbgUI/StartDebuggingOptionsProvider.cs
@@ -43,10 +43,12 @@ sealed class StartDebuggingOptionsProvider {
 		readonly Lazy<StartDebuggingOptionsPageProvider>[] startDebuggingOptionsPageProviders;
 		readonly Lazy<DbgProcessStarterService> dbgProcessStarterService;
 		readonly Lazy<GenericDebugEngineGuidProvider, IGenericDebugEngineGuidProviderMetadata>[] genericDebugEngineGuidProviders;
+		readonly Lazy<Settings.DebuggerSettingsImpl> debuggerSettingsImpl;
 		readonly StartDebuggingOptionsMru mru;
 
 		[ImportingConstructor]
-		StartDebuggingOptionsProvider(IAppWindow appWindow, IDocumentTabService documentTabService, Lazy<DbgProcessStarterService> dbgProcessStarterService, [ImportMany] IEnumerable<Lazy<StartDebuggingOptionsPageProvider>> startDebuggingOptionsPageProviders, [ImportMany] IEnumerable<Lazy<GenericDebugEngineGuidProvider, IGenericDebugEngineGuidProviderMetadata>> genericDebugEngineGuidProviders) {
+		StartDebuggingOptionsProvider(IAppWindow appWindow, IDocumentTabService documentTabService, Lazy<DbgProcessStarterService> dbgProcessStarterService, [ImportMany] IEnumerable<Lazy<StartDebuggingOptionsPageProvider>> startDebuggingOptionsPageProviders, [ImportMany] IEnumerable<Lazy<GenericDebugEngineGuidProvider, IGenericDebugEngineGuidProviderMetadata>> genericDebugEngineGuidProviders, Lazy<Settings.DebuggerSettingsImpl> debuggerSettingsImpl) {
+			this.debuggerSettingsImpl = debuggerSettingsImpl;
 			this.appWindow = appWindow;
 			this.documentTabService = documentTabService;
 			this.dbgProcessStarterService = dbgProcessStarterService;
@@ -87,6 +89,9 @@ string GetCurrentFilename() {
 
 			var oldOptions = mru.TryGetOptions(filename);
 			var lastOptions = mru.TryGetLastOptions();
+			if (oldOptions == null && lastOptions.HasValue && lastOptions!.Value.options != null && debuggerSettingsImpl.Value.DontAutoUpdateDebugLaunchSettings)
+				oldOptions = lastOptions.Value;
+
 			foreach (var page in pages) {
 				if (oldOptions?.pageGuid == page.Guid)
 					page.InitializePreviousOptions(WithBreakKind(oldOptions!.Value.options, defaultBreakKind));
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.Designer.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.Designer.cs
index e43c75a131..0161b45599 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.Designer.cs
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.Designer.cs
@@ -1202,6 +1202,15 @@ public static string DbgSettings_DisableDebuggerDetection {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Don&apos;t auto update debugger launch settings unless first time since dnSpy launch.
+        /// </summary>
+        public static string DbgSettings_DontAutoUpdateDebugLaunchSettings {
+            get {
+                return ResourceManager.GetString("DbgSettings_DontAutoUpdateDebugLaunchSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Enable Just My Code debugging support.
         /// </summary>
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.resx b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.resx
index 74a0901247..fbbd304ecd 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.resx
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Properties/dnSpy.Debugger.Resources.resx
@@ -1554,4 +1554,7 @@ Do you wish to continue?</value>
   <data name="Column_LoadModule" xml:space="preserve">
     <value>Load</value>
   </data>
+  <data name="DbgSettings_DontAutoUpdateDebugLaunchSettings" xml:space="preserve">
+    <value>Don't auto update debugger launch settings unless first time since dnSpy launch</value>
+  </data>  
 </root>
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Settings/DebuggerSettingsImpl.cs b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Settings/DebuggerSettingsImpl.cs
index ef4807458e..781ad882bf 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Settings/DebuggerSettingsImpl.cs
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Settings/DebuggerSettingsImpl.cs
@@ -471,6 +471,23 @@ public override bool HideDeprecatedError {
 		}
 		bool hideDeprecatedError = false;
 
+		public override bool DontAutoUpdateDebugLaunchSettings {
+			get {
+				lock (lockObj)
+					return dontAutoUpdateDebugLaunchSettings;
+			}
+			set {
+				bool modified;
+				lock (lockObj) {
+					modified = dontAutoUpdateDebugLaunchSettings != value;
+					dontAutoUpdateDebugLaunchSettings = value;
+				}
+				if (modified)
+					OnPropertyChanged(nameof(DontAutoUpdateDebugLaunchSettings));
+			}
+		}
+		bool dontAutoUpdateDebugLaunchSettings = false;
+
 		public override bool SuppressJITOptimization_SystemModules {
 			get {
 				lock (lockObj)
@@ -707,6 +724,7 @@ public DebuggerSettingsBase CopyTo(DebuggerSettingsBase other) {
 			other.SuppressJITOptimization_SystemModules = SuppressJITOptimization_SystemModules;
 			other.SuppressJITOptimization_ProgramModules = SuppressJITOptimization_ProgramModules;
 			other.FocusActiveProcess = FocusActiveProcess;
+			other.DontAutoUpdateDebugLaunchSettings = DontAutoUpdateDebugLaunchSettings;
 			other.FocusDebuggerWhenProcessBreaks = FocusDebuggerWhenProcessBreaks;
 			other.ShowReturnValues = ShowReturnValues;
 			other.RedirectGuiConsoleOutput = RedirectGuiConsoleOutput;
@@ -761,6 +779,7 @@ sealed class DebuggerSettingsImpl : DebuggerSettingsBase {
 			SuppressJITOptimization_SystemModules = sect.Attribute<bool?>(nameof(SuppressJITOptimization_SystemModules)) ?? SuppressJITOptimization_SystemModules;
 			SuppressJITOptimization_ProgramModules = sect.Attribute<bool?>(nameof(SuppressJITOptimization_ProgramModules)) ?? SuppressJITOptimization_ProgramModules;
 			FocusActiveProcess = sect.Attribute<bool?>(nameof(FocusActiveProcess)) ?? FocusActiveProcess;
+			DontAutoUpdateDebugLaunchSettings = sect.Attribute<bool?>(nameof(DontAutoUpdateDebugLaunchSettings)) ?? DontAutoUpdateDebugLaunchSettings;
 			FocusDebuggerWhenProcessBreaks = sect.Attribute<bool?>(nameof(FocusDebuggerWhenProcessBreaks)) ?? FocusDebuggerWhenProcessBreaks;
 			ShowReturnValues = sect.Attribute<bool?>(nameof(ShowReturnValues)) ?? ShowReturnValues;
 			RedirectGuiConsoleOutput = sect.Attribute<bool?>(nameof(RedirectGuiConsoleOutput)) ?? RedirectGuiConsoleOutput;
@@ -804,6 +823,7 @@ void DebuggerSettingsImpl_PropertyChanged(object? sender, PropertyChangedEventAr
 			sect.Attribute(nameof(SuppressJITOptimization_SystemModules), SuppressJITOptimization_SystemModules);
 			sect.Attribute(nameof(SuppressJITOptimization_ProgramModules), SuppressJITOptimization_ProgramModules);
 			sect.Attribute(nameof(FocusActiveProcess), FocusActiveProcess);
+			sect.Attribute(nameof(DontAutoUpdateDebugLaunchSettings), DontAutoUpdateDebugLaunchSettings);
 			sect.Attribute(nameof(FocusDebuggerWhenProcessBreaks), FocusDebuggerWhenProcessBreaks);
 			sect.Attribute(nameof(ShowReturnValues), ShowReturnValues);
 			sect.Attribute(nameof(RedirectGuiConsoleOutput), RedirectGuiConsoleOutput);
diff --git a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Themes/wpf.styles.templates.xaml b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Themes/wpf.styles.templates.xaml
index 19572c7d3b..577f4a3f49 100644
--- a/Extensions/dnSpy.Debugger/dnSpy.Debugger/Themes/wpf.styles.templates.xaml
+++ b/Extensions/dnSpy.Debugger/dnSpy.Debugger/Themes/wpf.styles.templates.xaml
@@ -63,6 +63,7 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <GroupBox Grid.Row="0" Margin="0 5 0 0" Header="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_DisableDebuggerDetection}">
                 <Grid>
@@ -90,13 +91,14 @@
             <CheckBox Grid.Row="9" Margin="0 5 0 0" IsChecked="{Binding Settings.FocusActiveProcess}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_FocusActiveProcess}" />
             <CheckBox Grid.Row="10" Margin="0 5 0 0" IsChecked="{Binding Settings.FocusDebuggerWhenProcessBreaks}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_FocusDebuggerWhenProcessBreaks}" />
             <CheckBox Grid.Row="11" Margin="0 5 0 0" IsChecked="{Binding Settings.RedirectGuiConsoleOutput}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_RedirectGuiConsoleOutput}" />
-            <CheckBox Grid.Row="12" Margin="0 5 0 0" IsChecked="{Binding Settings.EnableManagedDebuggingAssistants}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_EnableManagedDebuggingAssistants}" />
-            <CheckBox Grid.Row="13" Margin="0 5 0 0" IsChecked="{Binding Settings.EnableJustMyCodeDebugging}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_EnableJustMyCodeDebugging}" />
-            <CheckBox Grid.Row="14" Margin="0 5 0 0" IsChecked="{Binding Settings.StepOverCodeInSystemModules}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_StepOverCodeInSystemModules}" IsEnabled="{Binding Settings.EnableJustMyCodeDebugging}" />
-            <CheckBox Grid.Row="15" Margin="0 5 0 0" IsChecked="{Binding Settings.OnlyStepIntoCodeInPrimaryModule}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_OnlyStepIntoCodeInPrimaryModule}" IsEnabled="{Binding Settings.EnableJustMyCodeDebugging}" />
-            <CheckBox Grid.Row="16" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowRawStructureOfObjects}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowRawStructureOfObjects}" />
-            <CheckBox Grid.Row="17" Margin="0 5 0 0" IsChecked="{Binding Settings.IgnoreUnhandledExceptions}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_IgnoreUnhandledExceptions}" />
-            <GroupBox Grid.Row="18" Margin="0 5 0 0" Header="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SuppressJITOptimization}">
+            <CheckBox Grid.Row="12" Margin="0 5 0 0" IsChecked="{Binding Settings.DontAutoUpdateDebugLaunchSettings}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_DontAutoUpdateDebugLaunchSettings}" />
+            <CheckBox Grid.Row="13" Margin="0 5 0 0" IsChecked="{Binding Settings.EnableManagedDebuggingAssistants}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_EnableManagedDebuggingAssistants}" />
+            <CheckBox Grid.Row="14" Margin="0 5 0 0" IsChecked="{Binding Settings.EnableJustMyCodeDebugging}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_EnableJustMyCodeDebugging}" />
+            <CheckBox Grid.Row="15" Margin="0 5 0 0" IsChecked="{Binding Settings.StepOverCodeInSystemModules}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_StepOverCodeInSystemModules}" IsEnabled="{Binding Settings.EnableJustMyCodeDebugging}" />
+            <CheckBox Grid.Row="16" Margin="0 5 0 0" IsChecked="{Binding Settings.OnlyStepIntoCodeInPrimaryModule}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_OnlyStepIntoCodeInPrimaryModule}" IsEnabled="{Binding Settings.EnableJustMyCodeDebugging}" />
+            <CheckBox Grid.Row="17" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowRawStructureOfObjects}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowRawStructureOfObjects}" />
+            <CheckBox Grid.Row="18" Margin="0 5 0 0" IsChecked="{Binding Settings.IgnoreUnhandledExceptions}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_IgnoreUnhandledExceptions}" />
+            <GroupBox Grid.Row="19" Margin="0 5 0 0" Header="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SuppressJITOptimization}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
@@ -106,19 +108,19 @@
                     <CheckBox Grid.Row="1" Margin="0 5 0 0" IsChecked="{Binding Settings.SuppressJITOptimization_ProgramModules}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SuppressJITOptimization_ProgramModules}" />
                 </Grid>
             </GroupBox>
-            <CheckBox Grid.Row="19" Margin="0 5 0 0" IsChecked="{Binding Settings.HideCompilerGeneratedMembers}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HideCompilerGeneratedMembers}" />
-            <CheckBox Grid.Row="20" Margin="0 5 0 0" IsChecked="{Binding Settings.RespectHideMemberAttributes}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_RespectHideMemberAttributes}" />
-            <CheckBox Grid.Row="21" Margin="0 5 0 0" IsChecked="{Binding Settings.HideDeprecatedError}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HideDeprecatedError}" />
-            <CheckBox Grid.Row="22" Margin="0 5 0 0" IsChecked="{Binding Settings.SortParameters}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SortParameters}" />
-            <CheckBox Grid.Row="23" Margin="0 5 0 0" IsChecked="{Binding Settings.SortLocals}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SortLocals}" />
-            <CheckBox Grid.Row="24" Margin="0 5 0 0" IsChecked="{Binding Settings.GroupParametersAndLocalsTogether}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_GroupParametersAndLocalsTogether}" />
-            <CheckBox Grid.Row="25" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowCompilerGeneratedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowCompilerGeneratedVariables}" />
-            <CheckBox Grid.Row="26" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowDecompilerGeneratedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowDecompilerGeneratedVariables}" />
-            <CheckBox Grid.Row="27" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowRawLocals}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowRawLocals}" />
-            <CheckBox Grid.Row="28" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowReturnValues}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowReturnValues}" />
-            <CheckBox Grid.Row="29" Margin="0 5 0 0" IsChecked="{Binding Settings.HighlightChangedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HighlightChangedVariables}" />
-            <CheckBox Grid.Row="30" Margin="0 5 0 0" IsChecked="{Binding Settings.SyntaxHighlight}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SyntaxHighlight}" />
-            <GroupBox Grid.Row="31" Margin="0 5 0 0" Header="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_Language}">
+            <CheckBox Grid.Row="20" Margin="0 5 0 0" IsChecked="{Binding Settings.HideCompilerGeneratedMembers}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HideCompilerGeneratedMembers}" />
+            <CheckBox Grid.Row="21" Margin="0 5 0 0" IsChecked="{Binding Settings.RespectHideMemberAttributes}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_RespectHideMemberAttributes}" />
+            <CheckBox Grid.Row="22" Margin="0 5 0 0" IsChecked="{Binding Settings.HideDeprecatedError}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HideDeprecatedError}" />
+            <CheckBox Grid.Row="23" Margin="0 5 0 0" IsChecked="{Binding Settings.SortParameters}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SortParameters}" />
+            <CheckBox Grid.Row="24" Margin="0 5 0 0" IsChecked="{Binding Settings.SortLocals}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SortLocals}" />
+            <CheckBox Grid.Row="25" Margin="0 5 0 0" IsChecked="{Binding Settings.GroupParametersAndLocalsTogether}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_GroupParametersAndLocalsTogether}" />
+            <CheckBox Grid.Row="26" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowCompilerGeneratedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowCompilerGeneratedVariables}" />
+            <CheckBox Grid.Row="27" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowDecompilerGeneratedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowDecompilerGeneratedVariables}" />
+            <CheckBox Grid.Row="28" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowRawLocals}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowRawLocals}" />
+            <CheckBox Grid.Row="29" Margin="0 5 0 0" IsChecked="{Binding Settings.ShowReturnValues}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_ShowReturnValues}" />
+            <CheckBox Grid.Row="30" Margin="0 5 0 0" IsChecked="{Binding Settings.HighlightChangedVariables}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_HighlightChangedVariables}" />
+            <CheckBox Grid.Row="31" Margin="0 5 0 0" IsChecked="{Binding Settings.SyntaxHighlight}" Content="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_SyntaxHighlight}" />
+            <GroupBox Grid.Row="32" Margin="0 5 0 0" Header="{x:Static p:dnSpy_Debugger_Resources.DbgSettings_Language}">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="Auto" />
diff --git a/dnSpy/dnSpy.Contracts.Debugger/DebuggerSettings.cs b/dnSpy/dnSpy.Contracts.Debugger/DebuggerSettings.cs
index 940119964b..f2c6af5350 100644
--- a/dnSpy/dnSpy.Contracts.Debugger/DebuggerSettings.cs
+++ b/dnSpy/dnSpy.Contracts.Debugger/DebuggerSettings.cs
@@ -168,6 +168,11 @@ public abstract class DebuggerSettings : INotifyPropertyChanged {
 		/// </summary>
 		public abstract bool HideDeprecatedError { get; set; }
 
+		/// <summary>
+		/// Reuse the last launch debug settings unless first time since dnSpy launch
+		/// </summary>
+		public abstract bool DontAutoUpdateDebugLaunchSettings { get; set; }
+
 		/// <summary>
 		/// Suppress JIT optimization on module load (system modules). If false, the code will be optimized and
 		/// much more difficult to debug (it will be like when attaching to a process).