Make serverExecutablePATH override all other settings

Author: hasufell

README.md

@@ -90,7 +90,7 @@ and possible delete them:
 | Linux    | `$HOME/.config/Code/User/globalStorage/haskell.haskell/.ghcup`                  |
 
 If you want to manage HLS yourself, set `haskell.manageHLS` to `PATH` and make sure HLS is in your PATH
-or set `haskell.serverExecutablePath` to a valid executable.
+or set `haskell.serverExecutablePath` (overrides all other settings) to a valid executable.
 
 If you need to set mirrors for ghcup download info, check the settings `haskell.metadataURL` and `haskell.releasesURL`.
 

src/hlsBinaries.ts

@@ -205,11 +205,13 @@ export async function findHaskellLanguageServer(
     workingDir: string,
     folder?: WorkspaceFolder
 ): Promise<string> {
-
     logger.info('Finding haskell-language-server');
 
+    if (workspace.getConfiguration('haskell').get('serverExecutablePath') as string !== '') {
+      return findServerExecutable(context, logger, folder);
+    }
+
     const storagePath: string = await getStoragePath(context);
-    logger.info(`Using ${storagePath} to store downloaded binaries`);
 
     if (!fs.existsSync(storagePath)) {
         fs.mkdirSync(storagePath);
@@ -233,11 +235,7 @@ export async function findHaskellLanguageServer(
     }
 
     if (manageHLS === 'PATH' || manageHLS === null) {
-        if (workspace.getConfiguration('haskell').get('serverExecutablePath') as string !== '') {
-          return findServerExecutable(context, logger, folder);
-        } else {
-          return findHLSinPATH(context, logger, folder);
-        }
+      return findHLSinPATH(context, logger, folder);
     } else {
         // we manage HLS, make sure ghcup is installed/available
         await getGHCup(context, logger);