Fix: return wrapper properly

hasufell · hasufell · commit 6dc8edc4fc08 · 2022-03-19T12:44:17.000+01:00
diff --git a/src/hlsBinaries.ts b/src/hlsBinaries.ts
@@ -286,7 +286,7 @@ export async function findHaskellLanguageServer(
     const [projectHls, projectGhc] = await getLatestProjectHLS(context, logger, workingDir, latestToolchainBindir);
 
     // now install said version in an isolated symlink directory
-    return await callGHCup(
+    const hlsBinDir = await callGHCup(
       context,
       logger,
       [ 'run'
@@ -298,6 +298,7 @@ export async function findHaskellLanguageServer(
       `Installing project specific toolchain: HLS-${projectHls}, GHC-${projectGhc}, cabal-${latestCabal}, stack-${latestStack}`,
       true
     );
+    return (path.join(hlsBinDir, `haskell-language-server-wrapper${exeExt}`))
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ export async function findHaskellLanguageServer(`
`286`	`286`	`const [projectHls, projectGhc] = await getLatestProjectHLS(context, logger, workingDir, latestToolchainBindir);`
`287`	`287`
`288`	`288`	`// now install said version in an isolated symlink directory`
`289`		`- return await callGHCup(`
	`289`	`+ const hlsBinDir = await callGHCup(`
`290`	`290`	`context,`
`291`	`291`	`logger,`
`292`	`292`	`[ 'run'`
`@@ -298,6 +298,7 @@ export async function findHaskellLanguageServer(`
`298`	`298`	`Installing project specific toolchain: HLS-${projectHls}, GHC-${projectGhc}, cabal-${latestCabal}, stack-${latestStack}`,
`299`	`299`	`true`
`300`	`300`	`);`
	`301`	+ return (path.join(hlsBinDir, `haskell-language-server-wrapper${exeExt}`))
`301`	`302`	`}`
`302`	`303`	`}`
`303`	`304`