From e7e66c45bfbc11830c489afa8a5ff6ab3c69c13c Mon Sep 17 00:00:00 2001
From: Takuo Watanabe <wtakuo@mac.com>
Date: Sat, 22 Jun 2024 00:42:28 +0900
Subject: [PATCH 1/2] Fix #227, Switch stubs error

In the class Activator method activate, the conditional expression was omitted so that the variable versions is always a list with elements of the form "key - value".
---
 src/activator.mts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/activator.mts b/src/activator.mts
index d4d21d5..862d825 100644
--- a/src/activator.mts
+++ b/src/activator.mts
@@ -1122,9 +1122,7 @@ export default class Activator {
             // Map each value to "key - value" and push to resultArray
             versions.push(
               ...values.map(value =>
-                Object.keys(availableStubVersions).length > 1
-                  ? `${stubPortToDisplayString(key)} - ${value}`
-                  : value
+                `${stubPortToDisplayString(key)} - ${value}`
               )
             );
           });

From 06387ccc25f57792fbe67e8170b78ae2710ead22 Mon Sep 17 00:00:00 2001
From: paulober <44974737+paulober@users.noreply.github.com>
Date: Sat, 22 Jun 2024 02:52:15 +0200
Subject: [PATCH 2/2] Fix #227, Switch stubs error

Signed-off-by: paulober <44974737+paulober@users.noreply.github.com>
---
 src/activator.mts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/activator.mts b/src/activator.mts
index 862d825..3c131fb 100644
--- a/src/activator.mts
+++ b/src/activator.mts
@@ -1122,7 +1122,13 @@ export default class Activator {
             // Map each value to "key - value" and push to resultArray
             versions.push(
               ...values.map(value =>
-                `${stubPortToDisplayString(key)} - ${value}`
+                // differentiate between multiple stub ports and single
+                // to reduce UI clutter for version selection
+                // after a user selected a certain port already
+                // but still support multiple ports per selection
+                Object.keys(availableStubVersions).length > 1
+                  ? `${stubPortToDisplayString(key)} - ${value}`
+                  : value
               )
             );
           });
@@ -1147,12 +1153,16 @@ export default class Activator {
             async (progress, token) => {
               // cancellation is not possible
               token.onCancellationRequested(() => undefined);
-              const versionParts = version.split(" - ");
+              const versionParts = version.includes(" - ")
+                ? version.split(" - ")
+                : [Object.keys(availableStubVersions)[0], version];
 
               // TODO: implement cancellation
               const result = await installStubsByVersion(
                 versionParts[1],
-                displayStringToStubPort(versionParts[0]),
+                version.includes(" - ")
+                  ? displayStringToStubPort(versionParts[0])
+                  : versionParts[0],
                 settings
               );