Skip to content

Commit 402e4e8

Browse files
Avoid .R file lock on windows (#1192)
* Avoid .R file lock on windows * Change path quoting * Better quoting
1 parent 129820f commit 402e4e8

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.vscode/tasks.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"command": "vsce",
1111
"args": [
1212
"package",
13+
"--yarn",
1314
"-o",
1415
"${workspaceFolderBasename}.vsix"
1516
]

src/helpViewer/helpProvider.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,14 @@ export class HelpProvider {
4747

4848
// starts the background help server and waits forever to keep the R process running
4949
const scriptPath = extensionContext.asAbsolutePath('R/help/helpServer.R');
50-
// const cmd = `${this.rPath} --silent --slave --no-save --no-restore -f "${scriptPath}"`;
5150
const args = [
5251
'--silent',
5352
'--slave',
5453
'--no-save',
5554
'--no-restore',
56-
'-f',
55+
'-e',
56+
'base::source(base::commandArgs(TRUE))',
57+
'--args',
5758
scriptPath
5859
];
5960
const cpOptions = {

src/languageService.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ export class LanguageService implements Disposable {
8585
'--slave',
8686
'--no-save',
8787
'--no-restore',
88-
'-f',
88+
'-e',
89+
'base::source(base::commandArgs(TRUE))',
90+
'--args',
8991
rScriptPath
9092
);
9193

tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
{
33
"compilerOptions": {
44
"module": "commonjs",
5-
"target": "es2018",
5+
"target": "ES2021",
66
"outDir": "out",
77
"lib": [
8-
"es2018"
8+
"ES2021"
99
],
1010
"sourceMap": true,
1111
// "strictNullChecks": true,

0 commit comments

Comments
 (0)