Skip to content

null check on activeTerminal to workaround vscode behavior #2141

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
Sep 16, 2019
Merged

null check on activeTerminal to workaround vscode behavior #2141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d257c
null check on activeTerminal
TylerLeonhardt Aug 16, 2019
52b9102
newline for linting
TylerLeonhardt Aug 16, 2019
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
3 changes: 2 additions & 1 deletion src/features/Console.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ export class ConsoleFeature implements IFeature {
return;
}

if (vscode.window.activeTerminal.name !== "PowerShell Integrated Console") {
if (vscode.window.activeTerminal &&
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would this flow be better?

if (!activeTerminal && existingPsExtTerminal) {
  // ShowSessionConsole
  return;
}
if (!activeTerminal || activeTerminal !== "PowerShell Integrated Console") {
  // Use runSelectedText
  return;
}
// ShowSessionConsole

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Tyriar I'm guessing from your snippet that existingPsExtTerminal would be used to determine if the PS extensions terminal is the "active"/"visible" terminal?

vscode.window.activeTerminal.name !== "PowerShell Integrated Console") {
this.log.write("PSIC is not active terminal. Running in active terminal using 'runSelectedText'");
await vscode.commands.executeCommand("workbench.action.terminal.runSelectedText");

Expand Down