Merge pull request #666 from fortran-lang:gnikit/issue664

feat: path variable resolution for `fortls`

Author: gnikit

.gitignore

@@ -9,4 +9,10 @@ coverage
 # Fortran files
 *.o
 *.mod
-*.smod
+*.smod
+
+# Python files
+venv/
+*.egg-info/
+*.eggs/
+*.pyc

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Added support for variable resolution in `fortls`
+  ([#664](https://github.com/fortran-lang/vscode-fortran-support/issues/664))
 - Added Run and Debug buttons for single Fortran files based on linter settings
   ([#646](https://github.com/fortran-lang/vscode-fortran-support/issues/646))
 - Added linter support for [LFortran](https://lfortran.org/)

src/lsp/client.ts

@@ -12,6 +12,7 @@ import {
   isFortran,
   getOuterMostWorkspaceFolder,
   pipInstall,
+  resolveVariables,
 } from '../lib/tools';
 import { Logger } from '../services/logging';
 import { RestartLS } from '../features/commands';
@@ -82,7 +83,8 @@ export class FortlsClient {
     if (!isFortran(document)) return;
 
     const args: string[] = await this.fortlsArguments();
-    const executablePath = workspace.getConfiguration(EXTENSION_ID).get<string>('fortls.path');
+    const fortlsPath = workspace.getConfiguration(EXTENSION_ID).get<string>('fortls.path');
+    const executablePath = resolveVariables(fortlsPath);
 
     // Detect language server version and verify selected options
     this.version = this.getLSVersion(executablePath, args);
@@ -304,7 +306,7 @@ export class FortlsClient {
    */
   private async fortlsDownload(): Promise<boolean> {
     const config = workspace.getConfiguration(EXTENSION_ID);
-    const ls = config.get<string>('fortls.path');
+    const ls = resolveVariables(config.get<string>('fortls.path'));
 
     // Check for version, if this fails fortls provided is invalid
     const results = spawnSync(ls, ['--version']);