feat: expand ${workspaceFolder} in nargoPath setting

src/client.ts

@@ -23,7 +23,7 @@ import {
 } from 'vscode-languageclient/node';
 
 import { extensionName, languageId } from './constants';
-import findNargo from './find-nargo';
+import { getNargoPath } from './find-nargo';
 
 type NargoCapabilities = {
   nargo?: {
@@ -90,7 +90,7 @@ function getLspCommand(uri: Uri) {
     return;
   }
 
-  const command = config.get<string | undefined>('nargoPath') || findNargo();
+  const command = getNargoPath(uri);
 
   const flags = config.get<string | undefined>('nargoFlags') || '';
 

src/debugger.ts

@@ -1,7 +1,6 @@
 import {
   debug,
   window,
-  workspace,
   DebugAdapterDescriptorFactory,
   DebugSession,
   DebugAdapterExecutable,
@@ -15,7 +14,7 @@ import {
 } from 'vscode';
 
 import { spawn } from 'child_process';
-import findNargo from './find-nargo';
+import { getNargoPath } from './find-nargo';
 import findNearestPackageFrom from './find-nearest-package';
 
 let outputChannel: OutputChannel;
@@ -37,10 +36,7 @@ export class NoirDebugAdapterDescriptorFactory implements DebugAdapterDescriptor
     _session: DebugSession,
     _executable: DebugAdapterExecutable,
   ): ProviderResult<DebugAdapterDescriptor> {
-    const config = workspace.getConfiguration('noir');
-
-    const configuredNargoPath = config.get<string | undefined>('nargoPath');
-    const nargoPath = configuredNargoPath || findNargo();
+    const nargoPath = getNargoPath();
 
     return new DebugAdapterExecutable(nargoPath, ['dap']);
   }
@@ -84,8 +80,7 @@ class NoirDebugConfigurationProvider implements DebugConfigurationProvider {
     config: DebugConfiguration,
     _token?: CancellationToken,
   ): ProviderResult<DebugConfiguration> {
-    const workspaceConfig = workspace.getConfiguration('noir');
-    const nargoPath = workspaceConfig.get<string | undefined>('nargoPath') || findNargo();
+    const nargoPath = getNargoPath();
 
     outputChannel.clear();
 

src/extension.ts

@@ -42,7 +42,7 @@ import { activateDebugger } from './debugger';
 
 import { languageId } from './constants';
 import Client from './client';
-import findNargo, { findNargoBinaries } from './find-nargo';
+import { findNargoBinaries, getNargoPath } from './find-nargo';
 import { lspClients, editorLineDecorationManager } from './noir';
 import { getNoirStatusBarItem, handleClientStartError } from './noir';
 
@@ -113,7 +113,7 @@ function registerCommands(uri: Uri) {
   const file = uri.toString();
   const config = workspace.getConfiguration('noir', uri);
 
-  const nargoPath = config.get<string | undefined>('nargoPath') || findNargo();
+  const nargoPath = getNargoPath(uri);
 
   const nargoFlags = config.get<string | undefined>('nargoFlags') || [];
 

src/find-nargo.ts

@@ -3,7 +3,7 @@ import path from 'path';
 import fs from 'fs';
 import which from 'which';
 import { NargoNotFoundError } from './noir';
-import { MarkdownString } from 'vscode';
+import { MarkdownString, Uri, workspace } from 'vscode';
 
 // List of possible nargo binaries to find on Path
 // We prioritize 'nargo' as the more standard version.
@@ -64,3 +64,15 @@ export default function findNargo() {
     throw new NargoNotFoundError(message);
   }
 }
+
+export function getNargoPath(uri: Uri | undefined = undefined): string {
+  const config = workspace.getConfiguration('noir', uri);
+  let nargoPath = config.get<string | undefined>('nargoPath');
+  if (nargoPath === undefined) {
+    return findNargo();
+  }
+
+  nargoPath = nargoPath.replace(/\${workspaceFolder}/g, workspace.workspaceFolders[0].uri.fsPath);
+
+  return nargoPath;
+}