From 34d25098adf04fde798efe77d1068d40dd9d0eab Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 11 Oct 2022 21:03:17 +0200
Subject: [PATCH 01/17] added Alias column to the hosts editor

---
 .../ProjectSystem/Profiles/TargetHostsEditor.xaml | 15 +++++++++++++++
 .../Profiles/TargetHostsEditor.xaml.cs            |  6 +++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
index 461d146d5..d548fef9b 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
@@ -37,6 +37,21 @@
                         </Style>
                     </DataGridTextColumn.EditingElementStyle>
                 </DataGridTextColumn>
+                <DataGridTextColumn Header="Alias" Binding="{Binding Alias, UpdateSourceTrigger=PropertyChanged}" Width="*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                            <Setter Property="Padding" Value="6,0" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                    <DataGridTextColumn.EditingElementStyle>
+                        <Style TargetType="{x:Type TextBox}">
+                            <Setter Property="VerticalContentAlignment" Value="Center" />
+                            <Setter Property="Padding" Value="3,0" />
+                            <Setter Property="Height" Value="22" />
+                        </Style>
+                    </DataGridTextColumn.EditingElementStyle>
+                </DataGridTextColumn>
                 <DataGridTemplateColumn Width="36" MinWidth="36" MaxWidth="36">
                     <DataGridTemplateColumn.Header>
                         <Button Grid.Column="1" Content="➕" ToolTip="Add host" Width="22" Height="22" HorizontalAlignment="Center" Click="AddHost" />
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index b8c00eb82..b581773a1 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -17,10 +17,14 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
             private string _host = "";
             public string Host { get => _host; set => SetField(ref _host, value); }
 
+            private string _alias = "";
+            public string Alias { get => _alias; set => SetField(ref _alias, value); }
+
             public bool UsedInActiveProfile { get; }
 
-            public HostItem(string host, bool usedInActiveProfile)
+            public HostItem(string host, bool usedInActiveProfile, string alias = "")
             {
+                Alias = alias;
                 Host = host;
                 UsedInActiveProfile = usedInActiveProfile;
             }

From 3ef7df6cc265bfea2a3d2d5ba3cb341e2473f4eb Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Mon, 24 Oct 2022 16:39:08 +0200
Subject: [PATCH 02/17] moved HostItem to separate file

---
 .../Profiles/TargetHostsEditor.xaml.cs        | 18 -------------
 VSRAD.Package/Utils/TargetHosts.cs            | 26 +++++++++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)
 create mode 100644 VSRAD.Package/Utils/TargetHosts.cs

diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index b581773a1..c5bffc955 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -12,24 +12,6 @@ namespace VSRAD.Package.ProjectSystem.Profiles
 {
     public sealed partial class TargetHostsEditor : DialogWindow
     {
-        public sealed class HostItem : DefaultNotifyPropertyChanged
-        {
-            private string _host = "";
-            public string Host { get => _host; set => SetField(ref _host, value); }
-
-            private string _alias = "";
-            public string Alias { get => _alias; set => SetField(ref _alias, value); }
-
-            public bool UsedInActiveProfile { get; }
-
-            public HostItem(string host, bool usedInActiveProfile, string alias = "")
-            {
-                Alias = alias;
-                Host = host;
-                UsedInActiveProfile = usedInActiveProfile;
-            }
-        }
-
         public static bool TryParseHost(string input, out string formatted, out string hostname, out ushort port)
         {
             formatted = "";
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
new file mode 100644
index 000000000..9d93691a7
--- /dev/null
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VSRAD.Package.Utils
+{
+    public sealed class HostItem : DefaultNotifyPropertyChanged
+    {
+        private string _host = "";
+        public string Host { get => _host; set => SetField(ref _host, value); }
+
+        private string _alias = "";
+        public string Alias { get => _alias; set => SetField(ref _alias, value); }
+
+        public bool UsedInActiveProfile { get; }
+
+        public HostItem(string host, bool usedInActiveProfile, string alias = "")
+        {
+            Alias = alias;
+            Host = host;
+            UsedInActiveProfile = usedInActiveProfile;
+        }
+    }
+}

From 9fb3ed402edf480d9ce0257c164137258279f278 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Mon, 24 Oct 2022 17:02:44 +0200
Subject: [PATCH 03/17] made HostItem able to create ServerConnectionOptions

---
 .../Commands/ProfileDropdownCommand.cs        |  2 +-
 VSRAD.Package/Options/ProfileOptions.cs       | 20 --------
 .../Profiles/TargetHostsEditor.xaml.cs        | 22 +--------
 VSRAD.Package/Server/CommunicationChannel.cs  |  1 +
 VSRAD.Package/Utils/TargetHosts.cs            | 48 +++++++++++++++++++
 VSRAD.Package/VSRAD.Package.csproj            |  1 +
 6 files changed, 53 insertions(+), 41 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index 448bafe68..fba6481bf 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -95,7 +95,7 @@ private void SetNewTargetMachine(string selected)
             }
             else
             {
-                if (!TargetHostsEditor.TryParseHost(selected, out var formattedHost, out var hostname, out var port))
+                if (!Utils.HostItem.TryParseHost(selected, out var formattedHost, out var hostname, out var port))
                     return;
 
                 _project.Options.TargetHosts.Add(formattedHost);
diff --git a/VSRAD.Package/Options/ProfileOptions.cs b/VSRAD.Package/Options/ProfileOptions.cs
index e541d6328..7e81cd51e 100644
--- a/VSRAD.Package/Options/ProfileOptions.cs
+++ b/VSRAD.Package/Options/ProfileOptions.cs
@@ -127,26 +127,6 @@ public async Task<Result<GeneralProfileOptions>> EvaluateAsync(IMacroEvaluator e
         }
     }
 
-    public readonly struct ServerConnectionOptions : IEquatable<ServerConnectionOptions>
-    {
-        public string RemoteMachine { get; }
-        public int Port { get; }
-
-        public ServerConnectionOptions(string remoteMachine = "127.0.0.1", int port = 9339)
-        {
-            RemoteMachine = remoteMachine;
-            Port = port;
-        }
-
-        public override string ToString() => $"{RemoteMachine}:{Port}";
-
-        public bool Equals(ServerConnectionOptions s) => RemoteMachine == s.RemoteMachine && Port == s.Port;
-        public override bool Equals(object o) => o is ServerConnectionOptions s && Equals(s);
-        public override int GetHashCode() => (RemoteMachine, Port).GetHashCode();
-        public static bool operator ==(ServerConnectionOptions left, ServerConnectionOptions right) => left.Equals(right);
-        public static bool operator !=(ServerConnectionOptions left, ServerConnectionOptions right) => !(left == right);
-    }
-
     public readonly struct ActionEnvironment : IEquatable<ActionEnvironment>
     {
         public string LocalWorkDir { get; }
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index c5bffc955..2b5ef1eb3 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -12,24 +12,6 @@ namespace VSRAD.Package.ProjectSystem.Profiles
 {
     public sealed partial class TargetHostsEditor : DialogWindow
     {
-        public static bool TryParseHost(string input, out string formatted, out string hostname, out ushort port)
-        {
-            formatted = "";
-            hostname = "";
-            port = 0;
-
-            var hostnamePort = input.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
-            if (hostnamePort.Length == 0)
-                return false;
-
-            hostname = hostnamePort[0];
-            if (hostnamePort.Length < 2 || !ushort.TryParse(hostnamePort[1], out port))
-                port = 9339;
-
-            formatted = $"{hostname}:{port}";
-            return true;
-        }
-
         public ObservableCollection<HostItem> Hosts { get; }
         public ICommand DeleteHostCommand { get; }
 
@@ -75,7 +57,7 @@ private void SaveChanges()
             _project.Options.TargetHosts.AddRange(Hosts.Select(h => h.Host).Distinct());
 
             var updatedProfile = (Options.ProfileOptions)_project.Options.Profile.Clone();
-            if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi && TryParseHost(hi.Host, out _, out var hostname, out var port))
+            if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi && HostItem.TryParseHost(hi.Host, out _, out var hostname, out var port))
             {
                 _project.Options.RemoteMachine = hostname;
                 _project.Options.Port = port;
@@ -92,7 +74,7 @@ private void SaveChanges()
         private void ValidateHostAfterEdit(object sender, DataGridRowEditEndingEventArgs e)
         {
             var item = (HostItem)e.Row.DataContext;
-            if (TryParseHost(item.Host, out var formattedHost, out _, out _))
+            if (HostItem.TryParseHost(item.Host, out var formattedHost, out _, out _))
                 item.Host = formattedHost;
             else
 #pragma warning disable VSTHRD001 // Using BeginInvoke to delete item after all post-edit events fire
diff --git a/VSRAD.Package/Server/CommunicationChannel.cs b/VSRAD.Package/Server/CommunicationChannel.cs
index bdc710ea6..2f4b3c31b 100644
--- a/VSRAD.Package/Server/CommunicationChannel.cs
+++ b/VSRAD.Package/Server/CommunicationChannel.cs
@@ -11,6 +11,7 @@
 using VSRAD.DebugServer.IPC.Responses;
 using VSRAD.Package.Options;
 using VSRAD.Package.ProjectSystem;
+using VSRAD.Package.Utils;
 using Task = System.Threading.Tasks.Task;
 
 namespace VSRAD.Package.Server
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 9d93691a7..40c843170 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -22,5 +22,53 @@ public HostItem(string host, bool usedInActiveProfile, string alias = "")
             Host = host;
             UsedInActiveProfile = usedInActiveProfile;
         }
+
+        public ServerConnectionOptions ConnectionOptions
+        {
+            get {
+                if (TryParseHost(Host, out var _, out var hostname, out var port))
+                    return new ServerConnectionOptions(hostname, port);
+                else
+                    return default;
+            }
+        }
+
+        public static bool TryParseHost(string input, out string formatted, out string hostname, out ushort port)
+        {
+            formatted = "";
+            hostname = "";
+            port = 0;
+
+            var hostnamePort = input.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
+            if (hostnamePort.Length == 0)
+                return false;
+
+            hostname = hostnamePort[0];
+            if (hostnamePort.Length < 2 || !ushort.TryParse(hostnamePort[1], out port))
+                port = 9339;
+
+            formatted = $"{hostname}:{port}";
+            return true;
+        }
+    }
+
+    public readonly struct ServerConnectionOptions : IEquatable<ServerConnectionOptions>
+    {
+        public string RemoteMachine { get; }
+        public int Port { get; }
+
+        public ServerConnectionOptions(string remoteMachine = "127.0.0.1", int port = 9339)
+        {
+            RemoteMachine = remoteMachine;
+            Port = port;
+        }
+
+        public override string ToString() => $"{RemoteMachine}:{Port}";
+
+        public bool Equals(ServerConnectionOptions s) => RemoteMachine == s.RemoteMachine && Port == s.Port;
+        public override bool Equals(object o) => o is ServerConnectionOptions s && Equals(s);
+        public override int GetHashCode() => (RemoteMachine, Port).GetHashCode();
+        public static bool operator ==(ServerConnectionOptions left, ServerConnectionOptions right) => left.Equals(right);
+        public static bool operator !=(ServerConnectionOptions left, ServerConnectionOptions right) => !(left == right);
     }
 }
diff --git a/VSRAD.Package/VSRAD.Package.csproj b/VSRAD.Package/VSRAD.Package.csproj
index 2a71f747d..6bb0ad3f5 100644
--- a/VSRAD.Package/VSRAD.Package.csproj
+++ b/VSRAD.Package/VSRAD.Package.csproj
@@ -249,6 +249,7 @@
     <Compile Include="Utils\CollectionExtensions.cs" />
     <Compile Include="Utils\MruCollection.cs" />
     <Compile Include="Utils\OleCommandText.cs" />
+    <Compile Include="Utils\TargetHosts.cs" />
     <Compile Include="Utils\VsEditor.cs" />
     <Compile Include="Utils\VsStatusBarWriter.cs" />
     <Compile Include="Utils\WpfConverters.cs" />

From 76b8a7f59d9c71a9b6925469c9d21edf5a3f8c62 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Mon, 24 Oct 2022 17:43:54 +0200
Subject: [PATCH 04/17] moving to HostItem's in SetNewTargetMachine

---
 VSRAD.Package/Commands/ProfileDropdownCommand.cs | 10 ++++++----
 VSRAD.Package/Utils/TargetHosts.cs               | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index fba6481bf..26c73b688 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -11,6 +11,7 @@
 using VSRAD.Package.Options;
 using VSRAD.Package.ProjectSystem;
 using VSRAD.Package.ProjectSystem.Profiles;
+using VSRAD.Package.Utils;
 
 namespace VSRAD.Package.Commands
 {
@@ -95,13 +96,14 @@ private void SetNewTargetMachine(string selected)
             }
             else
             {
-                if (!Utils.HostItem.TryParseHost(selected, out var formattedHost, out var hostname, out var port))
+                var item = new HostItem(selected);
+                if (item == default(HostItem))
                     return;
 
-                _project.Options.TargetHosts.Add(formattedHost);
+                _project.Options.TargetHosts.Add(item.Formatted);
 
-                _project.Options.RemoteMachine = hostname;
-                _project.Options.Port = port;
+                _project.Options.RemoteMachine = item.Host;
+                _project.Options.Port = item.Port;
                 updatedProfile.General.RunActionsLocally = false;
             }
 
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 40c843170..2105595a9 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -11,11 +11,16 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
         private string _host = "";
         public string Host { get => _host; set => SetField(ref _host, value); }
 
+        private ushort _port = 0;
+        public ushort Port { get => _port; set => SetField(ref _port, value); }
+
         private string _alias = "";
         public string Alias { get => _alias; set => SetField(ref _alias, value); }
 
         public bool UsedInActiveProfile { get; }
 
+        public string Formatted => $"{Host}:{Port}";
+
         public HostItem(string host, bool usedInActiveProfile, string alias = "")
         {
             Alias = alias;
@@ -23,6 +28,16 @@ public HostItem(string host, bool usedInActiveProfile, string alias = "")
             UsedInActiveProfile = usedInActiveProfile;
         }
 
+        public HostItem(string input)
+        {
+            if (TryParseHost(input, out var _, out var host, out var port))
+            {
+                Host = host;
+                Port = port;
+                UsedInActiveProfile = false;
+            }
+        }
+
         public ServerConnectionOptions ConnectionOptions
         {
             get {

From 9b96d1969bd570c83bb90ecc07d95c158d40139c Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 25 Oct 2022 15:20:26 +0200
Subject: [PATCH 05/17] actually store HostItem's internally, added Port to GUI

---
 .../Commands/ProfileDropdownCommand.cs        |  6 +++---
 VSRAD.Package/Options/ProjectOptions.cs       |  6 +++---
 .../Profiles/TargetHostsEditor.xaml           | 15 +++++++++++++
 .../Profiles/TargetHostsEditor.xaml.cs        | 21 +++++++++----------
 VSRAD.Package/Utils/TargetHosts.cs            |  4 ++++
 5 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index 26c73b688..ace973b72 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -66,7 +66,7 @@ public void Execute(uint commandId, uint commandExecOpt, IntPtr variantIn, IntPt
 
         private void ListTargetMachines(IntPtr variantOut)
         {
-            var displayItems = _project.Options.TargetHosts.Prepend("Local").Append("Edit...").ToArray();
+            var displayItems = _project.Options.TargetHosts.Select(h => h.Name).Prepend("Local").Append("Edit...").ToArray();
             Marshal.GetNativeVariantForObject(displayItems, variantOut);
         }
 
@@ -81,7 +81,7 @@ private void GetCurrentTargetMachine(IntPtr variantOut)
             {
                 currentHost = _project.Options.Connection.ToString();
                 // Display current host at the top of the list
-                _project.Options.TargetHosts.Add(currentHost);
+                //_project.Options.TargetHosts.Add(currentHost); TODO
             }
             Marshal.GetNativeVariantForObject(currentHost, variantOut);
         }
@@ -100,7 +100,7 @@ private void SetNewTargetMachine(string selected)
                 if (item == default(HostItem))
                     return;
 
-                _project.Options.TargetHosts.Add(item.Formatted);
+                _project.Options.TargetHosts.Add(item);
 
                 _project.Options.RemoteMachine = item.Host;
                 _project.Options.Port = item.Port;
diff --git a/VSRAD.Package/Options/ProjectOptions.cs b/VSRAD.Package/Options/ProjectOptions.cs
index 089ee734f..8bc3c34e8 100644
--- a/VSRAD.Package/Options/ProjectOptions.cs
+++ b/VSRAD.Package/Options/ProjectOptions.cs
@@ -28,9 +28,9 @@ public sealed class ProjectOptions : DefaultNotifyPropertyChanged
         public DebugVisualizer.ColumnStylingOptions VisualizerColumnStyling { get; } =
             new DebugVisualizer.ColumnStylingOptions();
 
-        [JsonConverter(typeof(MruCollection<string>.Converter))]
-        public MruCollection<string> TargetHosts { get; } =
-            new MruCollection<string>();
+        [JsonConverter(typeof(MruCollection<HostItem>.Converter))]
+        public MruCollection<HostItem> TargetHosts { get; } =
+            new MruCollection<HostItem>();
 
         public ProjectOptions() { }
 
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
index d548fef9b..fb4e2d24f 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
@@ -37,6 +37,21 @@
                         </Style>
                     </DataGridTextColumn.EditingElementStyle>
                 </DataGridTextColumn>
+                <DataGridTextColumn Header="Port" Binding="{Binding Port, UpdateSourceTrigger=PropertyChanged}" Width="*">
+                    <DataGridTextColumn.ElementStyle>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="VerticalAlignment" Value="Center" />
+                            <Setter Property="Padding" Value="6,0" />
+                        </Style>
+                    </DataGridTextColumn.ElementStyle>
+                    <DataGridTextColumn.EditingElementStyle>
+                        <Style TargetType="{x:Type TextBox}">
+                            <Setter Property="VerticalContentAlignment" Value="Center" />
+                            <Setter Property="Padding" Value="3,0" />
+                            <Setter Property="Height" Value="22" />
+                        </Style>
+                    </DataGridTextColumn.EditingElementStyle>
+                </DataGridTextColumn>
                 <DataGridTextColumn Header="Alias" Binding="{Binding Alias, UpdateSourceTrigger=PropertyChanged}" Width="*">
                     <DataGridTextColumn.ElementStyle>
                         <Style TargetType="TextBlock">
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index 2b5ef1eb3..307fb2763 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -21,8 +21,7 @@ public sealed partial class TargetHostsEditor : DialogWindow
         public TargetHostsEditor(IProject project)
         {
             _project = project;
-            Hosts = new ObservableCollection<HostItem>(project.Options.TargetHosts.Select(h =>
-                new HostItem(h, usedInActiveProfile: !project.Options.Profile.General.RunActionsLocally && project.Options.Connection.ToString() == h)));
+            Hosts = new ObservableCollection<HostItem>(project.Options.TargetHosts);
             DeleteHostCommand = new WpfDelegateCommand(DeleteHost);
 
             InitializeComponent();
@@ -54,7 +53,7 @@ private void DeleteHost(object param)
         private void SaveChanges()
         {
             _project.Options.TargetHosts.Clear();
-            _project.Options.TargetHosts.AddRange(Hosts.Select(h => h.Host).Distinct());
+            _project.Options.TargetHosts.AddRange(Hosts.Distinct());
 
             var updatedProfile = (Options.ProfileOptions)_project.Options.Profile.Clone();
             if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi && HostItem.TryParseHost(hi.Host, out _, out var hostname, out var port))
@@ -73,13 +72,13 @@ private void SaveChanges()
 
         private void ValidateHostAfterEdit(object sender, DataGridRowEditEndingEventArgs e)
         {
-            var item = (HostItem)e.Row.DataContext;
-            if (HostItem.TryParseHost(item.Host, out var formattedHost, out _, out _))
-                item.Host = formattedHost;
-            else
-#pragma warning disable VSTHRD001 // Using BeginInvoke to delete item after all post-edit events fire
-                Dispatcher.BeginInvoke((Action)(() => Hosts.Remove(item)), System.Windows.Threading.DispatcherPriority.Background);
-#pragma warning restore VSTHRD001
+//            var item = (HostItem)e.Row.DataContext;
+//            if (HostItem.TryParseHost(item.Host, out var formattedHost, out _, out _))
+//                item.Host = formattedHost;
+//            else
+//#pragma warning disable VSTHRD001 // Using BeginInvoke to delete item after all post-edit events fire
+//                Dispatcher.BeginInvoke((Action)(() => Hosts.Remove(item)), System.Windows.Threading.DispatcherPriority.Background);
+//#pragma warning restore VSTHRD001
         }
 
         private void HandleDeleteKey(object sender, KeyEventArgs e)
@@ -130,7 +129,7 @@ private bool HasChanges()
 
             for (int i = 0; i < Hosts.Count; ++i)
             {
-                if (Hosts[i].Host != _project.Options.TargetHosts[i])
+                if (Hosts[i] != _project.Options.TargetHosts[i])
                     return true;
             }
 
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 2105595a9..684e9aa7e 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -21,6 +21,10 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
 
         public string Formatted => $"{Host}:{Port}";
 
+        public string Name => string.IsNullOrWhiteSpace(Alias)
+                                ? Formatted
+                                : Alias;
+
         public HostItem(string host, bool usedInActiveProfile, string alias = "")
         {
             Alias = alias;

From 3d39a4b7119e56fc25ea17bedc4db8504c30bfb2 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 25 Oct 2022 15:26:45 +0200
Subject: [PATCH 06/17] HostItem serialization/deserialization

---
 VSRAD.Package/Utils/TargetHosts.cs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 684e9aa7e..be46f43f1 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Newtonsoft.Json;
+using System;
 
 namespace VSRAD.Package.Utils
 {
@@ -19,12 +16,15 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
 
         public bool UsedInActiveProfile { get; }
 
+        [JsonIgnore]
         public string Formatted => $"{Host}:{Port}";
 
+        [JsonIgnore]
         public string Name => string.IsNullOrWhiteSpace(Alias)
                                 ? Formatted
                                 : Alias;
 
+        [JsonConstructor]
         public HostItem(string host, bool usedInActiveProfile, string alias = "")
         {
             Alias = alias;
@@ -42,6 +42,7 @@ public HostItem(string input)
             }
         }
 
+        [JsonIgnore]
         public ServerConnectionOptions ConnectionOptions
         {
             get {

From 977e069e30c78c085f0a5e342f2ff81cefa01218 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 25 Oct 2022 19:20:09 +0200
Subject: [PATCH 07/17] properly set connection options

---
 .../ProjectSystem/Profiles/TargetHostsEditor.xaml.cs        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index 307fb2763..12280b314 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -56,10 +56,10 @@ private void SaveChanges()
             _project.Options.TargetHosts.AddRange(Hosts.Distinct());
 
             var updatedProfile = (Options.ProfileOptions)_project.Options.Profile.Clone();
-            if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi && HostItem.TryParseHost(hi.Host, out _, out var hostname, out var port))
+            if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi)
             {
-                _project.Options.RemoteMachine = hostname;
-                _project.Options.Port = port;
+                _project.Options.RemoteMachine = hi.Host;
+                _project.Options.Port = hi.Port;
             }
             else
             {

From cd56a15122fe3502fc0b8c229e89fa2054ced7b4 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 25 Oct 2022 20:42:26 +0200
Subject: [PATCH 08/17] profile selector actually works!

---
 VSRAD.Package/Commands/ProfileDropdownCommand.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index ace973b72..b69b41fbd 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -96,7 +96,7 @@ private void SetNewTargetMachine(string selected)
             }
             else
             {
-                var item = new HostItem(selected);
+                var item = _project.Options.TargetHosts.FirstOrDefault(h => h.Name == selected);
                 if (item == default(HostItem))
                     return;
 

From 6aa97df2946bd7d79850ae716c48e38c1b20f41d Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Thu, 27 Oct 2022 14:52:54 +0200
Subject: [PATCH 09/17] fixed merge errors: - obselete json parsing - new host
 default port

---
 VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs | 2 +-
 VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs b/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
index 4f7ecfa98..20c24fcec 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
@@ -41,7 +41,7 @@ public static ProjectOptions ImportObsoleteOptions(string path)
 
             if (json["TargetHosts"] != null)
                 foreach (var host in json["TargetHosts"].ToObject<List<string>>())
-                    options.TargetHosts.Add(host);
+                    options.TargetHosts.Add(new Utils.HostItem(host));
 
             options.ActiveProfile = activeProfile;
 
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index 12280b314..3f63975c6 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -30,6 +30,7 @@ public TargetHostsEditor(IProject project)
         private void AddHost(object sender, RoutedEventArgs e)
         {
             var item = new HostItem("", usedInActiveProfile: false);
+            item.Port = 9339; // TODO: move to Constants.cs
             Hosts.Add(item);
 
             // Finish editing the current host before moving the focus away from it

From 81cb86315eec3ceae16845daba561492c9839b0f Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Thu, 27 Oct 2022 15:15:21 +0200
Subject: [PATCH 10/17] using latest TargetHost for connection

---
 VSRAD.Package/Commands/ProfileDropdownCommand.cs          | 4 ++--
 VSRAD.Package/Options/ProjectOptions.cs                   | 8 +-------
 .../ProjectSystem/Profiles/TargetHostsEditor.xaml.cs      | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index b69b41fbd..f261265ea 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -102,8 +102,8 @@ private void SetNewTargetMachine(string selected)
 
                 _project.Options.TargetHosts.Add(item);
 
-                _project.Options.RemoteMachine = item.Host;
-                _project.Options.Port = item.Port;
+                //_project.Options.RemoteMachine = item.Host;
+                //_project.Options.Port = item.Port;
                 updatedProfile.General.RunActionsLocally = false;
             }
 
diff --git a/VSRAD.Package/Options/ProjectOptions.cs b/VSRAD.Package/Options/ProjectOptions.cs
index 8bc3c34e8..55589fde7 100644
--- a/VSRAD.Package/Options/ProjectOptions.cs
+++ b/VSRAD.Package/Options/ProjectOptions.cs
@@ -47,14 +47,8 @@ public ProjectOptions(DebuggerOptions debugger, VisualizerOptions visualizer, Sl
         private string _activeProfile = "Default";
         public string ActiveProfile { get => _activeProfile; set { if (value != null) SetField(ref _activeProfile, value, raiseIfEqual: true); } }
 
-        private string _remoteMachine = "127.0.0.1";
-        public string RemoteMachine { get => _remoteMachine; set => SetField(ref _remoteMachine, value); }
-
-        private int _port = 9339;
-        public int Port { get => _port; set => SetField(ref _port, value); }
-
         [JsonIgnore]
-        public ServerConnectionOptions Connection => new ServerConnectionOptions(RemoteMachine, Port);
+        public ServerConnectionOptions Connection => TargetHosts[0].ConnectionOptions;
 
         [JsonIgnore]
         public bool HasProfiles => Profiles.Count > 0;
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index 3f63975c6..f3130c35f 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -59,8 +59,8 @@ private void SaveChanges()
             var updatedProfile = (Options.ProfileOptions)_project.Options.Profile.Clone();
             if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi)
             {
-                _project.Options.RemoteMachine = hi.Host;
-                _project.Options.Port = hi.Port;
+                //_project.Options.RemoteMachine = hi.Host;
+                //_project.Options.Port = hi.Port;
             }
             else
             {

From 3b11c3e03b5eb5009fefa640333149393b65abac Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Thu, 27 Oct 2022 15:37:54 +0200
Subject: [PATCH 11/17] display alias in dropdown if set

---
 VSRAD.Package/Commands/ProfileDropdownCommand.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index f261265ea..711f01bac 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -73,13 +73,14 @@ private void ListTargetMachines(IntPtr variantOut)
         private void GetCurrentTargetMachine(IntPtr variantOut)
         {
             string currentHost;
-            if (_project.Options.Profile.General.RunActionsLocally)
+            if (_project.Options.Profile.General.RunActionsLocally
+                || _project.Options.TargetHosts.Count == 0)
             {
                 currentHost = "Local";
             }
             else
             {
-                currentHost = _project.Options.Connection.ToString();
+                currentHost = _project.Options.TargetHosts[0].Name;
                 // Display current host at the top of the list
                 //_project.Options.TargetHosts.Add(currentHost); TODO
             }

From 32b5ef5b587fefdaa365e832fd3e32b101b4d8c2 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Fri, 28 Oct 2022 16:11:10 +0200
Subject: [PATCH 12/17] removed UsedInActiveProfile field; removed unused
 funcions; do not reset picked host after edit if it still exists handle no
 target hosts situation deserialize port from json

---
 VSRAD.Package/Options/ProjectOptions.cs       |  4 ++-
 .../Profiles/TargetHostsEditor.xaml           |  2 +-
 .../Profiles/TargetHostsEditor.xaml.cs        | 26 ++++---------------
 VSRAD.Package/Utils/TargetHosts.cs            | 11 +++-----
 4 files changed, 13 insertions(+), 30 deletions(-)

diff --git a/VSRAD.Package/Options/ProjectOptions.cs b/VSRAD.Package/Options/ProjectOptions.cs
index 55589fde7..309e7a0ca 100644
--- a/VSRAD.Package/Options/ProjectOptions.cs
+++ b/VSRAD.Package/Options/ProjectOptions.cs
@@ -48,7 +48,9 @@ public ProjectOptions(DebuggerOptions debugger, VisualizerOptions visualizer, Sl
         public string ActiveProfile { get => _activeProfile; set { if (value != null) SetField(ref _activeProfile, value, raiseIfEqual: true); } }
 
         [JsonIgnore]
-        public ServerConnectionOptions Connection => TargetHosts[0].ConnectionOptions;
+        public ServerConnectionOptions Connection => TargetHosts.Count != 0
+                                                        ? TargetHosts[0].ConnectionOptions
+                                                        : default(ServerConnectionOptions);
 
         [JsonIgnore]
         public bool HasProfiles => Profiles.Count > 0;
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
index fb4e2d24f..d5a6ed408 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml
@@ -18,7 +18,7 @@
             <Button Content="Cancel" IsCancel="True" Click="HandleCancel" Width="61" Height="22" Margin="4,0,0,0" />
         </StackPanel>
         <DataGrid x:Name="HostGrid" ItemsSource="{Binding Hosts, ElementName=Root}" Margin="4" GridLinesVisibility="None" Focusable="True"
-                  RowEditEnding="ValidateHostAfterEdit" PreviewKeyDown="HandleDeleteKey"
+                  PreviewKeyDown="HandleDeleteKey"
                   AutoGenerateColumns="False" CanUserAddRows="False" CanUserReorderColumns="False" CanUserSortColumns="False" CanUserResizeRows="False" CanUserDeleteRows="False"
                   HeadersVisibility="Column" HorizontalScrollBarVisibility="Disabled" RowHeight="24">
             <DataGrid.Columns>
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index f3130c35f..ba0596bef 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -29,8 +29,7 @@ public TargetHostsEditor(IProject project)
 
         private void AddHost(object sender, RoutedEventArgs e)
         {
-            var item = new HostItem("", usedInActiveProfile: false);
-            item.Port = 9339; // TODO: move to Constants.cs
+            var item = new HostItem("", 9339); // TODO: move 9339 to Constants.cs
             Hosts.Add(item);
 
             // Finish editing the current host before moving the focus away from it
@@ -53,35 +52,20 @@ private void DeleteHost(object param)
 
         private void SaveChanges()
         {
+            var oldHost = _project.Options.TargetHosts.Count != 0
+                                           ? _project.Options.TargetHosts[0]
+                                           : null;
             _project.Options.TargetHosts.Clear();
             _project.Options.TargetHosts.AddRange(Hosts.Distinct());
 
             var updatedProfile = (Options.ProfileOptions)_project.Options.Profile.Clone();
-            if (Hosts.FirstOrDefault(h => h.UsedInActiveProfile) is HostItem hi)
-            {
-                //_project.Options.RemoteMachine = hi.Host;
-                //_project.Options.Port = hi.Port;
-            }
-            else
-            {
+            if (oldHost == null || !Hosts.Contains(oldHost))
                 updatedProfile.General.RunActionsLocally = true;
-            }
             _project.Options.UpdateActiveProfile(updatedProfile);
 
             _project.SaveOptions();
         }
 
-        private void ValidateHostAfterEdit(object sender, DataGridRowEditEndingEventArgs e)
-        {
-//            var item = (HostItem)e.Row.DataContext;
-//            if (HostItem.TryParseHost(item.Host, out var formattedHost, out _, out _))
-//                item.Host = formattedHost;
-//            else
-//#pragma warning disable VSTHRD001 // Using BeginInvoke to delete item after all post-edit events fire
-//                Dispatcher.BeginInvoke((Action)(() => Hosts.Remove(item)), System.Windows.Threading.DispatcherPriority.Background);
-//#pragma warning restore VSTHRD001
-        }
-
         private void HandleDeleteKey(object sender, KeyEventArgs e)
         {
             IEditableCollectionView itemsView = HostGrid.Items;
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index be46f43f1..4b82156d8 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -14,8 +14,6 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
         private string _alias = "";
         public string Alias { get => _alias; set => SetField(ref _alias, value); }
 
-        public bool UsedInActiveProfile { get; }
-
         [JsonIgnore]
         public string Formatted => $"{Host}:{Port}";
 
@@ -25,11 +23,11 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
                                 : Alias;
 
         [JsonConstructor]
-        public HostItem(string host, bool usedInActiveProfile, string alias = "")
+        public HostItem(string host, ushort port, string alias = "")
         {
-            Alias = alias;
             Host = host;
-            UsedInActiveProfile = usedInActiveProfile;
+            Port = port;
+            Alias = alias;
         }
 
         public HostItem(string input)
@@ -37,8 +35,7 @@ public HostItem(string input)
             if (TryParseHost(input, out var _, out var host, out var port))
             {
                 Host = host;
-                Port = port;
-                UsedInActiveProfile = false;
+                Port = port;;
             }
         }
 

From 34fb6fcc2ad519d056a9f627015cb0dfc72d5f67 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Fri, 28 Oct 2022 16:20:38 +0200
Subject: [PATCH 13/17] get rid of default host/port inplace hardcode, using
 DefaultOptionValues class

---
 VSRAD.Package/Options/DefaultOptionValues.cs                 | 2 +-
 .../ProjectSystem/Profiles/TargetHostsEditor.xaml.cs         | 2 +-
 VSRAD.Package/Utils/TargetHosts.cs                           | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/VSRAD.Package/Options/DefaultOptionValues.cs b/VSRAD.Package/Options/DefaultOptionValues.cs
index 54963eec3..567427c94 100644
--- a/VSRAD.Package/Options/DefaultOptionValues.cs
+++ b/VSRAD.Package/Options/DefaultOptionValues.cs
@@ -7,7 +7,7 @@ internal static class DefaultOptionValues
     {
         #region General
         public const string DeployDirectory = "";
-        public const string RemoteMachineAdredd = "127.0.0.1";
+        public const string RemoteMachineAdress = "127.0.0.1";
         public const int Port = 9339;
         public const string AdditionalSources = "";
         public const bool CopySources = true;
diff --git a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
index ba0596bef..c89ce93b7 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/TargetHostsEditor.xaml.cs
@@ -29,7 +29,7 @@ public TargetHostsEditor(IProject project)
 
         private void AddHost(object sender, RoutedEventArgs e)
         {
-            var item = new HostItem("", 9339); // TODO: move 9339 to Constants.cs
+            var item = new HostItem("", Options.DefaultOptionValues.Port);
             Hosts.Add(item);
 
             // Finish editing the current host before moving the focus away from it
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 4b82156d8..655eaf6d9 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -62,7 +62,7 @@ public static bool TryParseHost(string input, out string formatted, out string h
 
             hostname = hostnamePort[0];
             if (hostnamePort.Length < 2 || !ushort.TryParse(hostnamePort[1], out port))
-                port = 9339;
+                port = Options.DefaultOptionValues.Port;
 
             formatted = $"{hostname}:{port}";
             return true;
@@ -74,7 +74,8 @@ public static bool TryParseHost(string input, out string formatted, out string h
         public string RemoteMachine { get; }
         public int Port { get; }
 
-        public ServerConnectionOptions(string remoteMachine = "127.0.0.1", int port = 9339)
+        public ServerConnectionOptions(string remoteMachine = Options.DefaultOptionValues.RemoteMachineAdress,
+                                                int port = Options.DefaultOptionValues.Port)
         {
             RemoteMachine = remoteMachine;
             Port = port;

From c82c11b5b34e09f2e00714751e9a7acb23d4dba2 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Mon, 31 Oct 2022 14:13:24 +0100
Subject: [PATCH 14/17] fixed typo, parse host that user manually enters in the
 field

---
 VSRAD.Package/Commands/ProfileDropdownCommand.cs | 10 +++++-----
 VSRAD.Package/Utils/TargetHosts.cs               |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index 711f01bac..3831e4ac6 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -97,14 +97,14 @@ private void SetNewTargetMachine(string selected)
             }
             else
             {
-                var item = _project.Options.TargetHosts.FirstOrDefault(h => h.Name == selected);
-                if (item == default(HostItem))
-                    return;
+                var item = new HostItem(selected);
+                //if (item == default(HostItem) || !_project.Options.TargetHosts.Contains(item))
+                //{
+                //    return;
+                //}
 
                 _project.Options.TargetHosts.Add(item);
 
-                //_project.Options.RemoteMachine = item.Host;
-                //_project.Options.Port = item.Port;
                 updatedProfile.General.RunActionsLocally = false;
             }
 
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 655eaf6d9..607ed293d 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -30,12 +30,12 @@ public HostItem(string host, ushort port, string alias = "")
             Alias = alias;
         }
 
-        public HostItem(string input)
+        public HostItem(string input) // TODO make TryParseHost return HostItem
         {
             if (TryParseHost(input, out var _, out var host, out var port))
             {
                 Host = host;
-                Port = port;;
+                Port = port;
             }
         }
 

From b69b64ec826bcae1d93364c11452750cff1b6547 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Mon, 31 Oct 2022 14:43:33 +0100
Subject: [PATCH 15/17] properly handled manual user input

---
 .../Commands/ProfileDropdownCommand.cs        | 18 +++++----
 VSRAD.Package/Options/ProjectOptions.cs       |  2 +
 .../Profiles/ProfileTransferManager.cs        |  2 +-
 VSRAD.Package/Utils/TargetHosts.cs            | 37 ++++---------------
 4 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/VSRAD.Package/Commands/ProfileDropdownCommand.cs b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
index 3831e4ac6..b0f7dee5b 100644
--- a/VSRAD.Package/Commands/ProfileDropdownCommand.cs
+++ b/VSRAD.Package/Commands/ProfileDropdownCommand.cs
@@ -81,8 +81,6 @@ private void GetCurrentTargetMachine(IntPtr variantOut)
             else
             {
                 currentHost = _project.Options.TargetHosts[0].Name;
-                // Display current host at the top of the list
-                //_project.Options.TargetHosts.Add(currentHost); TODO
             }
             Marshal.GetNativeVariantForObject(currentHost, variantOut);
         }
@@ -97,11 +95,17 @@ private void SetNewTargetMachine(string selected)
             }
             else
             {
-                var item = new HostItem(selected);
-                //if (item == default(HostItem) || !_project.Options.TargetHosts.Contains(item))
-                //{
-                //    return;
-                //}
+                var item = HostItem.TryParseHost(selected);
+                var tmpItem = default(HostItem);
+
+                if (item == default(HostItem)) // check maybe user entered existing alias
+                    tmpItem = _project.Options.TargetHosts.FirstOrDefault(h => h.Alias == selected);
+                else // maybe there is existing host but with alias
+                    tmpItem = _project.Options.TargetHosts
+                                              .FirstOrDefault(h => h.Host == item.Host && h.Port == item.Port);
+
+                if (tmpItem != default(HostItem)) item = tmpItem;
+                else if (item == default(HostItem)) return;
 
                 _project.Options.TargetHosts.Add(item);
 
diff --git a/VSRAD.Package/Options/ProjectOptions.cs b/VSRAD.Package/Options/ProjectOptions.cs
index 309e7a0ca..a0358f8dd 100644
--- a/VSRAD.Package/Options/ProjectOptions.cs
+++ b/VSRAD.Package/Options/ProjectOptions.cs
@@ -47,6 +47,8 @@ public ProjectOptions(DebuggerOptions debugger, VisualizerOptions visualizer, Sl
         private string _activeProfile = "Default";
         public string ActiveProfile { get => _activeProfile; set { if (value != null) SetField(ref _activeProfile, value, raiseIfEqual: true); } }
 
+        // we can safely assume that TargetHosts[0] is the host we want, because
+        // TargetHosts order are updated according to MRU collection (see VSRAD.Package.Utils.MruCollection.cs)
         [JsonIgnore]
         public ServerConnectionOptions Connection => TargetHosts.Count != 0
                                                         ? TargetHosts[0].ConnectionOptions
diff --git a/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs b/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
index 20c24fcec..85f16c490 100644
--- a/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
+++ b/VSRAD.Package/ProjectSystem/Profiles/ProfileTransferManager.cs
@@ -41,7 +41,7 @@ public static ProjectOptions ImportObsoleteOptions(string path)
 
             if (json["TargetHosts"] != null)
                 foreach (var host in json["TargetHosts"].ToObject<List<string>>())
-                    options.TargetHosts.Add(new Utils.HostItem(host));
+                    options.TargetHosts.Add(Utils.HostItem.TryParseHost(host));
 
             options.ActiveProfile = activeProfile;
 
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 607ed293d..1f53885de 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -30,42 +30,19 @@ public HostItem(string host, ushort port, string alias = "")
             Alias = alias;
         }
 
-        public HostItem(string input) // TODO make TryParseHost return HostItem
-        {
-            if (TryParseHost(input, out var _, out var host, out var port))
-            {
-                Host = host;
-                Port = port;
-            }
-        }
-
         [JsonIgnore]
-        public ServerConnectionOptions ConnectionOptions
-        {
-            get {
-                if (TryParseHost(Host, out var _, out var hostname, out var port))
-                    return new ServerConnectionOptions(hostname, port);
-                else
-                    return default;
-            }
-        }
+        public ServerConnectionOptions ConnectionOptions => new ServerConnectionOptions(Host, Port);
 
-        public static bool TryParseHost(string input, out string formatted, out string hostname, out ushort port)
+        public static HostItem TryParseHost(string input)
         {
-            formatted = "";
-            hostname = "";
-            port = 0;
-
             var hostnamePort = input.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
-            if (hostnamePort.Length == 0)
-                return false;
+            if (hostnamePort.Length < 2)
+                return default(HostItem);
 
-            hostname = hostnamePort[0];
-            if (hostnamePort.Length < 2 || !ushort.TryParse(hostnamePort[1], out port))
+            var hostname = hostnamePort[0];
+            if (!ushort.TryParse(hostnamePort[1], out var port))
                 port = Options.DefaultOptionValues.Port;
-
-            formatted = $"{hostname}:{port}";
-            return true;
+            return new HostItem(hostname, port);
         }
     }
 

From f03f9c06859d1b8b4c75035212f167df1df606a0 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Tue, 1 Nov 2022 15:17:01 +0100
Subject: [PATCH 16/17] moved to a new host string representation, removed
 unnecessary usings

---
 VSRAD.Package/Server/CommunicationChannel.cs |  1 -
 VSRAD.Package/Utils/TargetHosts.cs           | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/VSRAD.Package/Server/CommunicationChannel.cs b/VSRAD.Package/Server/CommunicationChannel.cs
index 2f4b3c31b..9f43ed59c 100644
--- a/VSRAD.Package/Server/CommunicationChannel.cs
+++ b/VSRAD.Package/Server/CommunicationChannel.cs
@@ -9,7 +9,6 @@
 using VSRAD.DebugServer;
 using VSRAD.DebugServer.IPC.Commands;
 using VSRAD.DebugServer.IPC.Responses;
-using VSRAD.Package.Options;
 using VSRAD.Package.ProjectSystem;
 using VSRAD.Package.Utils;
 using Task = System.Threading.Tasks.Task;
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 1f53885de..8fe22c7d7 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.Text.RegularExpressions;
 
 namespace VSRAD.Package.Utils
 {
@@ -14,13 +15,17 @@ public sealed class HostItem : DefaultNotifyPropertyChanged
         private string _alias = "";
         public string Alias { get => _alias; set => SetField(ref _alias, value); }
 
+        [JsonIgnore]
+        private static readonly Regex _aliasHostPortRegex = new Regex(@"(?<alias>\w+) \((?<hostAndPort>.+)\)",
+                                                                    RegexOptions.Compiled | RegexOptions.Singleline);
+
         [JsonIgnore]
         public string Formatted => $"{Host}:{Port}";
 
         [JsonIgnore]
         public string Name => string.IsNullOrWhiteSpace(Alias)
                                 ? Formatted
-                                : Alias;
+                                : $"{Alias} ({Formatted})";
 
         [JsonConstructor]
         public HostItem(string host, ushort port, string alias = "")
@@ -35,6 +40,13 @@ public HostItem(string host, ushort port, string alias = "")
 
         public static HostItem TryParseHost(string input)
         {
+            var alias = "";
+            var match = _aliasHostPortRegex.Match(input);
+            if (match.Success)
+            {
+                alias = match.Groups["alias"].ToString();
+                input = match.Groups["hostAndPort"].ToString();
+            }
             var hostnamePort = input.Split(new[] { ':' }, StringSplitOptions.RemoveEmptyEntries);
             if (hostnamePort.Length < 2)
                 return default(HostItem);
@@ -42,7 +54,7 @@ public static HostItem TryParseHost(string input)
             var hostname = hostnamePort[0];
             if (!ushort.TryParse(hostnamePort[1], out var port))
                 port = Options.DefaultOptionValues.Port;
-            return new HostItem(hostname, port);
+            return new HostItem(hostname, port, alias);
         }
     }
 

From 8084564041f416a98b7357c828076bce24f7fbb4 Mon Sep 17 00:00:00 2001
From: johnny-keker <isarzhevsky@gmail.com>
Date: Wed, 9 Nov 2022 17:59:01 +0100
Subject: [PATCH 17/17] provided custom JsonSerializer for HostItem
 MruCollection to provide seamless migration from old configs

---
 VSRAD.Package/Options/ProjectOptions.cs |  3 ++-
 VSRAD.Package/Utils/TargetHosts.cs      | 33 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/VSRAD.Package/Options/ProjectOptions.cs b/VSRAD.Package/Options/ProjectOptions.cs
index a0358f8dd..7035fcb43 100644
--- a/VSRAD.Package/Options/ProjectOptions.cs
+++ b/VSRAD.Package/Options/ProjectOptions.cs
@@ -8,6 +8,7 @@
 using System.Windows.Forms;
 using VSRAD.Package.ProjectSystem.Profiles;
 using VSRAD.Package.Utils;
+using static VSRAD.Package.Utils.HostItem;
 
 namespace VSRAD.Package.Options
 {
@@ -28,7 +29,7 @@ public sealed class ProjectOptions : DefaultNotifyPropertyChanged
         public DebugVisualizer.ColumnStylingOptions VisualizerColumnStyling { get; } =
             new DebugVisualizer.ColumnStylingOptions();
 
-        [JsonConverter(typeof(MruCollection<HostItem>.Converter))]
+        [JsonConverter(typeof(HostItemMruCollectionConverter))]
         public MruCollection<HostItem> TargetHosts { get; } =
             new MruCollection<HostItem>();
 
diff --git a/VSRAD.Package/Utils/TargetHosts.cs b/VSRAD.Package/Utils/TargetHosts.cs
index 8fe22c7d7..08fef629e 100644
--- a/VSRAD.Package/Utils/TargetHosts.cs
+++ b/VSRAD.Package/Utils/TargetHosts.cs
@@ -1,5 +1,6 @@
 using Newtonsoft.Json;
 using System;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
 namespace VSRAD.Package.Utils
@@ -56,6 +57,38 @@ public static HostItem TryParseHost(string input)
                 port = Options.DefaultOptionValues.Port;
             return new HostItem(hostname, port, alias);
         }
+
+        // we provide custom converter here instead of one defined in MruCollection.cs
+        // because we want seamless migration from old config files, where hosts
+        // are serialiazed as strings ("127.0.0.1:9339")
+        public sealed class HostItemMruCollectionConverter : JsonConverter
+        {
+            public override bool CanConvert(Type objectType) => objectType == typeof(MruCollection<HostItem>);
+
+            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
+            {
+                try // to parse new format
+                {
+                    var items = serializer.Deserialize<List<HostItem>>(reader);
+                    ((MruCollection<HostItem>)existingValue).AddRange(items);
+                    return existingValue;
+                }
+                catch (Exception e) when (e.InnerException.Message == /* old format in config file */
+                                "Could not cast or convert from System.String to VSRAD.Package.Utils.HostItem.")
+                {
+                    while (reader.TokenType == JsonToken.String)
+                    {
+                        var item = serializer.Deserialize<string>(reader);
+                        ((MruCollection<HostItem>)existingValue).Add(TryParseHost(item));
+                        reader.Read();
+                    }
+                    return existingValue;
+                }
+            }
+
+            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) =>
+                serializer.Serialize(writer, (MruCollection<HostItem>) value);
+        }
     }
 
     public readonly struct ServerConnectionOptions : IEquatable<ServerConnectionOptions>