Skip to content

Use cwd in knit process #807

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 3 commits into from
Oct 7, 2021
Merged

Use cwd in knit process #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d4bfa0
Respect cwd
ElianHugh Sep 30, 2021
61cac90
Start knit process from knitWorkingDirectory
renkun-ken Oct 7, 2021
a2a0a94
Refine getKnitDir
renkun-ken Oct 7, 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
1 change: 1 addition & 0 deletions src/rmarkdown/knit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export class RMarkdownKnitManager extends RMarkdownManager {

return await this.knitWithProgress(
{
workingDirectory: knitWorkingDir,
fileName: docName,
filePath: rDocumentPath,
scriptArgs: scriptValues,
Expand Down
10 changes: 6 additions & 4 deletions src/rmarkdown/manager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export interface IKnitRejection {
const rMarkdownOutput: vscode.OutputChannel = vscode.window.createOutputChannel('R Markdown');

interface IKnitArgs {
workingDirectory: string;
filePath: string;
fileName: string;
scriptArgs: Record<string, string>;
Expand All @@ -35,15 +36,15 @@ export abstract class RMarkdownManager {
// so that we can't spam the knit/preview button
protected busyUriStore: Set<string> = new Set<string>();

protected getKnitDir(knitDir: string, docPath?: string): string {
const currentDocumentWorkspace = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(docPath) ?? vscode.window.activeTextEditor?.document?.uri)?.uri?.fsPath ?? undefined;
protected getKnitDir(knitDir: string, docPath: string): string {
switch (knitDir) {
// the directory containing the R Markdown document
case KnitWorkingDirectory.documentDirectory: {
return path.dirname(docPath).replace(/\\/g, '/').replace(/['"]/g, '\\"');
}
// the root of the current workspace
case KnitWorkingDirectory.workspaceRoot: {
const currentDocumentWorkspace = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(docPath) ?? vscode.window.activeTextEditor?.document?.uri)?.uri?.fsPath ?? undefined;
return currentDocumentWorkspace.replace(/\\/g, '/').replace(/['"]/g, '\\"');
}
// the working directory of the attached terminal, NYI
Expand Down Expand Up @@ -74,11 +75,12 @@ export abstract class RMarkdownManager {
`-f`,
`${scriptPath}`
];
const processOptions = {
const processOptions: cp.SpawnOptions = {
env: {
...process.env,
...scriptArgs
}
},
cwd: args.workingDirectory,
};

let childProcess: DisposableProcess;
Expand Down
1 change: 1 addition & 0 deletions src/rmarkdown/preview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ export class RMarkdownPreviewManager extends RMarkdownManager {

return await this.knitWithProgress(
{
workingDirectory: knitWorkingDir,
fileName: fileName,
filePath: filePath,
scriptPath: extensionContext.asAbsolutePath('R/rmarkdown/preview.R'),
Expand Down