Skip to content

fix: wrap the experimental shell type API with try-catch #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 10, 2025
Merged

fix: wrap the experimental shell type API with try-catch #175

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16aae15
fix: wrap the experimental shell type API with try-catch
karthiknadig Feb 10, 2025
a90e5c0
Add comment for clarity
karthiknadig Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 27 additions & 22 deletions src/features/common/shellDetector.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,28 +125,33 @@ function identifyShellFromSettings(): TerminalShellType {
}

function fromShellTypeApi(terminal: Terminal): TerminalShellType {
switch (terminal.state.shellType) {
case TerminalShellTypeVscode.Sh:
case TerminalShellTypeVscode.Bash:
return TerminalShellType.bash;
case TerminalShellTypeVscode.Fish:
return TerminalShellType.fish;
case TerminalShellTypeVscode.Csh:
return TerminalShellType.cshell;
case TerminalShellTypeVscode.Ksh:
return TerminalShellType.ksh;
case TerminalShellTypeVscode.Zsh:
return TerminalShellType.zsh;
case TerminalShellTypeVscode.CommandPrompt:
return TerminalShellType.commandPrompt;
case TerminalShellTypeVscode.GitBash:
return TerminalShellType.gitbash;
case TerminalShellTypeVscode.PowerShell:
return TerminalShellType.powershellCore;
case TerminalShellTypeVscode.NuShell:
return TerminalShellType.nushell;
default:
return TerminalShellType.unknown;
try {
switch (terminal.state.shellType) {
case TerminalShellTypeVscode.Sh:
case TerminalShellTypeVscode.Bash:
return TerminalShellType.bash;
case TerminalShellTypeVscode.Fish:
return TerminalShellType.fish;
case TerminalShellTypeVscode.Csh:
return TerminalShellType.cshell;
case TerminalShellTypeVscode.Ksh:
return TerminalShellType.ksh;
case TerminalShellTypeVscode.Zsh:
return TerminalShellType.zsh;
case TerminalShellTypeVscode.CommandPrompt:
return TerminalShellType.commandPrompt;
case TerminalShellTypeVscode.GitBash:
return TerminalShellType.gitbash;
case TerminalShellTypeVscode.PowerShell:
return TerminalShellType.powershellCore;
case TerminalShellTypeVscode.NuShell:
return TerminalShellType.nushell;
default:
return TerminalShellType.unknown;
}
} catch {
// If the API is not available, return unknown
return TerminalShellType.unknown;
}
}

Expand Down