Skip to content

Commit fd95ed1

Browse files
committed
Fix linting issues
1 parent 09e1104 commit fd95ed1

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

src/Language/PureScript/Ide/Imports/Actions.hs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module Language.PureScript.Ide.Imports.Actions
1+
module Language.PureScript.Ide.Imports.Actions
22
( addImplicitImport
33
, addQualifiedImport
44
, addImportForIdentifier
@@ -188,15 +188,16 @@ addImportForIdentifier fp ident qual filters' = do
188188
Just $ "namespace in (" <> T.intercalate "," (toList dt <&> \t -> "'" <> declarationTypeToText t <> "'") <> ")"
189189
F.Filter _ -> Nothing)
190190
filters)
191-
191+
192192
modules <- getAllModules Nothing
193193

194194
-- Fallback to volatile state if SQLite returns no results (e.g., for Prim modules)
195195
let declarations :: [Match IdeDeclaration] =
196196
if null rows
197197
then
198198
let addPrim = Map.union idePrimDeclarations
199-
in fmap (fmap discardAnn) $ getExactMatches ident filters (addPrim modules)
199+
in fmap discardAnn
200+
<$> getExactMatches ident filters (addPrim modules)
200201
else
201202
rows <&> \(m, bs) -> Match (ModuleName m, discardAnn $ deserialise bs)
202203

@@ -230,7 +231,7 @@ addImportForIdentifier fp ident qual filters' = do
230231
-- worst
231232
Just decl ->
232233
Right <$> addExplicitImport fp decl m1 qual
233-
-- Here we need the user to specify whether they wanted a
234+
-- Here we need the user to specify whether they wanted a
234235
-- dataconstructor or a type
235236
Nothing ->
236237
throwError (GeneralError "Undecidable between type and dataconstructor")

src/Language/PureScript/Ide/Rebuild.hs

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import Language.PureScript.Ide.Types (Ide, IdeConfiguration(..), IdeEnvironment(
2727
import Language.PureScript.Ide.Util (ideReadFile)
2828
import System.Directory (getCurrentDirectory)
2929
import Database.SQLite.Simple qualified as SQLite
30-
import System.FilePath ((</>))
30+
import System.FilePath ((</>), makeRelative)
3131
import Data.Aeson (decode)
3232
import Language.PureScript.Externs (ExternsFile(ExternsFile))
3333
import Data.ByteString qualified as T
@@ -38,7 +38,6 @@ import Unsafe.Coerce (unsafeCoerce)
3838
import Database.SQLite.Simple (Query(fromQuery), ToRow, SQLData (SQLText))
3939
import Data.String (String)
4040
import Codec.Serialise (deserialise)
41-
import System.FilePath (makeRelative)
4241

4342
-- | Given a filepath performs the following steps:
4443
--
@@ -248,34 +247,34 @@ sortExterns'
248247
=> FilePath
249248
-> P.Module
250249
-> m [P.ExternsFile]
251-
sortExterns' _ m = do
250+
sortExterns' _ m = do
252251
let P.Module _ _ _ declarations _ = m
253252
let moduleDependencies = declarations >>= \case
254253
P.ImportDeclaration _ importName _ _ -> [importName]
255254
_ -> []
256255

257256
externs <- runQuery $ unlines [
258257
"with recursive",
259-
"graph(dependency, level) as (",
258+
"graph(dependency, level) as (",
260259
" select module_name , 1 as level",
261-
" from modules where module_name in (" <> Data.Text.intercalate ", " (moduleDependencies <&> \v -> "'" <> runModuleName v <> "'") <> ")",
260+
" from modules where module_name in (" <> Data.Text.intercalate ", " (moduleDependencies <&> \v -> "'" <> runModuleName v <> "'") <> ")",
262261
" union ",
263-
" select d.dependency as dep, graph.level + 1 as level",
264-
" from graph join dependencies d on graph.dependency = d.module_name",
262+
" select d.dependency as dep, graph.level + 1 as level",
263+
" from graph join dependencies d on graph.dependency = d.module_name",
265264
"),",
266-
"topo as (",
267-
" select dependency, max(level) as level",
268-
" from graph group by dependency",
269-
") ",
265+
"topo as (",
266+
" select dependency, max(level) as level",
267+
" from graph group by dependency",
268+
") ",
270269
"select extern",
271270
"from topo join modules on topo.dependency = modules.module_name order by level desc;"
272271
]
273272

274-
pure $ (externs >>= identity) <&> deserialise
273+
pure $ (externs >>= identity) <&> deserialise
275274

276-
-- !r <- SQLite.withConnection (outputDir </> "cache.db") \conn ->
275+
-- !r <- SQLite.withConnection (outputDir </> "cache.db") \conn ->
277276
-- SQLite.query conn query (SQLite.Only $ "[" <> Data.Text.intercalate ", " (dependencies <&> \v -> "\"" <> runModuleName v <> "\"") <> "]")
278-
-- <&> \r -> (r >>= identity) <&> deserialise
277+
-- <&> \r -> (r >>= identity) <&> deserialise
279278
-- pure r
280279

281280
-- | Removes a modules export list.

0 commit comments

Comments
 (0)