Get rid of internal-ghcup

Author: hasufell

README.md

@@ -71,17 +71,26 @@ The environment _only will be visible for the lsp server_, not for other extensi
 
 ### Downloaded binaries
 
-This extension will download `haskell-language-server` binaries either via an internal ghcup (it will download it automaticlaly)
-or via a system ghcup (which must be present), unless you set the config option `haskell.manageHLS` to `PATH` (the extension
-will ask you on first start).
+This extension will download `haskell-language-server` binaries and the rest of the toolchain if you selected to use GHCup during
+first start. Check the `haskell.manageHLS` setting.
 
 It will then download the newest version of haskell-language-server which has support for the required ghc.
 That means it could use an older version than the latest one, without the last features and bug fixes.
 For example, if a project needs ghc-8.10.4 the extension will download and use haskell-language-server-1.4.0, the lastest version which supported ghc-8.10.4. Even if the lastest global haskell language-server version is 1.5.1.
 
-If you have disk space issues and use system ghcup, check `ghcup gc --help`.
-If you have disk space issues and use the internal ghcup, check the following directories, depending on your platform
-and possible delete them:
+If you have disk space issues, check `ghcup gc --help`.
+
+You can also instruct the extension to use a different installation directory for the toolchain,
+e.g. to not interfere with system GHCup installation. Depending on your platform, add the full
+resolved path like so:
+
+```json
+  "haskell.serverEnvironment": {
+    "GHCUP_INSTALL_BASE_PREFIX": "/home/foo/.config/Code/User/globalStorage/haskell.haskell/"
+  }
+```
+
+The internal storage paths for the extension depend on the platform:
 
 | Platform | Path                                                                            |
 | -------- | ------------------------------------------------------------------------------- |

package.json

@@ -164,12 +164,10 @@
           "description": "How to manage/find HLS installations.",
           "enum": [
             "system-ghcup",
-            "internal-ghcup",
             "PATH"
           ],
           "enumDescriptions": [
             "Will use ghcup and manage Haskell toolchain in the default location (usually '~/.ghcup')",
-            "Will use ghcup and manage Haskell toolchain in an isolated VSCode specific location (to not interfere with system installations)",
             "Discovers HLS executables in system PATH"
           ]
         },

src/hlsBinaries.ts

@@ -26,7 +26,7 @@ export interface IEnvVars {
   [key: string]: string;
 }
 
-type ManageHLS = 'system-ghcup' | 'internal-ghcup' | 'PATH';
+type ManageHLS = 'system-ghcup' | 'PATH';
 let manageHLS = workspace.getConfiguration('haskell').get('manageHLS') as ManageHLS | null;
 
 // On Windows the executable needs to be stored somewhere with an .exe extension
@@ -103,6 +103,9 @@ async function callAsync(
     reject: (reason?: any) => void
   ) => void
 ): Promise<string> {
+   let newEnv: IEnvVars = workspace.getConfiguration('haskell').get('serverEnvironment') || {};
+   newEnv = Object.assign(process.env, newEnv);
+   newEnv = Object.assign(newEnv, (envAdd || {}));
   return window.withProgress(
     {
       location: ProgressLocation.Notification,
@@ -116,7 +119,6 @@ async function callAsync(
         token.onCancellationRequested(() => {
           logger.warn(`User canceled the execution of '${command}'`);
         });
-        const newEnv = envAdd ? Object.assign(process.env, envAdd) : process.env;
         // Need to set the encoding to 'utf8' in order to get back a string
         // We execute the command in a shell for windows, to allow use .cmd or .bat scripts
         const childProcess = child_process
@@ -231,11 +233,9 @@ export async function findHaskellLanguageServer(
     const decision =
       (await window.showInformationMessage(promptMessage, 'automatically via GHCup', 'manually via PATH')) ||
       null;
-    if (decision === 'system ghcup (recommended)') {
+    if (decision === 'automatically via GHCup') {
       manageHLS = 'system-ghcup';
-    } else if (decision === 'internal ghcup') {
-      manageHLS = 'internal-ghcup';
-    } else if (decision === 'PATH') {
+    } else if (decision === 'manually via PATH') {
       manageHLS = 'PATH';
     } else {
       window.showWarningMessage('Choosing default PATH method for HLS discovery. You can change this via \'haskell.manageHLS\' in the settings.');
@@ -332,7 +332,6 @@ async function callGHCup(
   const metadataUrl = workspace.getConfiguration('haskell').metadataURL;
 
   const storagePath: string = await getStoragePath(context);
-  const ghcup = manageHLS === 'system-ghcup' ? `ghcup${exeExt}` : path.join(storagePath, `ghcup${exeExt}`);
   if (manageHLS === 'system-ghcup') {
     return await callAsync(
       'ghcup',
@@ -344,19 +343,6 @@ async function callGHCup(
       undefined,
       callback
     );
-  } else if (manageHLS === 'internal-ghcup') {
-    return await callAsync(
-      ghcup,
-      ['--no-verbose'].concat(metadataUrl ? ['-s', metadataUrl] : []).concat(args),
-      storagePath,
-      logger,
-      title,
-      cancellable,
-      {
-        GHCUP_INSTALL_BASE_PREFIX: storagePath,
-      },
-      callback
-    );
   } else {
     throw new Error(`Internal error: tried to call ghcup while haskell.manageHLS is set to ${manageHLS}. Aborting!`);
   }
@@ -465,7 +451,7 @@ export async function getGHCup(context: ExtensionContext, logger: Logger): Promi
     throw new MissingToolError('ghcup');
   }
 
-  if (manageHLS === 'system-ghcup' || manageHLS == 'internal-ghcup') {
+  if (manageHLS === 'system-ghcup') {
     logger.info(`found ghcup at ${localGHCup}`);
     const args = ['upgrade'];
     await callGHCup(context, logger, args, 'Upgrading ghcup', true);