Rename 'system-ghcup' setting to 'GHCup'

Author: hasufell

package.json

@@ -163,12 +163,12 @@
           "default": null,
           "description": "How to manage/find HLS installations.",
           "enum": [
-            "system-ghcup",
+            "GHCup",
             "PATH"
           ],
           "enumDescriptions": [
             "Will use ghcup and manage Haskell toolchain in the default location (usually '~/.ghcup')",
-            "Discovers HLS executables in system PATH"
+            "Discovers HLS and other executables in system PATH"
           ]
         },
         "haskell.useSystemGHCup": {

src/hlsBinaries.ts

@@ -26,7 +26,7 @@ export interface IEnvVars {
   [key: string]: string;
 }
 
-type ManageHLS = 'system-ghcup' | 'PATH';
+type ManageHLS = '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
@@ -234,7 +234,7 @@ export async function findHaskellLanguageServer(
       (await window.showInformationMessage(promptMessage, 'automatically via GHCup', 'manually via PATH')) ||
       null;
     if (decision === 'automatically via GHCup') {
-      manageHLS = 'system-ghcup';
+      manageHLS = 'GHCup';
     } else if (decision === 'manually via PATH') {
       manageHLS = 'PATH';
     } else {
@@ -332,7 +332,7 @@ async function callGHCup(
   const metadataUrl = workspace.getConfiguration('haskell').metadataURL;
 
   const storagePath: string = await getStoragePath(context);
-  if (manageHLS === 'system-ghcup') {
+  if (manageHLS === 'GHCup') {
     return await callAsync(
       'ghcup',
       ['--no-verbose'].concat(metadataUrl ? ['-s', metadataUrl] : []).concat(args),
@@ -451,7 +451,7 @@ export async function getGHCup(context: ExtensionContext, logger: Logger): Promi
     throw new MissingToolError('ghcup');
   }
 
-  if (manageHLS === 'system-ghcup') {
+  if (manageHLS === 'GHCup') {
     logger.info(`found ghcup at ${localGHCup}`);
     const args = ['upgrade'];
     await callGHCup(context, logger, args, 'Upgrading ghcup', true);

test/suite/extension.test.ts

@@ -129,7 +129,7 @@ suite('Extension Test Suite', () => {
       , joinUri(getWorkspaceRoot().uri, 'bin', process.platform === 'win32' ? 'ghcup' : '.ghcup', 'cache')
       ]
     );
-    await getHaskellConfig().update('manageHLS', 'system-ghcup');
+    await getHaskellConfig().update('manageHLS', 'GHCup');
     await getHaskellConfig().update('logFile', 'hls.log');
     await getHaskellConfig().update('trace.server', 'messages');
     await getHaskellConfig().update('releasesDownloadStoragePath', path.normalize(getWorkspaceFile('bin').fsPath));