@@ -18,11 +18,11 @@ import {
18
18
} from 'vscode' ;
19
19
import { Logger } from 'vscode-languageclient' ;
20
20
import {
21
+ addPathToProcessPath ,
21
22
executableExists ,
22
23
httpsGetSilently ,
23
- resolvePathPlaceHolders ,
24
24
IEnvVars ,
25
- addPathToProcessPath ,
25
+ resolvePathPlaceHolders ,
26
26
resolveServerEnvironmentPATH ,
27
27
} from './utils' ;
28
28
export { IEnvVars } ;
@@ -258,7 +258,8 @@ export async function findHaskellLanguageServer(
258
258
// we manage HLS, make sure ghcup is installed/available
259
259
await upgradeGHCup ( context , logger ) ;
260
260
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),
262
263
// later we may install a different toolchain that's more project-specific
263
264
const latestHLS = await getLatestToolFromGHCup ( context , logger , 'hls' ) ;
264
265
const latestCabal = ( workspace . getConfiguration ( 'haskell' ) . get ( 'installCabal' ) as boolean )
@@ -542,7 +543,7 @@ async function getLatestToolFromGHCup(context: ExtensionContext, logger: Logger,
542
543
if ( latestInstalled ) {
543
544
const latestInstalledVersion = latestInstalled . split ( / \s + / ) [ 1 ] ;
544
545
545
- let bin = await callGHCup ( context , logger , [ 'whereis' , tool , `${ latestInstalledVersion } ` ] , undefined , false ) ;
546
+ const bin = await callGHCup ( context , logger , [ 'whereis' , tool , `${ latestInstalledVersion } ` ] , undefined , false ) ;
546
547
const ver = await callAsync ( `${ bin } ` , [ '--numeric-version' ] , logger , undefined , undefined , false ) ;
547
548
if ( ver ) {
548
549
return ver ;
0 commit comments