Skip to content

allow to invoke R terminal also in relative paths #1398

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
renkun-ken merged 2 commits into from
Oct 7, 2023
Merged

allow to invoke R terminal also in relative paths #1398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c59e95
allow to invoke R terminal also in relative paths, and specify the ri…
Aug 5, 2023
e9f43f3
remove code duplication
Aug 11, 2023
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
9 changes: 7 additions & 2 deletions src/rTerminal.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import * as util from './util';
import * as selection from './selection';
import { getSelection } from './selection';
import { cleanupSession } from './session';
import { config, delay, getRterm } from './util';
import { config, delay, getRterm, getCurrentWorkspaceFolder } from './util';
import { rGuestService, isGuestSession } from './liveShare';
import * as fs from 'fs';
export let rTerm: vscode.Terminal | undefined = undefined;
Expand Down Expand Up @@ -115,12 +115,17 @@ export async function runFromLineToEnd(): Promise<void> {
}

export async function makeTerminalOptions(): Promise<vscode.TerminalOptions> {
const termPath = await getRterm();
const workspaceFolderPath = getCurrentWorkspaceFolder()?.uri.fsPath;
const termPathMaybeRelative = await getRterm();
const termPath: string | undefined = (workspaceFolderPath && termPathMaybeRelative) ?
path.resolve(workspaceFolderPath, termPathMaybeRelative) :
termPathMaybeRelative;
const shellArgs: string[] = config().get('rterm.option') || [];
const termOptions: vscode.TerminalOptions = {
name: 'R Interactive',
shellPath: termPath,
shellArgs: shellArgs,
cwd: workspaceFolderPath,
};
const newRprofile = extensionContext.asAbsolutePath(path.join('R', 'session', 'profile.R'));
const initR = extensionContext.asAbsolutePath(path.join('R', 'session','init.R'));
Expand Down