diff --git a/CHANGELOG.md b/CHANGELOG.md index e91ceb6a..6513f559 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ You can check all of our changes from [Release Page](https://github.com/REditorSupport/vscode-R/releases) +## [2.8.5](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.5) + +* Upgrade Rsyntax +* Use --no-echo instead of --slave + ## [2.8.4](https://github.com/REditorSupport/vscode-R/releases/tag/v2.8.4) * Upgrade dependencies diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9dac91f6..005e5407 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at ikuyadeu0513@gmail.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at . The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/src/helpViewer/helpPreviewer.ts b/src/helpViewer/helpPreviewer.ts index 4d7ba753..2b6d6129 100644 --- a/src/helpViewer/helpPreviewer.ts +++ b/src/helpViewer/helpPreviewer.ts @@ -239,7 +239,7 @@ export class RLocalHelpPreviewer { // Convert .Rd to HTML const args = [ '--silent', - '--slave', + '--no-echo', '--no-save', '--no-restore', '-f', diff --git a/src/helpViewer/helpProvider.ts b/src/helpViewer/helpProvider.ts index 20bcac9d..42212621 100644 --- a/src/helpViewer/helpProvider.ts +++ b/src/helpViewer/helpProvider.ts @@ -49,7 +49,7 @@ export class HelpProvider { const scriptPath = extensionContext.asAbsolutePath('R/help/helpServer.R'); const args = [ '--silent', - '--slave', + '--no-echo', '--no-save', '--no-restore', '-e', @@ -259,7 +259,7 @@ export class AliasProvider { const args = [ '--silent', - '--slave', + '--no-echo', '--no-save', '--no-restore', '-f', diff --git a/src/helpViewer/packages.ts b/src/helpViewer/packages.ts index 82cee13d..77c94c83 100644 --- a/src/helpViewer/packages.ts +++ b/src/helpViewer/packages.ts @@ -193,7 +193,7 @@ export class PackageManager { // remove a specified package. The packagename is selected e.g. in the help tree-view public async removePackage(pkgName: string): Promise { const rPath = this.rHelp.rPath; - const args = ['--silent', '--slave', '--no-save', '--no-restore', '-e', `remove.packages('${pkgName}')`]; + const args = ['--silent', '--no-echo', '--no-save', '--no-restore', '-e', `remove.packages('${pkgName}')`]; const cmd = `${rPath} ${args.join(' ')}`; const confirmation = 'Yes, remove package!'; const prompt = `Are you sure you want to remove package ${pkgName}?`; @@ -211,7 +211,7 @@ export class PackageManager { public async installPackages(pkgNames: string[], skipConfirmation: boolean = false): Promise { const rPath = this.rHelp.rPath; const cranUrl = await getCranUrl('', this.cwd); - const args = [`--silent`, '--slave', `-e`, `install.packages(c(${pkgNames.map(v => `'${v}'`).join(',')}),repos='${cranUrl}')`]; + const args = [`--silent`, '--no-echo', `-e`, `install.packages(c(${pkgNames.map(v => `'${v}'`).join(',')}),repos='${cranUrl}')`]; const cmd = `${rPath} ${args.join(' ')}`; const pluralS = pkgNames.length > 1? 's' : ''; const confirmation = `Yes, install package${pluralS}!`; @@ -227,7 +227,7 @@ export class PackageManager { public async updatePackages(skipConfirmation: boolean = false): Promise { const rPath = this.rHelp.rPath; const cranUrl = await getCranUrl('', this.cwd); - const args = ['--silent', '--slave', '--no-save', '--no-restore', '-e', `update.packages(ask=FALSE,repos='${cranUrl}')`]; + const args = ['--silent', '--no-echo', '--no-save', '--no-restore', '-e', `update.packages(ask=FALSE,repos='${cranUrl}')`]; const cmd = `${rPath} ${args.join(' ')}`; const confirmation = 'Yes, update all packages!'; const prompt = 'Are you sure you want to update all installed packages? This might take some time!'; diff --git a/src/languageService.ts b/src/languageService.ts index 96879d5a..02c45e2c 100644 --- a/src/languageService.ts +++ b/src/languageService.ts @@ -86,7 +86,7 @@ export class LanguageService implements Disposable { const options = { cwd: cwd, env: env }; const args = (config.get('lsp.args')?.map(substituteVariables) ?? []).concat( '--silent', - '--slave', + '--no-echo', '--no-save', '--no-restore', '-e', diff --git a/src/rmarkdown/draft.ts b/src/rmarkdown/draft.ts index 172eb1b6..1c0b7c00 100644 --- a/src/rmarkdown/draft.ts +++ b/src/rmarkdown/draft.ts @@ -35,7 +35,7 @@ async function getTemplateItems(cwd: string): Promise