Skip to content

Commit a74e092

Browse files
committed
Let the linter work
1 parent a5824a2 commit a74e092

File tree

3 files changed

+95
-100
lines changed

3 files changed

+95
-100
lines changed

src/extension.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,9 @@ import {
2222
import { CommandNames } from './commands/constants';
2323
import { ImportIdentifier } from './commands/importIdentifier';
2424
import { DocsBrowser } from './docsBrowser';
25-
import { IEnvVars, addPathToProcessPath, downloadHaskellLanguageServer, downloadGHCup, validateHLSToolchain } from './hlsBinaries';
25+
import { addPathToProcessPath, downloadGHCup, downloadHaskellLanguageServer, IEnvVars, validateHLSToolchain } from './hlsBinaries';
2626
import { directoryExists, executableExists, expandHomeDir, ExtensionLogger, resolvePathPlaceHolders } from './utils';
2727

28-
2928
// The current map of documents & folders to language servers.
3029
// It may be null to indicate that we are in the process of launching a server,
3130
// in which case don't try to launch another one for that uri
@@ -189,15 +188,15 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold
189188
});
190189

191190
let serverExecutable;
192-
let addInternalServerPath: string | undefined = undefined; // if we download HLS, add that bin dir to PATH
191+
let addInternalServerPath: string | undefined; // if we download HLS, add that bin dir to PATH
193192
try {
194193
// Try and find local installations first
195194
serverExecutable = findManualExecutable(logger, uri, folder) ?? findLocalServer(context, logger, uri, folder);
196195
if (serverExecutable === null) {
197196
// If not, then try to download haskell-language-server binaries if it's selected
198197
await downloadGHCup(context, logger);
199198
serverExecutable = await downloadHaskellLanguageServer(context, logger, currentWorkingDir);
200-
await validateHLSToolchain(serverExecutable, currentWorkingDir, logger)
199+
await validateHLSToolchain(serverExecutable, currentWorkingDir, logger);
201200
addInternalServerPath = path.dirname(serverExecutable);
202201
if (!serverExecutable) {
203202
return;
@@ -238,7 +237,7 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold
238237
logger.info(cwdMsg);
239238

240239
let serverEnvironment: IEnvVars = workspace.getConfiguration('haskell', uri).serverEnvironment;
241-
if (addInternalServerPath != undefined) {
240+
if (addInternalServerPath !== undefined) {
242241
const newPath = addPathToProcessPath(addInternalServerPath);
243242
serverEnvironment = {
244243
PATH: newPath,

0 commit comments

Comments
 (0)