Merge pull request #503 from fortran-lang/gnikit/issue500

Gnikit/issue500

Author: gnikit

CHANGELOG.md

@@ -35,6 +35,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- Changed `linter.compilerPath` to use the full path to the compiler instead of the root
+  ([#500](https://github.com/fortran-lang/vscode-fortran-support/issues/500))
 - Changed all instances of the publisher to `fortran-lang`
   ([#450](https://github.com/fortran-lang/vscode-fortran-support/issues/450))
 - Updated grammar unittests to include scope injections

src/features/linter-provider.ts

@@ -2,6 +2,7 @@
 
 import * as path from 'path';
 import * as cp from 'child_process';
+import which from 'which';
 
 import * as vscode from 'vscode';
 import { LoggingService } from '../services/logging-service';
@@ -221,19 +222,17 @@ export class FortranLintingProvider {
   }
 
   /**
-   * Returns the linter executable
+   * Returns the linter executable i.e. this.compilerPath
    * @returns String with linter
    */
   private getLinterExecutable(): string {
     const config = vscode.workspace.getConfiguration('fortran.linter');
 
     this.compiler = config.get<string>('compiler', 'gfortran');
     this.compilerPath = config.get<string>('compilerPath', '');
-    const linter = path.join(this.compilerPath, this.compiler);
-
-    this.logger.logInfo(`using linter: ${this.compiler} located in: ${linter}`);
-
-    return linter;
+    if (this.compilerPath === '') this.compilerPath = which.sync(this.compiler);
+    this.logger.logInfo(`using linter: ${this.compiler} located in: ${this.compilerPath}`);
+    return this.compilerPath;
   }
 
   /**

test/index.ts

@@ -1,6 +1,6 @@
-import * as path from 'path';
-import * as Mocha from 'mocha';
-import * as glob from 'glob';
+import path from 'path';
+import Mocha from 'mocha';
+import glob from 'glob';
 
 export function run(): Promise<void> {
   // Create the mocha test

tsconfig.test.json

@@ -6,7 +6,9 @@
     "lib": ["ES2020"],
     "sourceMap": true,
     "rootDir": ".",
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "removeComments": true
   },
   "include": ["test/**/*.ts", "syntaxes/*.json"],
   "exclude": ["node_modules", ".vscode-test"]