Skip to content

Commit bdc6d1b

Browse files
committed
Apply 'npm run tslint-fix'
1 parent c9b422a commit bdc6d1b

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/extension.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22
import * as path from 'path';
33
import {
4-
env,
54
commands,
5+
env,
66
ExtensionContext,
77
OutputChannel,
88
TextDocument,
@@ -23,8 +23,8 @@ import {
2323
import { CommandNames } from './commands/constants';
2424
import { ImportIdentifier } from './commands/importIdentifier';
2525
import { DocsBrowser } from './docsBrowser';
26-
import { MissingToolError, findHaskellLanguageServer, IEnvVars } from './hlsBinaries';
27-
import { expandHomeDir, ExtensionLogger, addPathToProcessPath } from './utils';
26+
import { findHaskellLanguageServer, IEnvVars, MissingToolError } from './hlsBinaries';
27+
import { addPathToProcessPath, expandHomeDir, ExtensionLogger } from './utils';
2828

2929
// The current map of documents & folders to language servers.
3030
// It may be null to indicate that we are in the process of launching a server,

src/hlsBinaries.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import {
1818
} from 'vscode';
1919
import { Logger } from 'vscode-languageclient';
2020
import {
21+
addPathToProcessPath,
2122
executableExists,
2223
httpsGetSilently,
23-
resolvePathPlaceHolders,
2424
IEnvVars,
25-
addPathToProcessPath,
25+
resolvePathPlaceHolders,
2626
resolveServerEnvironmentPATH,
2727
} from './utils';
2828
export { 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;

src/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import * as os from 'os';
88
import { extname } from 'path';
99
import * as url from 'url';
1010
import { promisify } from 'util';
11-
import { workspace, OutputChannel, ProgressLocation, window, WorkspaceFolder } from 'vscode';
11+
import { OutputChannel, ProgressLocation, window, workspace, WorkspaceFolder } from 'vscode';
1212
import { Logger } from 'vscode-languageclient';
1313
import * as which from 'which';
1414
import * as yazul from 'yauzl';

0 commit comments

Comments
 (0)