Skip to content

Fix so code can be run after creating terminal #567

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
Ikuyadeu merged 2 commits into from
Mar 7, 2021
Merged

Fix so code can be run after creating terminal #567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34c2fe6
Check rTerm is defined before showing
andycraig Mar 5, 2021
917315a
Fix so code can be run after creating terminal
andycraig Mar 5, 2021
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
5 changes: 1 addition & 4 deletions src/rTerminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,8 @@ export async function chooseTerminal(): Promise<vscode.Terminal> {
}

if (rTerm === undefined) {
const success = await createRTerm(true);
await createRTerm(true);
await delay(200); // Let RTerm warm up
if (!success) {
return undefined;
}
}

return rTerm;
Expand Down
4 changes: 3 additions & 1 deletion src/rstudioapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,9 @@ export async function sendCodeToRTerminal(code: string, focus: boolean) {
await runTextInTerm(code);
if (focus) {
const rTerm = await chooseTerminal();
rTerm.show();
if (rTerm !== undefined) {
rTerm.show();
}
}
}

Expand Down