Skip to content

Commit afdc407

Browse files
committed
Clean up showSessionMenu
1 parent 2293121 commit afdc407

File tree

1 file changed

+10
-45
lines changed

1 file changed

+10
-45
lines changed

src/session.ts

+10-45
Original file line numberDiff line numberDiff line change
@@ -875,59 +875,24 @@ Type 'help' to get help.
875875
this.logger);
876876
const availablePowerShellExes = await powershellExeFinder.getAllAvailablePowerShellInstallations();
877877

878-
let sessionText: string;
879-
880-
switch (this.sessionStatus) {
881-
case SessionStatus.Running:
882-
case SessionStatus.Initializing:
883-
case SessionStatus.NotStarted:
884-
case SessionStatus.NeverStarted:
885-
case SessionStatus.Stopping:
886-
if (this.PowerShellExeDetails && this.versionDetails) {
887-
const currentPowerShellExe =
888-
availablePowerShellExes
889-
.find((item) => item.displayName.toLowerCase() === this.PowerShellExeDetails!.displayName.toLowerCase());
890-
891-
const powerShellSessionName =
892-
currentPowerShellExe ?
893-
currentPowerShellExe.displayName :
894-
`PowerShell ${this.versionDetails.version} ` +
895-
`(${this.versionDetails.architecture.toLowerCase()}) ${this.versionDetails.edition} Edition ` +
896-
`[${this.versionDetails.version}]`;
897-
898-
sessionText = `Current session: ${powerShellSessionName}`;
899-
} else {
900-
sessionText = "Current session: Unknown";
901-
}
902-
break;
903-
904-
case SessionStatus.Failed:
905-
sessionText = "Session initialization failed, click here to show PowerShell extension logs";
906-
break;
907-
908-
default:
909-
throw new TypeError("Not a valid value for the enum 'SessionStatus'");
910-
}
911-
912-
const powerShellItems =
913-
availablePowerShellExes
914-
.filter((item) => item.displayName !== this.PowerShellExeDetails?.displayName)
915-
.map((item) => {
916-
return new SessionMenuItem(
917-
`Switch to: ${item.displayName}`,
918-
async () => { await this.changePowerShellDefaultVersion(item); });
919-
});
878+
const powerShellItems = availablePowerShellExes
879+
.filter((item) => item.displayName !== this.PowerShellExeDetails?.displayName)
880+
.map((item) => {
881+
return new SessionMenuItem(
882+
`Switch to: ${item.displayName}`,
883+
async () => { await this.changePowerShellDefaultVersion(item); });
884+
});
920885

921886
const menuItems: SessionMenuItem[] = [
922887
new SessionMenuItem(
923-
sessionText,
888+
`Current session: ${this.PowerShellExeDetails?.displayName ?? "Unknown"} (click to show logs)`,
924889
async () => { await vscode.commands.executeCommand("PowerShell.ShowLogs"); }),
925890

926891
// Add all of the different PowerShell options
927892
...powerShellItems,
928893

929894
new SessionMenuItem(
930-
"Restart Current Session",
895+
"Restart current session",
931896
async () => {
932897
// We pass in the display name so we guarantee that the session
933898
// will be the same PowerShell.
@@ -939,7 +904,7 @@ Type 'help' to get help.
939904
}),
940905

941906
new SessionMenuItem(
942-
"Open Session Logs Folder",
907+
"Open session logs folder",
943908
async () => { await vscode.commands.executeCommand("PowerShell.OpenLogFolder"); }),
944909

945910
new SessionMenuItem(

0 commit comments

Comments
 (0)