Substitute variables in r.rterm.option and r.lsp.args settings

Author: renkun-ken

src/languageService.ts

@@ -4,7 +4,7 @@ import * as net from 'net';
 import { URL } from 'url';
 import { LanguageClient, LanguageClientOptions, StreamInfo, DocumentFilter, ErrorAction, CloseAction, RevealOutputChannelOn } from 'vscode-languageclient/node';
 import { Disposable, workspace, Uri, TextDocument, WorkspaceConfiguration, OutputChannel, window, WorkspaceFolder } from 'vscode';
-import { DisposableProcess, getRLibPaths, getRpath, promptToInstallRPackage, spawn } from './util';
+import { DisposableProcess, getRLibPaths, getRpath, promptToInstallRPackage, spawn, substituteVariables } from './util';
 import { extensionContext } from './extension';
 import { CommonOptions } from 'child_process';
 
@@ -84,7 +84,7 @@ export class LanguageService implements Disposable {
 
         const rScriptPath = extensionContext.asAbsolutePath('R/languageServer.R');
         const options = { cwd: cwd, env: env };
-        const args = (config.get<string[]>('lsp.args') ?? []).concat(
+        const args = (config.get<string[]>('lsp.args')?.map(substituteVariables) ?? []).concat(
             '--silent',
             '--slave',
             '--no-save',

src/rTerminal.ts

@@ -117,7 +117,7 @@ export async function runFromLineToEnd(): Promise<void>  {
 export async function makeTerminalOptions(): Promise<vscode.TerminalOptions> {
     const workspaceFolderPath = getCurrentWorkspaceFolder()?.uri.fsPath;
     const termPath = await getRterm();
-    const shellArgs: string[] = config().get('rterm.option') || [];
+    const shellArgs: string[] = config().get<string[]>('rterm.option')?.map(util.substituteVariables) || [];
     const termOptions: vscode.TerminalOptions = {
         name: 'R Interactive',
         shellPath: termPath,

src/util.ts

@@ -25,18 +25,19 @@ function substituteVariable(str: string, key: string, getValue: () => string | u
     return str;
 }
 
-function substituteVariables(str: string) {
+export function substituteVariables(str: string): string {
     let result = str;
-    result = substituteVariable(result, '${userHome}', () => homedir());
-    result = substituteVariable(result, '${workspaceFolder}', () => getCurrentWorkspaceFolder()?.uri.fsPath);
-    result = substituteVariable(result, '${fileWorkspaceFolder}', () => getActiveFileWorkspaceFolder()?.uri.fsPath);
-    result = substituteVariable(result, '${fileDirname}', () => {
-        const activeFilePath = vscode.window.activeTextEditor?.document.uri.fsPath;
-        if (activeFilePath) {
-            return path.dirname(activeFilePath);
-        }
-    });
-
+    if (str.includes('${')) {
+        result = substituteVariable(result, '${userHome}', () => homedir());
+        result = substituteVariable(result, '${workspaceFolder}', () => getCurrentWorkspaceFolder()?.uri.fsPath);
+        result = substituteVariable(result, '${fileWorkspaceFolder}', () => getActiveFileWorkspaceFolder()?.uri.fsPath);
+        result = substituteVariable(result, '${fileDirname}', () => {
+            const activeFilePath = vscode.window.activeTextEditor?.document.uri.fsPath;
+            if (activeFilePath) {
+                return path.dirname(activeFilePath);
+            }
+        });
+    }
     return result;
 }