@@ -18,11 +18,11 @@ import {
1818} from 'vscode' ;
1919import { Logger } from 'vscode-languageclient' ;
2020import {
21+ addPathToProcessPath ,
2122 executableExists ,
2223 httpsGetSilently ,
23- resolvePathPlaceHolders ,
2424 IEnvVars ,
25- addPathToProcessPath ,
25+ resolvePathPlaceHolders ,
2626 resolveServerEnvironmentPATH ,
2727} from './utils' ;
2828export { IEnvVars } ;
@@ -258,7 +258,8 @@ export async function findHaskellLanguageServer(
258258 // we manage HLS, make sure ghcup is installed/available
259259 await upgradeGHCup ( context , logger ) ;
260260
261- // get a preliminary toolchain for finding the correct project GHC version (we need HLS and cabal/stack and ghc as fallback),
261+ // get a preliminary toolchain for finding the correct project GHC version
262+ // (we need HLS and cabal/stack and ghc as fallback),
262263 // later we may install a different toolchain that's more project-specific
263264 const latestHLS = await getLatestToolFromGHCup ( context , logger , 'hls' ) ;
264265 const latestCabal = ( workspace . getConfiguration ( 'haskell' ) . get ( 'installCabal' ) as boolean )
@@ -542,7 +543,7 @@ async function getLatestToolFromGHCup(context: ExtensionContext, logger: Logger,
542543 if ( latestInstalled ) {
543544 const latestInstalledVersion = latestInstalled . split ( / \s + / ) [ 1 ] ;
544545
545- let bin = await callGHCup ( context , logger , [ 'whereis' , tool , `${ latestInstalledVersion } ` ] , undefined , false ) ;
546+ const bin = await callGHCup ( context , logger , [ 'whereis' , tool , `${ latestInstalledVersion } ` ] , undefined , false ) ;
546547 const ver = await callAsync ( `${ bin } ` , [ '--numeric-version' ] , logger , undefined , undefined , false ) ;
547548 if ( ver ) {
548549 return ver ;
0 commit comments