Fixes for the last merge inaccuracies

Author: oleg-shilo

src/CSScriptIntellisense/CSharpIntellisense/Intellisense.Common.dll

@@ -46,8 +46,10 @@ public string GetFileName()
         public bool QuickViewAutoRefreshAvailable = false;
         public bool NavigateToRawCodeOnDblClickInOutput = false;
 
+        public bool ShowOpenInVsAlways = false;
         //public bool BuildOnF7 = true;
         public bool BreakOnException = false;
+        public bool ReloadActiveScriptOnRun = true;
 
         public bool UpdateAfterExit = false;
         public bool UseTogglingPanelVisibility = true;
@@ -58,9 +60,10 @@ public string GetFileName()
         public bool UseRoslynProvider = true;
         public bool VbSupportEnabled = true;
         public bool RestorePanelsAtStartup = true;
+        public string UseCustomLauncher = "";
         public bool StartRoslynServerAtNppStartup = true;
         public bool ImproveWin10ListVeiwRendering = true;
-        public bool HideDevaultAssemblies = true;
+        public bool HideDefaultAssemblies = true;
         public bool WordWrapInVisualizer = true;
         public bool ListManagedProcessesOnly = true;
         public bool RunExternalInDebugMode = true;
@@ -137,6 +140,8 @@ public void Save()
                     SetValue(Section, nameof(DebugPanelInitialTab), DebugPanelInitialTab);
                     SetValue(Section, nameof(LocalDebug), LocalDebug);
                     SetValue(Section, nameof(BreakOnException), BreakOnException);
+                    SetValue(Section, nameof(ShowOpenInVsAlways), ShowOpenInVsAlways);
+                    SetValue(Section, nameof(ReloadActiveScriptOnRun), ReloadActiveScriptOnRun);
                     SetValue(Section, nameof(UpdateAfterExit), UpdateAfterExit);
                     SetValue(Section, nameof(LastUpdatesCheckDate), LastUpdatesCheckDate);
                     SetValue(Section, nameof(CheckUpdatesOnStartup), CheckUpdatesOnStartup);
@@ -148,8 +153,9 @@ public void Save()
                     SetValue(Section, nameof(UseRoslynProvider), UseRoslynProvider);
                     SetValue(Section, nameof(StartRoslynServerAtNppStartup), StartRoslynServerAtNppStartup);
                     SetValue(Section, nameof(ImproveWin10ListVeiwRendering), ImproveWin10ListVeiwRendering);
-                    SetValue(Section, nameof(HideDevaultAssemblies), HideDevaultAssemblies);
+                    SetValue(Section, nameof(HideDefaultAssemblies), HideDefaultAssemblies);
                     SetValue(Section, nameof(RestorePanelsAtStartup), RestorePanelsAtStartup);
+                    SetValue(Section, nameof(UseCustomLauncher), UseCustomLauncher);
                     SetValue(Section, nameof(UpdateMode), UpdateMode);
                     SetValue(Section, nameof(VSProjectTemplatePath), VSProjectTemplatePath);
                     SetValue(Section, nameof(FloatingPanelsWarningAlreadyPropted), FloatingPanelsWarningAlreadyPropted);
@@ -220,6 +226,8 @@ public void Open()
                 NativeAutoCompletionChecked = GetValue(Section, nameof(NativeAutoCompletionChecked), NativeAutoCompletionChecked);
                 ReleaseNotesViewedFor = GetValue(Section, nameof(ReleaseNotesViewedFor), ReleaseNotesViewedFor);
                 BreakOnException = GetValue(Section, nameof(BreakOnException), BreakOnException);
+                ShowOpenInVsAlways = GetValue(Section, nameof(ShowOpenInVsAlways), ShowOpenInVsAlways);
+                ReloadActiveScriptOnRun = GetValue(Section, nameof(ReloadActiveScriptOnRun), ReloadActiveScriptOnRun);
                 UpdateAfterExit = GetValue(Section, nameof(UpdateAfterExit), UpdateAfterExit);
                 LastUpdatesCheckDate = GetValue(Section, nameof(LastUpdatesCheckDate), LastUpdatesCheckDate);
                 CheckUpdatesOnStartup = GetValue(Section, nameof(CheckUpdatesOnStartup), CheckUpdatesOnStartup);
@@ -231,8 +239,9 @@ public void Open()
                 UseRoslynProvider = GetValue(Section, nameof(UseRoslynProvider), UseRoslynProvider);
                 StartRoslynServerAtNppStartup = GetValue(Section, nameof(StartRoslynServerAtNppStartup), StartRoslynServerAtNppStartup);
                 RestorePanelsAtStartup = GetValue(Section, nameof(RestorePanelsAtStartup), RestorePanelsAtStartup);
+                UseCustomLauncher = GetValue(Section, nameof(UseCustomLauncher), UseCustomLauncher);
                 ImproveWin10ListVeiwRendering = GetValue(Section, nameof(ImproveWin10ListVeiwRendering), ImproveWin10ListVeiwRendering);
-                HideDevaultAssemblies = GetValue(Section, nameof(HideDevaultAssemblies), HideDevaultAssemblies);
+                HideDefaultAssemblies = GetValue(Section, nameof(HideDefaultAssemblies), HideDefaultAssemblies);
                 UpdateMode = GetValue(Section, nameof(UpdateMode), UpdateMode);
                 VSProjectTemplatePath = GetValue(Section, nameof(VSProjectTemplatePath), VSProjectTemplatePath);
                 FloatingPanelsWarningAlreadyPropted = GetValue(Section, nameof(FloatingPanelsWarningAlreadyPropted), FloatingPanelsWarningAlreadyPropted);