purescript 0.15.8 → 0.15.9

raw patch · 296 files changed

+2215/−2191 lines, 296 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• CONTRIBUTORS.md +1/−0
• app/Command/Bundle.hs +3/−3
• app/Command/Compile.hs +21/−21
• app/Command/Docs.hs +18/−18
• app/Command/Docs/Html.hs +16/−16
• app/Command/Docs/Markdown.hs +6/−6
• app/Command/Graph.hs +14/−14
• app/Command/Hierarchy.hs +17/−17
• app/Command/Ide.hs +21/−21
• app/Command/Publish.hs +9/−9
• app/Command/REPL.hs +20/−20
• app/Main.hs +15/−15
• app/Version.hs +1/−1
• purescript.cabal +21/−22
• src/Control/Monad/Logger.hs +3/−3
• src/Control/Monad/Supply.hs +5/−5
• src/Control/Monad/Supply/Class.hs +4/−4
• src/Language/PureScript.hs +1/−1
• src/Language/PureScript/AST/Binders.hs +5/−5
• src/Language/PureScript/AST/Declarations.hs +17/−17
• src/Language/PureScript/AST/Declarations/ChainId.hs +1/−1
• src/Language/PureScript/AST/Exported.hs +4/−4
• src/Language/PureScript/AST/Operators.hs +2/−2
• src/Language/PureScript/AST/SourcePos.hs +3/−3
• src/Language/PureScript/AST/Traversals.hs +11/−11
• src/Language/PureScript/AST/Utils.hs +3/−3
• src/Language/PureScript/Bundle.hs +6/−6
• src/Language/PureScript/CST.hs +3/−3
• src/Language/PureScript/CST/Convert.hs +9/−9
• src/Language/PureScript/CST/Errors.hs +4/−4
• src/Language/PureScript/CST/Flatten.hs +1/−1
• src/Language/PureScript/CST/Layout.hs +2/−2
• src/Language/PureScript/CST/Lexer.hs +10/−10
• src/Language/PureScript/CST/Monad.hs +5/−5
• src/Language/PureScript/CST/Positions.hs +2/−2
• src/Language/PureScript/CST/Print.hs +3/−3
• src/Language/PureScript/CST/Traversals.hs +1/−1
• src/Language/PureScript/CST/Traversals/Type.hs +2/−2
• src/Language/PureScript/CST/Types.hs +2/−2
• src/Language/PureScript/CST/Utils.hs +8/−8
• src/Language/PureScript/CodeGen/JS.hs +32/−34
• src/Language/PureScript/CodeGen/JS/Common.hs +4/−4
• src/Language/PureScript/CodeGen/JS/Printer.hs +10/−10
• src/Language/PureScript/Comments.hs +1/−1
• src/Language/PureScript/Constants/Libs.hs +2/−2
• src/Language/PureScript/Constants/Prim.hs +2/−2
• src/Language/PureScript/Constants/TH.hs +2/−2
• src/Language/PureScript/CoreFn/Ann.hs +4/−4
• src/Language/PureScript/CoreFn/Binders.hs +2/−2
• src/Language/PureScript/CoreFn/CSE.hs +10/−10
• src/Language/PureScript/CoreFn/Desugar.hs +26/−26
• src/Language/PureScript/CoreFn/Expr.hs +3/−3
• src/Language/PureScript/CoreFn/FromJSON.hs +15/−15
• src/Language/PureScript/CoreFn/Laziness.hs +10/−10
• src/Language/PureScript/CoreFn/Meta.hs +1/−1
• src/Language/PureScript/CoreFn/Module.hs +4/−4
• src/Language/PureScript/CoreFn/Optimizer.hs +11/−11
• src/Language/PureScript/CoreFn/ToJSON.hs +16/−16
• src/Language/PureScript/CoreFn/Traversals.hs +3/−3
• src/Language/PureScript/CoreImp/AST.hs +2/−2
• src/Language/PureScript/CoreImp/Module.hs +3/−3
• src/Language/PureScript/CoreImp/Optimizer.hs +7/−7
• src/Language/PureScript/CoreImp/Optimizer/Blocks.hs +1/−1
• src/Language/PureScript/CoreImp/Optimizer/Common.hs +2/−2
• src/Language/PureScript/CoreImp/Optimizer/Inliner.hs +5/−5
• src/Language/PureScript/CoreImp/Optimizer/MagicDo.hs +3/−3
• src/Language/PureScript/CoreImp/Optimizer/TCO.hs +4/−4
• src/Language/PureScript/CoreImp/Optimizer/Unused.hs +4/−4
• src/Language/PureScript/Docs/AsHtml.hs +8/−8
• src/Language/PureScript/Docs/AsMarkdown.hs +5/−5
• src/Language/PureScript/Docs/Collect.hs +15/−15
• src/Language/PureScript/Docs/Convert.hs +15/−19
• src/Language/PureScript/Docs/Convert/ReExports.hs +11/−11
• src/Language/PureScript/Docs/Convert/Single.hs +8/−8
• src/Language/PureScript/Docs/Prim.hs +7/−7
• src/Language/PureScript/Docs/Render.hs +7/−7
• src/Language/PureScript/Docs/RenderedCode/RenderType.hs +8/−8
• src/Language/PureScript/Docs/RenderedCode/Types.hs +5/−5
• src/Language/PureScript/Docs/Tags.hs +5/−5
• src/Language/PureScript/Docs/Types.hs +16/−16
• src/Language/PureScript/Docs/Utils/MonoidExtras.hs +1/−1
• src/Language/PureScript/Environment.hs +14/−14
• src/Language/PureScript/Errors.hs +53/−53
• src/Language/PureScript/Errors/JSON.hs +3/−3
• src/Language/PureScript/Externs.hs +9/−9
• src/Language/PureScript/Graph.hs +18/−18
• src/Language/PureScript/Hierarchy.hs +5/−5
• src/Language/PureScript/Ide.hs +24/−24
• src/Language/PureScript/Ide/CaseSplit.hs +10/−10
• src/Language/PureScript/Ide/Command.hs +11/−11
• src/Language/PureScript/Ide/Completion.hs +11/−11
• src/Language/PureScript/Ide/Error.hs +8/−8
• src/Language/PureScript/Ide/Externs.hs +11/−11
• src/Language/PureScript/Ide/Filter.hs +13/−13
• src/Language/PureScript/Ide/Filter/Declaration.hs +3/−3
• src/Language/PureScript/Ide/Filter/Imports.hs +4/−4
• src/Language/PureScript/Ide/Imports.hs +9/−9
• src/Language/PureScript/Ide/Imports/Actions.hs +17/−17
• src/Language/PureScript/Ide/Logging.hs +6/−6
• src/Language/PureScript/Ide/Matcher.hs +9/−9
• src/Language/PureScript/Ide/Prim.hs +7/−7
• src/Language/PureScript/Ide/Rebuild.hs +18/−18
• src/Language/PureScript/Ide/Reexports.hs +6/−6
• src/Language/PureScript/Ide/SourceFile.hs +8/−8
• src/Language/PureScript/Ide/State.hs +18/−18
• src/Language/PureScript/Ide/Types.hs +12/−12
• src/Language/PureScript/Ide/Usage.hs +8/−8
• src/Language/PureScript/Ide/Util.hs +12/−12
• src/Language/PureScript/Interactive.hs +28/−28
• src/Language/PureScript/Interactive/Completion.hs +11/−11
• src/Language/PureScript/Interactive/Directive.hs +1/−1
• src/Language/PureScript/Interactive/Message.hs +6/−6
• src/Language/PureScript/Interactive/Module.hs +7/−7
• src/Language/PureScript/Interactive/Parser.hs +12/−12
• src/Language/PureScript/Interactive/Printer.hs +8/−8
• src/Language/PureScript/Interactive/Types.hs +8/−8
• src/Language/PureScript/Label.hs +1/−1
• src/Language/PureScript/Linter.hs +9/−7
• src/Language/PureScript/Linter/Exhaustive.hs +21/−44
• src/Language/PureScript/Linter/Imports.hs +10/−10
• src/Language/PureScript/Linter/Wildcards.hs +2/−2
• src/Language/PureScript/Make.hs +40/−40
• src/Language/PureScript/Make/Actions.hs +46/−46
• src/Language/PureScript/Make/BuildPlan.hs +21/−21
• src/Language/PureScript/Make/Cache.hs +5/−5
• src/Language/PureScript/Make/Monad.hs +27/−27
• src/Language/PureScript/ModuleDependencies.hs +9/−9
• src/Language/PureScript/Names.hs +5/−5
• src/Language/PureScript/Options.hs +2/−2
• src/Language/PureScript/PSString.hs +6/−6
• src/Language/PureScript/Pretty/Common.hs +3/−7
• src/Language/PureScript/Pretty/Types.hs +7/−10
• src/Language/PureScript/Pretty/Values.hs +8/−8
• src/Language/PureScript/Publish.hs +12/−12
• src/Language/PureScript/Publish/BoxesHelpers.hs +2/−2
• src/Language/PureScript/Publish/ErrorsWarnings.hs +9/−9
• src/Language/PureScript/Publish/Registry/Compat.hs +2/−2
• src/Language/PureScript/Publish/Utils.hs +1/−1
• src/Language/PureScript/Renamer.hs +7/−7
• src/Language/PureScript/Roles.hs +2/−2
• src/Language/PureScript/Sugar.hs +5/−5
• src/Language/PureScript/Sugar/AdoNotation.hs +9/−9
• src/Language/PureScript/Sugar/BindingGroups.hs +9/−11
• src/Language/PureScript/Sugar/CaseDeclarations.hs +5/−5
• src/Language/PureScript/Sugar/DoNotation.hs +11/−11
• src/Language/PureScript/Sugar/LetPattern.hs +5/−5
• src/Language/PureScript/Sugar/Names.hs +15/−15
• src/Language/PureScript/Sugar/Names/Common.hs +3/−3
• src/Language/PureScript/Sugar/Names/Env.hs +8/−8
• src/Language/PureScript/Sugar/Names/Exports.hs +6/−6
• src/Language/PureScript/Sugar/Names/Imports.hs +8/−8
• src/Language/PureScript/Sugar/ObjectWildcards.hs +12/−12
• src/Language/PureScript/Sugar/Operators.hs +11/−11
• src/Language/PureScript/Sugar/Operators/Binders.hs +5/−5
• src/Language/PureScript/Sugar/Operators/Common.hs +12/−12
• src/Language/PureScript/Sugar/Operators/Expr.hs +8/−8
• src/Language/PureScript/Sugar/Operators/Types.hs +6/−6
• src/Language/PureScript/Sugar/TypeClasses.hs +24/−25
• src/Language/PureScript/Sugar/TypeClasses/Deriving.hs +15/−15
• src/Language/PureScript/Sugar/TypeDeclarations.hs +4/−4
• src/Language/PureScript/TypeChecker.hs +15/−16
• src/Language/PureScript/TypeChecker/Deriving.hs +21/−21
• src/Language/PureScript/TypeChecker/Entailment.hs +30/−31
• src/Language/PureScript/TypeChecker/Entailment/Coercible.hs +14/−14
• src/Language/PureScript/TypeChecker/Entailment/IntCompare.hs +5/−5
• src/Language/PureScript/TypeChecker/Kinds.hs +12/−12
• src/Language/PureScript/TypeChecker/Monad.hs +12/−12
• src/Language/PureScript/TypeChecker/Roles.hs +7/−7
• src/Language/PureScript/TypeChecker/Skolems.hs +5/−5
• src/Language/PureScript/TypeChecker/Subsumption.hs +8/−8
• src/Language/PureScript/TypeChecker/Synonyms.hs +11/−11
• src/Language/PureScript/TypeChecker/TypeSearch.hs +17/−17
• src/Language/PureScript/TypeChecker/Types.hs +116/−56
• src/Language/PureScript/TypeChecker/Unify.hs +9/−9
• src/Language/PureScript/TypeClassDictionaries.hs +2/−2
• src/Language/PureScript/Types.hs +7/−7
• src/System/IO/UTF8.hs +7/−7
• tests/Language/PureScript/Ide/CompletionSpec.hs +5/−5
• tests/Language/PureScript/Ide/FilterSpec.hs +10/−10
• tests/Language/PureScript/Ide/ImportsSpec.hs +13/−13
• tests/Language/PureScript/Ide/MatcherSpec.hs +6/−6
• tests/Language/PureScript/Ide/RebuildSpec.hs +12/−12
• tests/Language/PureScript/Ide/ReexportsSpec.hs +7/−7
• tests/Language/PureScript/Ide/SourceFileSpec.hs +7/−7
• tests/Language/PureScript/Ide/StateSpec.hs +8/−8
• tests/Language/PureScript/Ide/Test.hs +13/−13
• tests/Language/PureScript/Ide/UsageSpec.hs +9/−9
• tests/Main.hs +15/−15
• tests/TestAst.hs +7/−7
• tests/TestCompiler.hs +11/−11
• tests/TestCoreFn.hs +22/−22
• tests/TestCst.hs +7/−7
• tests/TestDocs.hs +9/−9
• tests/TestGraph.hs +3/−3
• tests/TestHierarchy.hs +3/−3
• tests/TestIde.hs +5/−5
• tests/TestMake.hs +11/−11
• tests/TestPrimDocs.hs +5/−5
• tests/TestPscPublish.hs +8/−8
• tests/TestPsci.hs +1/−1
• tests/TestPsci/CommandTest.hs +3/−3
• tests/TestPsci/CompletionTest.hs +9/−9
• tests/TestPsci/EvalTest.hs +11/−11
• tests/TestPsci/TestEnv.hs +15/−15
• tests/TestSourceMaps.hs +5/−5
• tests/TestUtils.hs +19/−19
• tests/purs/docs/output/Ado/docs.json +1/−1
• tests/purs/docs/output/ChildDeclOrder/docs.json +1/−1
• tests/purs/docs/output/Clash1a/docs.json +1/−1
• tests/purs/docs/output/Clash2a/docs.json +1/−1
• tests/purs/docs/output/ConstrainedArgument/docs.json +1/−1
• tests/purs/docs/output/DeclOrder/docs.json +1/−1
• tests/purs/docs/output/DeclOrderNoExportList/docs.json +1/−1
• tests/purs/docs/output/Desugar/docs.json +1/−1
• tests/purs/docs/output/DocComments/docs.json +1/−1
• tests/purs/docs/output/DocCommentsClassMethod/docs.json +1/−1
• tests/purs/docs/output/DocCommentsDataConstructor/docs.json +1/−1
• tests/purs/docs/output/DocCommentsMerge/docs.json +1/−1
• tests/purs/docs/output/DuplicateNames/docs.json +1/−1
• tests/purs/docs/output/Example2/docs.json +1/−1
• tests/purs/docs/output/ExplicitExport/docs.json +1/−1
• tests/purs/docs/output/ExplicitTypeSignatures/docs.json +1/−1
• tests/purs/docs/output/ImportedTwiceB/docs.json +1/−1
• tests/purs/docs/output/KindSignatureDocs/docs.json +1/−1
• tests/purs/docs/output/MultiVirtual1/docs.json +1/−1
• tests/purs/docs/output/MultiVirtual2/docs.json +1/−1
• tests/purs/docs/output/MultiVirtual3/docs.json +1/−1
• tests/purs/docs/output/NewOperators2/docs.json +1/−1
• tests/purs/docs/output/OperatorSection/docs.json +1/−1
• tests/purs/docs/output/Prim.RowList/docs.json +1/−1
• tests/purs/docs/output/Prim.TypeError/docs.json +1/−1
• tests/purs/docs/output/PrimSubmodules/docs.json +1/−1
• tests/purs/docs/output/RoleAnnotationDocs/docs.json +1/−1
• tests/purs/docs/output/SomeTypeClass/docs.json +1/−1
• tests/purs/docs/output/Transitive3/docs.json +1/−1
• tests/purs/docs/output/TypeClassWithFunDeps/docs.json +1/−1
• tests/purs/docs/output/TypeLevelString/docs.json +1/−1
• tests/purs/docs/output/TypeOpAliases/docs.json +1/−1
• tests/purs/docs/output/TypeSynonym/docs.json +1/−1
• tests/purs/docs/output/TypeSynonymInstance/docs.json +1/−1
• tests/purs/docs/output/UTF8/docs.json +1/−1
• tests/purs/docs/output/cache-db.json +1/−1
• tests/purs/failing/4466.out +24/−0
• tests/purs/failing/4466.purs +16/−0
• tests/purs/failing/output/cache-db.json +1/−0
• tests/purs/failing/output/package.json +1/−0
• tests/purs/passing/4376.purs +29/−0
• tests/purs/publish/basic-example/output/Control.Applicative/docs.json +1/−1
• tests/purs/publish/basic-example/output/Control.Apply/docs.json +1/−1
• tests/purs/publish/basic-example/output/Control.Bind/docs.json +1/−1
• tests/purs/publish/basic-example/output/Control.Category/docs.json +1/−1
• tests/purs/publish/basic-example/output/Control.Monad/docs.json +1/−1
• tests/purs/publish/basic-example/output/Control.Semigroupoid/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Bounded.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.DivisionRing/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Eq.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Eq/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.EuclideanRing/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Function/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Functor/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Generic.Rep/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.HeytingAlgebra.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Monoid.Endo/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Monoid.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Monoid/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.NaturalTransformation/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Newtype/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Ord.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Ord/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Reflectable/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Ring.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Ring/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Semigroup.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Semiring.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Show.Generic/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Symbol/docs.json +1/−1
• tests/purs/publish/basic-example/output/Data.Void/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect.Class.Console/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect.Class/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect.Console/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect.Uncurried/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect.Unsafe/docs.json +1/−1
• tests/purs/publish/basic-example/output/Effect/docs.json +1/−1
• tests/purs/publish/basic-example/output/Main/docs.json +1/−1
• tests/purs/publish/basic-example/output/Prim.RowList/docs.json +1/−1
• tests/purs/publish/basic-example/output/Prim.TypeError/docs.json +1/−1
• tests/purs/publish/basic-example/output/Record.Unsafe/docs.json +1/−1
• tests/purs/publish/basic-example/output/Safe.Coerce/docs.json +1/−1
• tests/purs/publish/basic-example/output/Type.Proxy/docs.json +1/−1
• tests/purs/publish/basic-example/output/Unsafe.Coerce/docs.json +1/−1
• tests/purs/publish/basic-example/output/cache-db.json +1/−1
• tests/purs/warning/4376.out +16/−0
• tests/purs/warning/4376.purs +6/−0
• tests/purs/warning/4414.out +0/−0
• tests/purs/warning/4414.purs +21/−0
• tests/support/package-lock.json +18/−129

@@ -113,6 +113,7 @@ | [@noraesae](https://github.com/noraesae) | Hyunje Jun | [MIT license] | | [@nullobject](https://github.com/nullobject) | Josh Bassett | [MIT license] | | [@osa1](https://github.com/osa1) | Ömer Sinan Ağacan | [MIT license] |+| [@ozkutuk](https://github.com/ozkutuk) | Berk Özkütük | [MIT license] | | [@paf31](https://github.com/paf31) | Phil Freeman | [MIT license] | | [@parsonsmatt](https://github.com/parsonsmatt) | Matt Parsons | [MIT license] | | [@passy](https://github.com/passy) | Pascal Hartig | [MIT license] |

@@ -3,9 +3,9 @@  import Prelude -import           System.Exit (exitFailure)-import           System.IO (stderr, hPutStrLn)-import qualified Options.Applicative as Opts+import System.Exit (exitFailure)+import System.IO (stderr, hPutStrLn)+import Options.Applicative qualified as Opts  app :: IO () app = do

@@ -2,27 +2,27 @@  import Prelude -import           Control.Applicative-import           Control.Monad-import qualified Data.Aeson as A-import           Data.Bool (bool)-import qualified Data.ByteString.Lazy.UTF8 as LBU8-import           Data.List (intercalate)-import qualified Data.Map as M-import qualified Data.Set as S-import qualified Data.Text as T-import           Data.Traversable (for)-import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Errors.JSON-import           Language.PureScript.Make-import qualified Options.Applicative as Opts-import qualified System.Console.ANSI as ANSI-import           System.Exit (exitSuccess, exitFailure)-import           System.Directory (getCurrentDirectory)-import           System.FilePath.Glob (glob)-import           System.IO (hPutStr, hPutStrLn, stderr, stdout)-import           System.IO.UTF8 (readUTF8FilesT)+import Control.Applicative (Alternative(..))+import Control.Monad (when)+import Data.Aeson qualified as A+import Data.Bool (bool)+import Data.ByteString.Lazy.UTF8 qualified as LBU8+import Data.List (intercalate)+import Data.Map qualified as M+import Data.Set qualified as S+import Data.Text qualified as T+import Data.Traversable (for)+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Errors.JSON (JSONResult(..), toJSONErrors)+import Language.PureScript.Make (buildMakeActions, inferForeignModules, runMake)+import Options.Applicative qualified as Opts+import System.Console.ANSI qualified as ANSI+import System.Exit (exitSuccess, exitFailure)+import System.Directory (getCurrentDirectory)+import System.FilePath.Glob (glob)+import System.IO (hPutStr, hPutStrLn, stderr, stdout)+import System.IO.UTF8 (readUTF8FilesT)  data PSCMakeOptions = PSCMakeOptions   { pscmInput        :: [FilePath]

@@ -3,24 +3,24 @@  import Prelude -import           Command.Docs.Html-import           Command.Docs.Markdown-import           Control.Applicative-import           Control.Monad.Writer-import           Control.Monad.Trans.Except (runExceptT)-import           Data.Maybe (fromMaybe)-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.Docs as D-import           Language.PureScript.Docs.Tags (dumpCtags, dumpEtags)-import qualified Options.Applicative as Opts-import qualified Text.PrettyPrint.ANSI.Leijen as PP-import           System.Directory (getCurrentDirectory, createDirectoryIfMissing, removeFile)-import           System.Exit (exitFailure)-import           System.FilePath ((</>))-import           System.FilePath.Glob (compile, glob, globDir1)-import           System.IO (hPutStrLn, stderr)-import           System.IO.UTF8 (writeUTF8FileT)+import Command.Docs.Html (asHtml, writeHtmlModules)+import Command.Docs.Markdown (asMarkdown, writeMarkdownModules)+import Control.Applicative (Alternative(..), optional)+import Control.Monad.Writer (when)+import Control.Monad.Trans.Except (runExceptT)+import Data.Maybe (fromMaybe)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Docs qualified as D+import Language.PureScript.Docs.Tags (dumpCtags, dumpEtags)+import Options.Applicative qualified as Opts+import Text.PrettyPrint.ANSI.Leijen qualified as PP+import System.Directory (getCurrentDirectory, createDirectoryIfMissing, removeFile)+import System.Exit (exitFailure)+import System.FilePath ((</>))+import System.FilePath.Glob (compile, glob, globDir1)+import System.IO (hPutStrLn, stderr)+import System.IO.UTF8 (writeUTF8FileT)  -- | Available output formats data Format

@@ -7,22 +7,22 @@  import Prelude -import           Control.Applicative-import           Control.Arrow ((&&&))-import           Control.Monad.Writer-import           Data.List (sort)-import           Data.Text (Text)-import           Data.Text.Lazy (toStrict)-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.Docs as D-import qualified Language.PureScript.Docs.AsHtml as D-import           Text.Blaze.Html5 (Html, (!), toMarkup)-import qualified Text.Blaze.Html5 as H-import qualified Text.Blaze.Html5.Attributes as A-import qualified Text.Blaze.Html.Renderer.Text as Blaze-import           System.IO.UTF8 (writeUTF8FileT)-import           Version (versionString)+import Control.Applicative (Alternative(..))+import Control.Arrow ((&&&))+import Control.Monad.Writer (guard)+import Data.List (sort)+import Data.Text (Text)+import Data.Text.Lazy (toStrict)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Docs qualified as D+import Language.PureScript.Docs.AsHtml qualified as D+import Text.Blaze.Html5 (Html, (!), toMarkup)+import Text.Blaze.Html5 qualified as H+import Text.Blaze.Html5.Attributes qualified as A+import Text.Blaze.Html.Renderer.Text qualified as Blaze+import System.IO.UTF8 (writeUTF8FileT)+import Version (versionString)  writeHtmlModules :: FilePath -> [(P.ModuleName, D.HtmlOutputModule Html)] -> IO () writeHtmlModules outputDir modules = do

@@ -5,12 +5,12 @@  import Prelude -import           Data.Text (Text)-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.Docs as D-import qualified Language.PureScript.Docs.AsMarkdown as D-import           System.IO.UTF8 (writeUTF8FileT)+import Data.Text (Text)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Docs qualified as D+import Language.PureScript.Docs.AsMarkdown qualified as D+import System.IO.UTF8 (writeUTF8FileT)  asMarkdown :: D.Module -> (P.ModuleName, Text) asMarkdown m = (D.modName m, D.runDocs . D.moduleAsMarkdown $ m)

@@ -2,20 +2,20 @@  import Prelude -import           Control.Applicative (many)-import           Control.Monad (unless, when)-import qualified Data.Aeson as Json-import           Data.Bool (bool)-import qualified Data.ByteString.Lazy as LB-import qualified Data.ByteString.Lazy.UTF8 as LBU8-import qualified Language.PureScript as P-import           Language.PureScript.Errors.JSON-import qualified Options.Applicative as Opts-import qualified System.Console.ANSI as ANSI-import           System.Exit (exitFailure)-import           System.Directory (getCurrentDirectory)-import           System.FilePath.Glob (glob)-import           System.IO (hPutStr, hPutStrLn, stderr)+import Control.Applicative (many)+import Control.Monad (unless, when)+import Data.Aeson qualified as Json+import Data.Bool (bool)+import Data.ByteString.Lazy qualified as LB+import Data.ByteString.Lazy.UTF8 qualified as LBU8+import Language.PureScript qualified as P+import Language.PureScript.Errors.JSON (JSONResult(..), toJSONErrors)+import Options.Applicative qualified as Opts+import System.Console.ANSI qualified as ANSI+import System.Exit (exitFailure)+import System.Directory (getCurrentDirectory)+import System.FilePath.Glob (glob)+import System.IO (hPutStr, hPutStrLn, stderr)  data GraphOptions = GraphOptions   { graphInput      :: [FilePath]

@@ -15,24 +15,24 @@  module Command.Hierarchy (command) where -import           Prelude-import           Protolude (catMaybes)+import Prelude+import Protolude (catMaybes) -import           Control.Applicative (optional)-import           Data.Foldable (for_)-import qualified Data.Text as T-import qualified Data.Text.IO as T-import           Options.Applicative (Parser)-import qualified Options.Applicative as Opts-import           System.Directory (createDirectoryIfMissing)-import           System.FilePath ((</>))-import           System.FilePath.Glob (glob)-import           System.Exit (exitFailure, exitSuccess)-import           System.IO (hPutStr, stderr)-import           System.IO.UTF8 (readUTF8FilesT)-import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Hierarchy (Graph(..), _unDigraph, _unGraphName, typeClasses)+import Control.Applicative (optional)+import Data.Foldable (for_)+import Data.Text qualified as T+import Data.Text.IO qualified as T+import Options.Applicative (Parser)+import Options.Applicative qualified as Opts+import System.Directory (createDirectoryIfMissing)+import System.FilePath ((</>))+import System.FilePath.Glob (glob)+import System.Exit (exitFailure, exitSuccess)+import System.IO (hPutStr, stderr)+import System.IO.UTF8 (readUTF8FilesT)+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Hierarchy (Graph(..), _unDigraph, _unGraphName, typeClasses)  data HierarchyOptions = HierarchyOptions   { _hierarchyInput   :: FilePath

@@ -17,28 +17,28 @@  module Command.Ide (command) where -import           Protolude+import Protolude -import qualified Data.Aeson as Aeson-import           Control.Concurrent.STM-import           "monad-logger" Control.Monad.Logger-import           Data.IORef-import qualified Data.Text.IO                      as T-import qualified Data.ByteString.Char8             as BS8-import qualified Data.ByteString.Lazy.Char8        as BSL8-import           GHC.IO.Exception                  (IOErrorType(..), IOException(..))-import           Language.PureScript.Ide-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.Util-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.State (updateCacheTimestamp)-import           Language.PureScript.Ide.Types-import qualified Network.Socket                    as Network-import qualified Options.Applicative               as Opts-import           System.Directory-import           System.FilePath-import           System.IO                         hiding (putStrLn, print)-import           System.IO.Error                   (isEOFError)+import Data.Aeson qualified as Aeson+import Control.Concurrent.STM (newTVarIO)+import "monad-logger" Control.Monad.Logger (MonadLogger, logDebug, logError, logInfo)+import Data.IORef (newIORef)+import Data.Text.IO qualified as T+import Data.ByteString.Char8 qualified as BS8+import Data.ByteString.Lazy.Char8 qualified as BSL8+import GHC.IO.Exception (IOErrorType(..), IOException(..))+import Language.PureScript.Ide (handleCommand)+import Language.PureScript.Ide.Command (Command(..), commandName)+import Language.PureScript.Ide.Util (decodeT, displayTimeSpec, encodeT, logPerf, runLogger)+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.State (updateCacheTimestamp)+import Language.PureScript.Ide.Types (Ide, IdeConfiguration(..), IdeEnvironment(..), IdeLogLevel(..), emptyIdeState)+import Network.Socket qualified as Network+import Options.Applicative qualified as Opts+import System.Directory (doesDirectoryExist, getCurrentDirectory, setCurrentDirectory)+import System.FilePath ((</>))+import System.IO (BufferMode(..), hClose, hFlush, hSetBuffering, hSetEncoding, utf8)+import System.IO.Error (isEOFError)  listenOnLocalhost :: Network.PortNumber -> IO Network.Socket listenOnLocalhost port = do

@@ -2,15 +2,15 @@  import Prelude -import           Control.Monad.IO.Class (liftIO)-import qualified Data.Aeson as A-import qualified Data.ByteString.Lazy.Char8 as BL-import           Data.Time.Clock (getCurrentTime)-import           Data.Version (Version(..))-import           Language.PureScript.Publish-import           Language.PureScript.Publish.ErrorsWarnings-import           Options.Applicative (Parser)-import qualified Options.Applicative as Opts+import Control.Monad.IO.Class (liftIO)+import Data.Aeson qualified as A+import Data.ByteString.Lazy.Char8 qualified as BL+import Data.Time.Clock (getCurrentTime)+import Data.Version (Version(..))+import Language.PureScript.Publish (PublishOptions(..), defaultPublishOptions, unsafePreparePackage, warn)+import Language.PureScript.Publish.ErrorsWarnings (PackageWarning(..))+import Options.Applicative (Parser)+import Options.Applicative qualified as Opts  data PublishOptionsCLI = PublishOptionsCLI   { cliManifestPath :: FilePath

@@ -3,26 +3,26 @@  module Command.REPL (command) where -import           Prelude-import           Control.Applicative (many, (<|>))-import           Control.Monad-import           Control.Monad.Catch (MonadMask)-import           Control.Monad.IO.Class (liftIO, MonadIO)-import           Control.Monad.Trans.Class-import           Control.Monad.Trans.Except (ExceptT(..), runExceptT)-import           Control.Monad.Trans.State.Strict (StateT, evalStateT)-import           Control.Monad.Trans.Reader (ReaderT, runReaderT)-import           Data.Foldable (for_)-import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Interactive-import qualified Options.Applicative as Opts-import           System.Console.Haskeline-import           System.IO.UTF8 (readUTF8File)-import           System.Exit-import           System.Directory (doesFileExist, getCurrentDirectory)-import           System.FilePath ((</>))-import qualified System.FilePath.Glob as Glob+import Prelude+import Control.Applicative (many, (<|>))+import Control.Monad (unless, when)+import Control.Monad.Catch (MonadMask)+import Control.Monad.IO.Class (liftIO, MonadIO)+import Control.Monad.Trans.Class (MonadTrans(..))+import Control.Monad.Trans.Except (ExceptT(..), runExceptT)+import Control.Monad.Trans.State.Strict (StateT, evalStateT)+import Control.Monad.Trans.Reader (ReaderT, runReaderT)+import Data.Foldable (for_)+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Interactive+import Options.Applicative qualified as Opts+import System.Console.Haskeline (InputT, Settings(..), defaultSettings, getInputLine, handleInterrupt, outputStrLn, runInputT, setComplete, withInterrupt)+import System.IO.UTF8 (readUTF8File)+import System.Exit (ExitCode(..), exitFailure)+import System.Directory (doesFileExist, getCurrentDirectory)+import System.FilePath ((</>))+import System.FilePath.Glob qualified as Glob import System.IO (hPutStrLn, stderr)  -- | Command line options

@@ -2,21 +2,21 @@  import Prelude -import qualified Command.Bundle as Bundle-import qualified Command.Compile as Compile-import qualified Command.Docs as Docs-import qualified Command.Graph as Graph-import qualified Command.Hierarchy as Hierarchy-import qualified Command.Ide as Ide-import qualified Command.Publish as Publish-import qualified Command.REPL as REPL-import           Control.Monad (join)-import           Data.Foldable (fold)-import qualified Options.Applicative as Opts-import           System.Environment (getArgs)-import qualified System.IO as IO-import qualified Text.PrettyPrint.ANSI.Leijen as Doc-import           Version (versionString)+import Command.Bundle qualified as Bundle+import Command.Compile qualified as Compile+import Command.Docs qualified as Docs+import Command.Graph qualified as Graph+import Command.Hierarchy qualified as Hierarchy+import Command.Ide qualified as Ide+import Command.Publish qualified as Publish+import Command.REPL qualified as REPL+import Control.Monad (join)+import Data.Foldable (fold)+import Options.Applicative qualified as Opts+import System.Environment (getArgs)+import System.IO qualified as IO+import Text.PrettyPrint.ANSI.Leijen qualified as Doc+import Version (versionString)   main :: IO ()

@@ -9,7 +9,7 @@ import Paths_purescript as Paths  #ifndef RELEASE-import qualified Development.GitRev as GitRev+import Development.GitRev qualified as GitRev #endif  -- Unfortunately, Cabal doesn't support prerelease identifiers on versions. To

@@ -1,6 +1,6 @@ cabal-version:      2.4 name:               purescript-version:            0.15.8+version:            0.15.9 license:            BSD-3-Clause license-file:       LICENSE copyright:@@ -246,11 +246,11 @@         BangPatterns ConstraintKinds DataKinds DefaultSignatures         DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric         DerivingStrategies DerivingVia EmptyDataDecls FlexibleContexts-        FlexibleInstances GeneralizedNewtypeDeriving KindSignatures-        LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude-        PatternGuards PatternSynonyms RankNTypes RecordWildCards-        OverloadedRecordDot OverloadedStrings ScopedTypeVariables-        TupleSections TypeFamilies ViewPatterns+        FlexibleInstances GeneralizedNewtypeDeriving ImportQualifiedPost+        KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns+        NoImplicitPrelude PatternGuards PatternSynonyms RankNTypes+        RecordWildCards OverloadedRecordDot OverloadedStrings+        ScopedTypeVariables TupleSections TypeFamilies ViewPatterns      ghc-options:         -Weverything -Wno-missing-exported-signatures@@ -260,7 +260,7 @@         -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures         -Wno-monomorphism-restriction -Wno-missing-deriving-strategies         -Wno-missing-export-lists -Wno-missing-kind-signatures-        -Wno-partial-fields -Wno-prepositive-qualified-module+        -Wno-partial-fields      build-depends:         aeson >=2.0.3.0 && <2.1,@@ -344,11 +344,11 @@         BangPatterns ConstraintKinds DataKinds DefaultSignatures         DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric         DerivingStrategies DerivingVia EmptyDataDecls FlexibleContexts-        FlexibleInstances GeneralizedNewtypeDeriving KindSignatures-        LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude-        PatternGuards PatternSynonyms RankNTypes RecordWildCards-        OverloadedRecordDot OverloadedStrings ScopedTypeVariables-        TupleSections TypeFamilies ViewPatterns+        FlexibleInstances GeneralizedNewtypeDeriving ImportQualifiedPost+        KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns+        NoImplicitPrelude PatternGuards PatternSynonyms RankNTypes+        RecordWildCards OverloadedRecordDot OverloadedStrings+        ScopedTypeVariables TupleSections TypeFamilies ViewPatterns      ghc-options:         -Weverything -Wno-missing-exported-signatures@@ -358,9 +358,8 @@         -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures         -Wno-monomorphism-restriction -Wno-missing-deriving-strategies         -Wno-missing-export-lists -Wno-missing-kind-signatures-        -Wno-partial-fields -Wno-prepositive-qualified-module-        -fno-warn-unused-do-bind -threaded -rtsopts -with-rtsopts=-N-        -Wno-unused-packages+        -Wno-partial-fields -fno-warn-unused-do-bind -threaded -rtsopts+        -with-rtsopts=-N -Wno-unused-packages      build-depends:         aeson >=2.0.3.0 && <2.1,@@ -476,11 +475,11 @@         BangPatterns ConstraintKinds DataKinds DefaultSignatures         DeriveFunctor DeriveFoldable DeriveTraversable DeriveGeneric         DerivingStrategies DerivingVia EmptyDataDecls FlexibleContexts-        FlexibleInstances GeneralizedNewtypeDeriving KindSignatures-        LambdaCase MultiParamTypeClasses NamedFieldPuns NoImplicitPrelude-        PatternGuards PatternSynonyms RankNTypes RecordWildCards-        OverloadedRecordDot OverloadedStrings ScopedTypeVariables-        TupleSections TypeFamilies ViewPatterns+        FlexibleInstances GeneralizedNewtypeDeriving ImportQualifiedPost+        KindSignatures LambdaCase MultiParamTypeClasses NamedFieldPuns+        NoImplicitPrelude PatternGuards PatternSynonyms RankNTypes+        RecordWildCards OverloadedRecordDot OverloadedStrings+        ScopedTypeVariables TupleSections TypeFamilies ViewPatterns      ghc-options:         -Weverything -Wno-missing-exported-signatures@@ -490,8 +489,8 @@         -Wno-missing-safe-haskell-mode -Wno-missing-local-signatures         -Wno-monomorphism-restriction -Wno-missing-deriving-strategies         -Wno-missing-export-lists -Wno-missing-kind-signatures-        -Wno-partial-fields -Wno-prepositive-qualified-module-        -Wno-incomplete-uni-patterns -Wno-unused-packages+        -Wno-partial-fields -Wno-incomplete-uni-patterns+        -Wno-unused-packages      build-depends:         aeson >=2.0.3.0 && <2.1,

@@ -7,11 +7,11 @@  import Control.Monad (ap) import Control.Monad.Base (MonadBase(..))-import Control.Monad.IO.Class+import Control.Monad.IO.Class (MonadIO(..)) import Control.Monad.Trans.Control (MonadBaseControl(..))-import Control.Monad.Writer.Class+import Control.Monad.Writer.Class (MonadWriter(..)) -import Data.IORef+import Data.IORef (IORef, atomicModifyIORef', newIORef, readIORef)  -- | A replacement for WriterT IO which uses mutable references. newtype Logger w a = Logger { runLogger :: IORef w -> IO a }

@@ -5,13 +5,13 @@  import Prelude -import Control.Applicative+import Control.Applicative (Alternative) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.Reader-import Control.Monad.State-import Control.Monad.Writer+import Control.Monad.Reader (MonadPlus, MonadReader, MonadTrans)+import Control.Monad.State (StateT(..))+import Control.Monad.Writer (MonadWriter) -import Data.Functor.Identity+import Data.Functor.Identity (Identity(..))  newtype SupplyT m a = SupplyT { unSupplyT :: StateT Integer m a }   deriving (Functor, Applicative, Monad, MonadTrans, MonadError e, MonadWriter w, MonadReader r, Alternative, MonadPlus)

@@ -6,10 +6,10 @@  import Prelude -import Control.Monad.RWS-import Control.Monad.State-import Control.Monad.Supply-import Control.Monad.Writer+import Control.Monad.RWS (MonadState(..), MonadTrans(..), RWST)+import Control.Monad.State (StateT)+import Control.Monad.Supply (SupplyT(..))+import Control.Monad.Writer (WriterT) import Data.Text (Text, pack)  class Monad m => MonadSupply m where

@@ -30,7 +30,7 @@ import Language.PureScript.TypeChecker as P import Language.PureScript.Types as P -import qualified Paths_purescript as Paths+import Paths_purescript qualified as Paths  version :: Version version = Paths.version

@@ -5,11 +5,11 @@  import Prelude -import Language.PureScript.AST.SourcePos-import Language.PureScript.AST.Literals-import Language.PureScript.Names-import Language.PureScript.Comments-import Language.PureScript.Types+import Language.PureScript.AST.SourcePos (SourceSpan)+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.Names (Ident, OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified)+import Language.PureScript.Comments (Comment)+import Language.PureScript.Types (SourceType)  -- | -- Data type for binders

@@ -11,28 +11,28 @@  import Codec.Serialise (Serialise) import Control.DeepSeq (NFData)-import Data.Functor.Identity+import Data.Functor.Identity (Identity(..)) -import Data.Aeson.TH-import qualified Data.Map as M+import Data.Aeson.TH (Options(..), SumEncoding(..), defaultOptions, deriveJSON)+import Data.Map qualified as M import Data.Text (Text)-import qualified Data.List.NonEmpty as NEL+import Data.List.NonEmpty qualified as NEL import GHC.Generics (Generic) -import Language.PureScript.AST.Binders-import Language.PureScript.AST.Literals-import Language.PureScript.AST.Operators-import Language.PureScript.AST.SourcePos+import Language.PureScript.AST.Binders (Binder)+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.Operators (Fixity)+import Language.PureScript.AST.SourcePos (SourceAnn, SourceSpan) import Language.PureScript.AST.Declarations.ChainId (ChainId)-import Language.PureScript.Types+import Language.PureScript.Types (SourceConstraint, SourceType) import Language.PureScript.PSString (PSString) import Language.PureScript.Label (Label)-import Language.PureScript.Names-import Language.PureScript.Roles-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Comments-import Language.PureScript.Environment-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName(..), Name(..), OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), toMaybeModuleName)+import Language.PureScript.Roles (Role)+import Language.PureScript.TypeClassDictionaries (NamedDict)+import Language.PureScript.Comments (Comment)+import Language.PureScript.Environment (DataDeclType, Environment, FunctionalDependency, NameKind)+import Language.PureScript.Constants.Prim qualified as C  -- | A map of locally-bound names in scope. type Context = [(Ident, SourceType)]@@ -42,14 +42,14 @@   = TSBefore Environment   -- ^ An Environment captured for later consumption by type directed search   | TSAfter+  -- ^ Results of applying type directed search to the previously captured+  -- Environment     { tsAfterIdentifiers :: [(Qualified Text, SourceType)]     -- ^ The identifiers that fully satisfy the subsumption check     , tsAfterRecordFields :: Maybe [(Label, SourceType)]     -- ^ Record fields that are available on the first argument to the typed     -- hole     }-  -- ^ Results of applying type directed search to the previously captured-  -- Environment   deriving Show  onTypeSearchTypes :: (SourceType -> SourceType) -> TypeSearch -> TypeSearch

@@ -4,7 +4,7 @@   ) where  import Prelude-import qualified Language.PureScript.AST.SourcePos as Pos+import Language.PureScript.AST.SourcePos qualified as Pos import Control.DeepSeq (NFData) import Codec.Serialise (Serialise) 

@@ -10,11 +10,11 @@ import Control.Applicative ((<|>))  import Data.Maybe (mapMaybe)-import qualified Data.Map as M+import Data.Map qualified as M -import Language.PureScript.AST.Declarations-import Language.PureScript.Types-import Language.PureScript.Names+import Language.PureScript.AST.Declarations (DataConstructorDeclaration(..), Declaration(..), DeclarationRef(..), Module(..), declName, declRefName, flattenDecls)+import Language.PureScript.Types (Constraint(..), Type(..), everythingOnTypes)+import Language.PureScript.Names (ModuleName, Name(..), ProperName, ProperNameType(..), Qualified, coerceProperName, disqualify, isQualified, isQualifiedWith)  -- | -- Return a list of all declarations which are exported from a module.

@@ -9,9 +9,9 @@ import GHC.Generics (Generic) import Control.DeepSeq (NFData) import Data.Aeson ((.=))-import qualified Data.Aeson as A+import Data.Aeson qualified as A -import Language.PureScript.Crash+import Language.PureScript.Crash (internalError)  -- | -- A precedence level for an infix operator

@@ -11,9 +11,9 @@ import Data.Aeson ((.=), (.:)) import Data.Text (Text) import GHC.Generics (Generic)-import Language.PureScript.Comments-import qualified Data.Aeson as A-import qualified Data.Text as T+import Language.PureScript.Comments (Comment)+import Data.Aeson qualified as A+import Data.Text qualified as T import System.FilePath (makeRelative)  -- | Source annotation - position information and comments.

@@ -6,24 +6,24 @@ import Prelude import Protolude (swap) -import Control.Monad-import Control.Monad.Trans.State+import Control.Monad ((<=<), (>=>))+import Control.Monad.Trans.State (StateT(..))  import Data.Foldable (fold) import Data.Functor.Identity (runIdentity) import Data.List (mapAccumL) import Data.Maybe (mapMaybe)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M-import qualified Data.Set as S+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M+import Data.Set qualified as S -import Language.PureScript.AST.Binders-import Language.PureScript.AST.Declarations-import Language.PureScript.AST.Literals-import Language.PureScript.Names-import Language.PureScript.Traversals+import Language.PureScript.AST.Binders (Binder(..), binderNames)+import Language.PureScript.AST.Declarations (CaseAlternative(..), DataConstructorDeclaration(..), Declaration(..), DoNotationElement(..), Expr(..), Guard(..), GuardedExpr(..), TypeDeclarationData(..), TypeInstanceBody(..), pattern ValueDecl, ValueDeclarationData(..), mapTypeInstanceBody, traverseTypeInstanceBody)+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.Names (pattern ByNullSourcePos, Ident)+import Language.PureScript.Traversals (sndM, sndM', thirdM) import Language.PureScript.TypeClassDictionaries (TypeClassDictionaryInScope(..))-import Language.PureScript.Types+import Language.PureScript.Types (Constraint(..), SourceType, mapConstraintArgs)  guardedExprM :: Applicative m              => (Guard -> m Guard)

@@ -2,9 +2,9 @@  import Protolude -import Language.PureScript.AST-import Language.PureScript.Names-import Language.PureScript.Types+import Language.PureScript.AST (Binder(..), CaseAlternative, Expr(..), GuardedExpr, Literal, pattern MkUnguarded, nullSourceSpan)+import Language.PureScript.Names (Ident, ModuleName, ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), byMaybeModuleName)+import Language.PureScript.Types (SourceType, Type(..))  lam :: Ident -> Expr -> Expr lam = Abs . mkBinder

@@ -18,18 +18,18 @@  import Prelude -import Control.Monad.Error.Class+import Control.Monad.Error.Class (MonadError(..))  import Data.Aeson ((.=)) import Data.Char (chr, digitToInt) import Data.Foldable (fold) import Data.Maybe (mapMaybe, maybeToList)-import qualified Data.Aeson as A-import qualified Data.Text.Lazy as LT+import Data.Aeson qualified as A+import Data.Text.Lazy qualified as LT -import Language.JavaScript.Parser-import Language.JavaScript.Parser.AST-import Language.JavaScript.Process.Minify+import Language.JavaScript.Parser (JSAST(..), JSAnnot(..), JSAssignOp(..), JSExpression(..), JSStatement(..), renderToText)+import Language.JavaScript.Parser.AST (JSCommaList(..), JSCommaTrailingList(..), JSExportClause(..), JSExportDeclaration(..), JSExportSpecifier(..), JSFromClause(..), JSIdent(..), JSImportDeclaration(..), JSModuleItem(..), JSObjectProperty(..), JSObjectPropertyList, JSPropertyName(..), JSVarInitializer(..))+import Language.JavaScript.Process.Minify (minifyJS)  -- | The type of error messages. We separate generation and rendering of errors using a data -- type, in case we need to match on error types later.

@@ -22,10 +22,10 @@  import Control.Monad.Error.Class (MonadError(..)) import Control.Parallel.Strategies (withStrategy, parList, evalTuple2, r0, rseq)-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Text (Text)-import qualified Language.PureScript.AST as AST-import qualified Language.PureScript.Errors as E+import Language.PureScript.AST qualified as AST+import Language.PureScript.Errors qualified as E import Language.PureScript.CST.Convert import Language.PureScript.CST.Errors import Language.PureScript.CST.Lexer

@@ -21,19 +21,19 @@ import Data.Char (toLower) import Data.Foldable (foldl', toList) import Data.Functor (($>))-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Maybe (isJust, fromJust, mapMaybe)-import qualified Data.Text as Text-import qualified Language.PureScript.AST as AST+import Data.Text qualified as Text+import Language.PureScript.AST qualified as AST import Language.PureScript.AST.Declarations.ChainId (mkChainId)-import qualified Language.PureScript.AST.SourcePos as Pos-import qualified Language.PureScript.Comments as C+import Language.PureScript.AST.SourcePos qualified as Pos+import Language.PureScript.Comments qualified as C import Language.PureScript.Crash (internalError)-import qualified Language.PureScript.Environment as Env-import qualified Language.PureScript.Label as L-import qualified Language.PureScript.Names as N+import Language.PureScript.Environment qualified as Env+import Language.PureScript.Label qualified as L+import Language.PureScript.Names qualified as N import Language.PureScript.PSString (mkString, prettyPrintStringJS)-import qualified Language.PureScript.Types as T+import Language.PureScript.Types qualified as T import Language.PureScript.CST.Positions import Language.PureScript.CST.Print (printToken) import Language.PureScript.CST.Types

@@ -11,11 +11,11 @@  import Prelude -import qualified Data.Text as Text+import Data.Text qualified as Text import Data.Char (isSpace, toUpper)-import Language.PureScript.CST.Layout-import Language.PureScript.CST.Print-import Language.PureScript.CST.Types+import Language.PureScript.CST.Layout (LayoutStack)+import Language.PureScript.CST.Print (printToken)+import Language.PureScript.CST.Types (SourcePos(..), SourceRange(..), SourceToken(..), Token(..)) import Text.Printf (printf)  data ParserErrorType

@@ -4,7 +4,7 @@  import Data.DList (DList) import Language.PureScript.CST.Types-import Language.PureScript.CST.Positions+import Language.PureScript.CST.Positions (advanceLeading, moduleRange, srcRange)  flattenModule :: Module a -> DList SourceToken flattenModule m@(Module _ a b c d e f g) =

@@ -171,10 +171,10 @@ import Prelude  import Data.DList (snoc)-import qualified Data.DList as DList+import Data.DList qualified as DList import Data.Foldable (find) import Data.Function ((&))-import Language.PureScript.CST.Types+import Language.PureScript.CST.Types (Comment, LineFeed, SourcePos(..), SourceRange(..), SourceToken(..), Token(..), TokenAnn(..))  type LayoutStack = [(SourcePos, LayoutDelim)] 

@@ -10,20 +10,20 @@ import Prelude hiding (lex, exp, exponent, lines)  import Control.Monad (join)-import qualified Data.Char as Char-import qualified Data.DList as DList+import Data.Char qualified as Char+import Data.DList qualified as DList import Data.Foldable (foldl') import Data.Functor (($>))-import qualified Data.Scientific as Sci+import Data.Scientific qualified as Sci import Data.String (fromString) import Data.Text (Text)-import qualified Data.Text as Text-import qualified Data.Text.PureScript as Text-import Language.PureScript.CST.Errors-import Language.PureScript.CST.Monad hiding (token)-import Language.PureScript.CST.Layout-import Language.PureScript.CST.Positions-import Language.PureScript.CST.Types+import Data.Text qualified as Text+import Data.Text.PureScript qualified as Text+import Language.PureScript.CST.Errors (ParserErrorInfo(..), ParserErrorType(..))+import Language.PureScript.CST.Monad (LexResult, LexState(..), ParserM(..), throw)+import Language.PureScript.CST.Layout (LayoutDelim(..), insertLayout, lytToken, unwindLayout)+import Language.PureScript.CST.Positions (advanceLeading, advanceToken, advanceTrailing, applyDelta, textDelta)+import Language.PureScript.CST.Types (Comment(..), LineFeed(..), SourcePos(..), SourceRange(..), SourceStyle(..), SourceToken(..), Token(..), TokenAnn(..))  -- | Stops at the first lexing error and replaces it with TokEof. Otherwise, -- the parser will fail when it attempts to draw a lookahead token.

@@ -3,13 +3,13 @@ import Prelude  import Data.List (sortOn)-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Ord (comparing) import Data.Text (Text)-import Language.PureScript.CST.Errors-import Language.PureScript.CST.Layout-import Language.PureScript.CST.Positions-import Language.PureScript.CST.Types+import Language.PureScript.CST.Errors (ParserError, ParserErrorInfo(..), ParserErrorType(..), ParserWarning, ParserWarningType)+import Language.PureScript.CST.Layout (LayoutStack)+import Language.PureScript.CST.Positions (widen)+import Language.PureScript.CST.Types (Comment, LineFeed, SourcePos(..), SourceRange(..), SourceToken(..), Token, TokenAnn(..))  type LexResult = Either (LexState, ParserError) SourceToken 

@@ -8,11 +8,11 @@ import Prelude  import Data.Foldable (foldl')-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Maybe (fromMaybe) import Data.Text (Text) import Data.Void (Void)-import qualified Data.Text as Text+import Data.Text qualified as Text import Language.PureScript.CST.Types  advanceToken :: SourcePos -> Token -> SourcePos

@@ -12,10 +12,10 @@  import Prelude -import qualified Data.DList as DList+import Data.DList qualified as DList import Data.Text (Text)-import qualified Data.Text as Text-import Language.PureScript.CST.Types+import Data.Text qualified as Text+import Language.PureScript.CST.Types (Comment(..), LineFeed(..), Module, SourceStyle(..), SourceToken(..), Token(..), TokenAnn(..)) import Language.PureScript.CST.Flatten (flattenModule)  printToken :: Token -> Text

@@ -2,7 +2,7 @@  import Prelude -import Language.PureScript.CST.Types+import Language.PureScript.CST.Types (Separated(..))  everythingOnSeparated :: (r -> r -> r) -> (a -> r) -> Separated a -> r everythingOnSeparated op k (Separated hd tl) = go hd tl

@@ -2,8 +2,8 @@  import Prelude -import Language.PureScript.CST.Types-import Language.PureScript.CST.Traversals+import Language.PureScript.CST.Types (Constraint(..), Labeled(..), Row(..), Type(..), Wrapped(..))+import Language.PureScript.CST.Traversals (everythingOnSeparated)  everythingOnTypes :: (r -> r -> r) -> (Type a -> r) -> Type a -> r everythingOnTypes op k = goTy

@@ -13,8 +13,8 @@ import Data.Text (Text) import Data.Void (Void) import GHC.Generics (Generic)-import qualified Language.PureScript.Names as N-import qualified Language.PureScript.Roles as R+import Language.PureScript.Names qualified as N+import Language.PureScript.Roles qualified as R import Language.PureScript.PSString (PSString)  data SourcePos = SourcePos

@@ -6,17 +6,17 @@ import Data.Coerce (coerce) import Data.Foldable (for_) import Data.Functor (($>))-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Set (Set)-import qualified Data.Set as Set+import Data.Set qualified as Set import Data.Text (Text)-import qualified Data.Text as Text-import Language.PureScript.CST.Errors-import Language.PureScript.CST.Monad-import Language.PureScript.CST.Positions-import Language.PureScript.CST.Traversals.Type+import Data.Text qualified as Text+import Language.PureScript.CST.Errors (ParserErrorType(..))+import Language.PureScript.CST.Monad (Parser, addFailure, parseFail, pushBack)+import Language.PureScript.CST.Positions (TokenRange, binderRange, importDeclRange, recordUpdateRange, typeRange)+import Language.PureScript.CST.Traversals.Type (everythingOnTypes) import Language.PureScript.CST.Types-import qualified Language.PureScript.Names as N+import Language.PureScript.Names qualified as N import Language.PureScript.PSString (PSString, mkString)  -- |

@@ -13,38 +13,38 @@ import Control.Monad (forM, replicateM, void) import Control.Monad.Except (MonadError, throwError) import Control.Monad.Reader (MonadReader, asks)-import Control.Monad.Supply.Class+import Control.Monad.Supply.Class (MonadSupply, freshName) import Control.Monad.Writer (MonadWriter, runWriterT, writer)  import Data.Bifunctor (first) import Data.List ((\\), intersect)-import qualified Data.List.NonEmpty as NEL (nonEmpty)-import qualified Data.Foldable as F-import qualified Data.Map as M-import qualified Data.Set as S+import Data.List.NonEmpty qualified as NEL (nonEmpty)+import Data.Foldable qualified as F+import Data.Map qualified as M+import Data.Set qualified as S import Data.Maybe (fromMaybe, mapMaybe, maybeToList) import Data.Monoid (Any(..)) import Data.String (fromString) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T -import Language.PureScript.AST.SourcePos+import Language.PureScript.AST.SourcePos (SourceSpan, displayStartEndPos) import Language.PureScript.CodeGen.JS.Common as Common import Language.PureScript.CoreImp.AST (AST, InitializerEffects(..), everywhere, everywhereTopDownM, withSourceSpan)-import qualified Language.PureScript.CoreImp.AST as AST-import qualified Language.PureScript.CoreImp.Module as AST-import Language.PureScript.CoreImp.Optimizer-import Language.PureScript.CoreFn+import Language.PureScript.CoreImp.AST qualified as AST+import Language.PureScript.CoreImp.Module qualified as AST+import Language.PureScript.CoreImp.Optimizer (optimize)+import Language.PureScript.CoreFn (Ann, Bind(..), Binder(..), CaseAlternative(..), ConstructorType(..), Expr(..), Guard, Literal(..), Meta(..), Module(..), extractAnn, extractBinderAnn, modifyAnn, removeComments) import Language.PureScript.CoreFn.Laziness (applyLazinessTransform)-import Language.PureScript.Crash+import Language.PureScript.Crash (internalError) import Language.PureScript.Errors (ErrorMessageHint(..), SimpleErrorMessage(..),                                    MultipleErrors(..), rethrow, errorMessage,                                    errorMessage', rethrowWithPosition, addHint)-import Language.PureScript.Names-import Language.PureScript.Options+import Language.PureScript.Names (Ident(..), ModuleName, ProperName(..), Qualified(..), QualifiedBy(..), runIdent, runModuleName, showIdent, showQualified)+import Language.PureScript.Options (CodegenTarget(..), Options(..)) import Language.PureScript.PSString (PSString, mkString) import Language.PureScript.Traversals (sndM)-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Constants.Prim qualified as C  import System.FilePath.Posix ((</>)) @@ -83,7 +83,7 @@     return $ AST.Module header (foreign' ++ jsImports) renamedModuleBody jsExports    where-  -- | Adds purity annotations to top-level values for bundlers.+  -- Adds purity annotations to top-level values for bundlers.   -- The semantics here derive from treating top-level module evaluation as pure, which lets   -- us remove any unreferenced top-level declarations. To achieve this, we wrap any non-trivial   -- top-level values in an IIFE marked with a pure annotation.@@ -92,14 +92,14 @@     where     annotateOrWrap = liftA2 fromMaybe pureIife maybePure -    -- | If the JS is potentially effectful (in the eyes of a bundler that+    -- If the JS is potentially effectful (in the eyes of a bundler that     -- doesn't know about PureScript), return Nothing. Otherwise, return Just     -- the JS with any needed pure annotations added, and, in the case of a     -- variable declaration, an IIFE to be annotated.     maybePure :: AST -> Maybe AST     maybePure = maybePureGen False -    -- | Like maybePure, but doesn't add a pure annotation to App. This exists+    -- Like maybePure, but doesn't add a pure annotation to App. This exists     -- to prevent from doubling up on annotation comments on curried     -- applications; from experimentation, it turns out that a comment on the     -- outermost App is sufficient for the entire curried chain to be@@ -131,12 +131,12 @@     pureApp :: Maybe SourceSpan -> AST -> [AST] -> AST     pureApp ss f = AST.Comment AST.PureAnnotation . AST.App ss f -  -- | Extracts all declaration names from a binding group.+  -- Extracts all declaration names from a binding group.   getNames :: Bind Ann -> [Ident]   getNames (NonRec _ ident _) = [ident]   getNames (Rec vals) = map (snd . fst) vals -  -- | Creates alternative names for each module to ensure they don't collide+  -- Creates alternative names for each module to ensure they don't collide   -- with declaration names.   renameImports :: [Ident] -> [ModuleName] -> M.Map ModuleName Text   renameImports = go M.empty@@ -157,19 +157,19 @@          then freshModuleName (i + 1) mn' used          else newName -  -- | Generates JavaScript code for a module import, binding the required module+  -- Generates JavaScript code for a module import, binding the required module   -- to the alternative   importToJs :: M.Map ModuleName Text -> ModuleName -> AST.Import   importToJs mnLookup mn' =     let mnSafe = fromMaybe (internalError "Missing value in mnLookup") $ M.lookup mn' mnLookup     in AST.Import mnSafe (moduleImportPath mn') -  -- | Generates JavaScript code for exporting at least one identifier,+  -- Generates JavaScript code for exporting at least one identifier,   -- eventually from another module.   exportsToJs :: Maybe PSString -> [Ident] -> Maybe AST.Export   exportsToJs from = fmap (flip AST.Export from) . NEL.nonEmpty . fmap runIdent -  -- | Generates JavaScript code for re-exporting at least one identifier from+  -- Generates JavaScript code for re-exporting at least one identifier from   -- from another module.   reExportsToJs :: (ModuleName, [Ident]) -> Maybe AST.Export   reExportsToJs = uncurry exportsToJs . first (Just . moduleImportPath)@@ -177,7 +177,7 @@   moduleImportPath :: ModuleName -> PSString   moduleImportPath mn' = fromString (".." </> T.unpack (runModuleName mn') </> "index.js") -  -- | Replaces the `ModuleAccessor`s in the AST with `Indexer`s, ensuring that+  -- Replaces the `ModuleAccessor`s in the AST with `Indexer`s, ensuring that   -- the generated code refers to the collision-avoiding renamed module   -- imports. Also returns set of used module names.   replaceModuleAccessors :: M.Map ModuleName Text -> AST -> (S.Set ModuleName, AST)@@ -238,9 +238,7 @@   -> m [AST] moduleBindToJs mn = bindToJs   where-  -- |   -- Generate code in the simplified JavaScript intermediate representation for a declaration-  --   bindToJs :: Bind Ann -> m [AST]   bindToJs (NonRec (_, _, _, Just IsTypeClassConstructor) _ _) = pure []     -- Unlike other newtype constructors, type class constructors are only@@ -249,7 +247,7 @@   bindToJs (NonRec ann ident val) = return <$> nonRecToJS ann ident val   bindToJs (Rec vals) = writer (applyLazinessTransform mn vals) >>= traverse (uncurry . uncurry $ nonRecToJS) -  -- | Generate code in the simplified JavaScript intermediate representation for a single non-recursive+  -- Generate code in the simplified JavaScript intermediate representation for a single non-recursive   -- declaration.   --   -- The main purpose of this function is to handle code generation for comments.@@ -276,12 +274,12 @@       then withSourceSpan ss js       else js -  -- | Generate code in the simplified JavaScript intermediate representation for a variable based on a+  -- Generate code in the simplified JavaScript intermediate representation for a variable based on a   -- PureScript identifier.   var :: Ident -> AST   var = AST.Var Nothing . identToJs -  -- | Generate code in the simplified JavaScript intermediate representation for a value or expression.+  -- Generate code in the simplified JavaScript intermediate representation for a value or expression.   valueToJs :: Expr Ann -> m AST   valueToJs e =     let (ss, _, _, _) = extractAnn e in@@ -364,7 +362,7 @@   literalToValueJS ss (ArrayLiteral xs) = AST.ArrayLiteral (Just ss) <$> mapM valueToJs xs   literalToValueJS ss (ObjectLiteral ps) = AST.ObjectLiteral (Just ss) <$> mapM (sndM valueToJs) ps -  -- | Shallow copy an object.+  -- Shallow copy an object.   extendObj :: AST -> [(PSString, AST)] -> m AST   extendObj obj sts = do     newObj <- freshName@@ -384,13 +382,13 @@       extend = map stToAssign sts     return $ AST.App Nothing (AST.Function Nothing Nothing [] block) [] -  -- | Generate code in the simplified JavaScript intermediate representation for a reference to a+  -- Generate code in the simplified JavaScript intermediate representation for a reference to a   -- variable.   varToJs :: Qualified Ident -> AST   varToJs (Qualified (BySourcePos _) ident) = var ident   varToJs qual = qualifiedToJS id qual -  -- | Generate code in the simplified JavaScript intermediate representation for a reference to a+  -- Generate code in the simplified JavaScript intermediate representation for a reference to a   -- variable that may have a qualified name.   qualifiedToJS :: (a -> Ident) -> Qualified a -> AST   qualifiedToJS f (Qualified (ByModuleName C.M_Prim) a) = AST.Var Nothing . runIdent $ f a@@ -400,7 +398,7 @@   foreignIdent :: Ident -> AST   foreignIdent ident = accessorString (mkString $ runIdent ident) (AST.Var Nothing FFINamespace) -  -- | Generate code in the simplified JavaScript intermediate representation for pattern match binders+  -- Generate code in the simplified JavaScript intermediate representation for pattern match binders   -- and guards.   bindersToJs :: SourceSpan -> [CaseAlternative Ann] -> [AST] -> m AST   bindersToJs ss binders vals = do@@ -447,7 +445,7 @@     let (ss, _, _, _) = extractBinderAnn binder in     traverse (withPos ss) =<< binderToJs' s done binder -  -- | Generate code in the simplified JavaScript intermediate representation for a pattern match+  -- Generate code in the simplified JavaScript intermediate representation for a pattern match   -- binder.   binderToJs' :: Text -> [AST] -> Binder Ann -> m [AST]   binderToJs' _ done NullBinder{} = return done

@@ -3,12 +3,12 @@  import Prelude -import Data.Char+import Data.Char (isAlpha, isAlphaNum, isDigit, ord) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T -import Language.PureScript.Crash-import Language.PureScript.Names+import Language.PureScript.Crash (internalError)+import Language.PureScript.Names (Ident(..), InternalIdentData(..), ModuleName(..), ProperName(..), unusedIdent)  moduleNameToJs :: ModuleName -> Text moduleNameToJs (ModuleName mn) =

@@ -9,21 +9,21 @@ import Control.Arrow ((<+>)) import Control.Monad (forM, mzero) import Control.Monad.State (StateT, evalStateT)-import Control.PatternArrows-import qualified Control.Arrow as A+import Control.PatternArrows (Operator(..), OperatorTable(..), Pattern(..), buildPrettyPrinter, mkPattern, mkPattern')+import Control.Arrow qualified as A  import Data.Maybe (fromMaybe) import Data.Text (Text)-import qualified Data.Text as T-import qualified Data.List.NonEmpty as NEL (toList)+import Data.Text qualified as T+import Data.List.NonEmpty qualified as NEL (toList)  import Language.PureScript.AST (SourceSpan(..))-import Language.PureScript.CodeGen.JS.Common-import Language.PureScript.CoreImp.AST-import Language.PureScript.CoreImp.Module-import Language.PureScript.Comments-import Language.PureScript.Crash-import Language.PureScript.Pretty.Common+import Language.PureScript.CodeGen.JS.Common (identCharToText, isValidJsIdentifier, nameIsJsBuiltIn, nameIsJsReserved)+import Language.PureScript.CoreImp.AST (AST(..), BinaryOperator(..), CIComments(..), UnaryOperator(..), getSourceSpan)+import Language.PureScript.CoreImp.Module (Export(..), Import(..), Module(..))+import Language.PureScript.Comments (Comment(..))+import Language.PureScript.Crash (internalError)+import Language.PureScript.Pretty.Common (Emit(..), PrinterState(..), SMap, StrPos(..), addMapping', currentIndent, intercalate, parensPos, runPlainString, withIndent) import Language.PureScript.PSString (PSString, decodeString, prettyPrintStringJS)  -- TODO (Christoph): Get rid of T.unpack / pack

@@ -11,7 +11,7 @@ import Data.Text (Text) import GHC.Generics (Generic) -import Data.Aeson.TH+import Data.Aeson.TH (Options(..), SumEncoding(..), defaultOptions, deriveJSON)  data Comment   = LineComment Text

@@ -3,11 +3,11 @@ -- | Various constants which refer to things in the Prelude and other core libraries module Language.PureScript.Constants.Libs where -import qualified Protolude as P+import Protolude qualified as P  import Data.String (IsString) import Language.PureScript.PSString (PSString)-import qualified Language.PureScript.Constants.TH as TH+import Language.PureScript.Constants.TH qualified as TH  -- Core lib values 

@@ -3,8 +3,8 @@ -- | Various constants which refer to things in Prim module Language.PureScript.Constants.Prim where -import Language.PureScript.Names-import qualified Language.PureScript.Constants.TH as TH+import Language.PureScript.Names (ModuleName)+import Language.PureScript.Constants.TH qualified as TH  $(TH.declare do   TH.mod "Prim" do

@@ -74,8 +74,8 @@ import Control.Monad.Trans.Writer (Writer, execWriter) import Control.Monad.Writer.Class (tell) import Data.String (String)-import Language.Haskell.TH-import Language.PureScript.Names hiding (Name)+import Language.Haskell.TH (Dec, Name, Pat, Q, Type, conP, implBidir, litP, mkName, patSynD, patSynSigD, prefixPatSyn, stringL)+import Language.PureScript.Names (Ident(..), ModuleName(..), ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..))  -- | Generate pattern synonyms corresponding to the provided PureScript -- declarations.

@@ -2,10 +2,10 @@  import Prelude -import Language.PureScript.AST.SourcePos-import Language.PureScript.Comments-import Language.PureScript.CoreFn.Meta-import Language.PureScript.Types+import Language.PureScript.AST.SourcePos (SourceSpan)+import Language.PureScript.Comments (Comment)+import Language.PureScript.CoreFn.Meta (Meta)+import Language.PureScript.Types (SourceType)  -- | -- Type alias for basic annotations

@@ -5,8 +5,8 @@  import Prelude -import Language.PureScript.AST.Literals-import Language.PureScript.Names+import Language.PureScript.AST.Literals (Literal)+import Language.PureScript.Names (Ident, ProperName, ProperNameType(..), Qualified)  -- | -- Data type for binders

@@ -4,29 +4,29 @@  import Protolude hiding (pass) -import Control.Lens+import Control.Lens (At(..), makeLenses, non, view, (%~), (.=), (.~), (<>~), (^.)) import Control.Monad.Supply (Supply) import Control.Monad.Supply.Class (MonadSupply) import Control.Monad.RWS (MonadWriter, RWST, censor, evalRWST, listen, pass, tell) import Data.Bitraversable (bitraverse) import Data.Functor.Compose (Compose(..))-import qualified Data.IntMap.Monoidal as IM-import qualified Data.IntSet as IS-import qualified Data.Map as M+import Data.IntMap.Monoidal qualified as IM+import Data.IntSet qualified as IS+import Data.Map qualified as M import Data.Maybe (fromJust) import Data.Semigroup (Min(..)) import Data.Semigroup.Generic (GenericSemigroupMonoid(..)) -import Language.PureScript.AST.Literals+import Language.PureScript.AST.Literals (Literal(..)) import Language.PureScript.AST.SourcePos (nullSourceSpan)-import qualified Language.PureScript.Constants.Libs as C+import Language.PureScript.Constants.Libs qualified as C import Language.PureScript.CoreFn.Ann (Ann)-import Language.PureScript.CoreFn.Binders-import Language.PureScript.CoreFn.Expr+import Language.PureScript.CoreFn.Binders (Binder(..))+import Language.PureScript.CoreFn.Expr (Bind(..), CaseAlternative(..), Expr(..)) import Language.PureScript.CoreFn.Meta (Meta(IsSyntheticApp))-import Language.PureScript.CoreFn.Traversals+import Language.PureScript.CoreFn.Traversals (everywhereOnValues, traverseCoreFn) import Language.PureScript.Environment (dictTypeName)-import Language.PureScript.Names+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, ProperName(..), Qualified(..), QualifiedBy(..), freshIdent, runIdent, toMaybeModuleName) import Language.PureScript.PSString (decodeString)  -- |

@@ -8,24 +8,24 @@ import Data.Function (on) import Data.Maybe (mapMaybe) import Data.Tuple (swap)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M -import Language.PureScript.AST.Literals-import Language.PureScript.AST.SourcePos-import Language.PureScript.AST.Traversals-import Language.PureScript.Comments-import Language.PureScript.CoreFn.Ann-import Language.PureScript.CoreFn.Binders-import Language.PureScript.CoreFn.Expr-import Language.PureScript.CoreFn.Meta-import Language.PureScript.CoreFn.Module-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Names-import Language.PureScript.Types-import qualified Language.PureScript.AST as A-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.SourcePos (pattern NullSourceSpan, SourceSpan(..))+import Language.PureScript.AST.Traversals (everythingOnValues)+import Language.PureScript.Comments (Comment)+import Language.PureScript.CoreFn.Ann (Ann, ssAnn)+import Language.PureScript.CoreFn.Binders (Binder(..))+import Language.PureScript.CoreFn.Expr (Bind(..), CaseAlternative(..), Expr(..), Guard)+import Language.PureScript.CoreFn.Meta (ConstructorType(..), Meta(..))+import Language.PureScript.CoreFn.Module (Module(..))+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), Environment(..), NameKind(..), isDictTypeName, lookupConstructor, lookupValue)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), getQual)+import Language.PureScript.Types (SourceType)+import Language.PureScript.AST qualified as A+import Language.PureScript.Constants.Prim qualified as C  -- | Desugars a module from AST to CoreFn representation. moduleToCoreFn :: Environment -> A.Module -> Module Ann@@ -40,7 +40,7 @@       decls' = concatMap declToCoreFn decls   in Module modSS coms mn (spanName modSS) imports' exps' reExps externs decls'   where-  -- | Creates a map from a module name to the re-export references defined in+  -- Creates a map from a module name to the re-export references defined in   -- that module.   reExportsToCoreFn :: (ModuleName, A.DeclarationRef) -> M.Map ModuleName [Ident]   reExportsToCoreFn (mn', ref') = M.singleton mn' (exportToCoreFn ref')@@ -52,14 +52,14 @@         (A.exportSourceImportedFrom src)   toReExportRef _ = Nothing -  -- | Remove duplicate imports+  -- Remove duplicate imports   dedupeImports :: [(Ann, ModuleName)] -> [(Ann, ModuleName)]   dedupeImports = fmap swap . M.toList . M.fromListWith const . fmap swap    ssA :: SourceSpan -> Ann   ssA ss = (ss, [], Nothing, Nothing) -  -- | Desugars member declarations from AST to CoreFn representation.+  -- Desugars member declarations from AST to CoreFn representation.   declToCoreFn :: A.Declaration -> [Bind Ann]   declToCoreFn (A.DataDeclaration (ss, com) Newtype _ _ [ctor]) =     [NonRec (ss, [], Nothing, declMeta) (properToIdent $ A.dataCtorName ctor) $@@ -82,7 +82,7 @@     [Rec . NEL.toList $ fmap (\(((ss, com), name), _, e) -> ((ssA ss, name), exprToCoreFn ss com Nothing e)) ds]   declToCoreFn _ = [] -  -- | Desugars expressions from AST to CoreFn representation.+  -- Desugars expressions from AST to CoreFn representation.   exprToCoreFn :: SourceSpan -> [Comment] -> Maybe SourceType -> A.Expr -> Expr Ann   exprToCoreFn _ com ty (A.Literal ss lit) =     Literal (ss, com, ty, Nothing) (fmap (exprToCoreFn ss com Nothing) lit)@@ -131,7 +131,7 @@   exprToCoreFn _ _ _ e =     error $ "Unexpected value in exprToCoreFn mn: " ++ show e -  -- | Desugars case alternatives from AST to CoreFn representation.+  -- Desugars case alternatives from AST to CoreFn representation.   altToCoreFn :: SourceSpan -> A.CaseAlternative -> CaseAlternative Ann   altToCoreFn ss (A.CaseAlternative bs vs) = CaseAlternative (map (binderToCoreFn ss []) bs) (go vs)     where@@ -147,7 +147,7 @@     guardToExpr [A.ConditionGuard cond] = cond     guardToExpr _ = internalError "Guard not correctly desugared" -  -- | Desugars case binders from AST to CoreFn representation.+  -- Desugars case binders from AST to CoreFn representation.   binderToCoreFn :: SourceSpan -> [Comment] -> A.Binder -> Binder Ann   binderToCoreFn _ com (A.LiteralBinder ss lit) =     LiteralBinder (ss, com, Nothing, Nothing) (fmap (binderToCoreFn ss com) lit)@@ -171,19 +171,19 @@   binderToCoreFn _ _ A.ParensInBinder{} =     internalError "ParensInBinder should have been desugared before binderToCoreFn" -  -- | Gets metadata for let bindings.+  -- Gets metadata for let bindings.   getLetMeta :: A.WhereProvenance -> Maybe Meta   getLetMeta A.FromWhere = Just IsWhere   getLetMeta A.FromLet = Nothing -  -- | Gets metadata for values.+  -- Gets metadata for values.   getValueMeta :: Qualified Ident -> Maybe Meta   getValueMeta name =     case lookupValue env name of       Just (_, External, _) -> Just IsForeign       _ -> Nothing -  -- | Gets metadata for data constructors.+  -- Gets metadata for data constructors.   getConstructorMeta :: Qualified (ProperName 'ConstructorName) -> Meta   getConstructorMeta ctor =     case lookupConstructor env ctor of

@@ -7,9 +7,9 @@  import Control.Arrow ((***)) -import Language.PureScript.AST.Literals-import Language.PureScript.CoreFn.Binders-import Language.PureScript.Names+import Language.PureScript.AST.Literals (Literal)+import Language.PureScript.CoreFn.Binders (Binder)+import Language.PureScript.Names (Ident, ProperName, ProperNameType(..), Qualified) import Language.PureScript.PSString (PSString)  -- |

@@ -9,24 +9,24 @@  import Prelude -import           Control.Applicative ((<|>))+import Control.Applicative ((<|>)) -import           Data.Aeson-import           Data.Aeson.Types (Parser, listParser)-import qualified Data.Map.Strict as M-import           Data.Text (Text)-import qualified Data.Text as T-import qualified Data.Vector as V-import           Data.Version (Version, parseVersion)+import Data.Aeson (FromJSON(..), Object, Value(..), withObject, withText, (.:))+import Data.Aeson.Types (Parser, listParser)+import Data.Map.Strict qualified as M+import Data.Text (Text)+import Data.Text qualified as T+import Data.Vector qualified as V+import Data.Version (Version, parseVersion) -import           Language.PureScript.AST.SourcePos (SourceSpan(..))-import           Language.PureScript.AST.Literals-import           Language.PureScript.CoreFn.Ann-import           Language.PureScript.CoreFn-import           Language.PureScript.Names-import           Language.PureScript.PSString (PSString)+import Language.PureScript.AST.SourcePos (SourceSpan(..))+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.CoreFn.Ann (Ann)+import Language.PureScript.CoreFn (Bind(..), Binder(..), CaseAlternative(..), ConstructorType(..), Expr(..), Guard, Meta(..), Module(..))+import Language.PureScript.Names (Ident(..), ModuleName(..), ProperName(..), Qualified(..), QualifiedBy(..), unusedIdent)+import Language.PureScript.PSString (PSString) -import           Text.ParserCombinators.ReadP (readP_to_S)+import Text.ParserCombinators.ReadP (readP_to_S)  parseVersion' :: String -> Maybe Version parseVersion' str =

@@ -6,21 +6,21 @@ import Protolude.Unsafe (unsafeHead)  import Control.Arrow ((&&&))-import qualified Data.Array as A+import Data.Array qualified as A import Data.Coerce (coerce) import Data.Graph (SCC(..), stronglyConnComp) import Data.List (foldl1', (!!))-import qualified Data.IntMap.Monoidal as IM-import qualified Data.IntSet as IS-import qualified Data.Map.Monoidal as M+import Data.IntMap.Monoidal qualified as IM+import Data.IntSet qualified as IS+import Data.Map.Monoidal qualified as M import Data.Semigroup (Max(..))-import qualified Data.Set as S+import Data.Set qualified as S -import Language.PureScript.AST.SourcePos-import qualified Language.PureScript.Constants.Libs as C-import Language.PureScript.CoreFn-import Language.PureScript.Crash-import Language.PureScript.Names+import Language.PureScript.AST.SourcePos (SourcePos(..), SourceSpan(..), nullSourceSpan)+import Language.PureScript.Constants.Libs qualified as C+import Language.PureScript.CoreFn (Ann, Bind, Expr(..), Literal(..), Meta(..), ssAnn, traverseCoreFn)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), InternalIdentData(..), ModuleName, Qualified(..), QualifiedBy(..), runIdent, runModuleName, toMaybeModuleName) import Language.PureScript.PSString (mkString)  -- This module is responsible for ensuring that the bindings in recursive

@@ -5,7 +5,7 @@  import Prelude -import Language.PureScript.Names+import Language.PureScript.Names (Ident)  -- | -- Metadata annotations

@@ -4,10 +4,10 @@  import Data.Map.Strict (Map) -import Language.PureScript.AST.SourcePos-import Language.PureScript.Comments-import Language.PureScript.CoreFn.Expr-import Language.PureScript.Names+import Language.PureScript.AST.SourcePos (SourceSpan)+import Language.PureScript.Comments (Comment)+import Language.PureScript.CoreFn.Expr (Bind)+import Language.PureScript.Names (Ident, ModuleName)  -- | -- The CoreFn module representation

@@ -4,17 +4,17 @@  import Control.Monad.Supply (Supply) import Data.List (lookup)-import Language.PureScript.AST.Literals-import Language.PureScript.AST.SourcePos-import Language.PureScript.CoreFn.Ann-import Language.PureScript.CoreFn.CSE-import Language.PureScript.CoreFn.Expr-import Language.PureScript.CoreFn.Module-import Language.PureScript.CoreFn.Traversals-import Language.PureScript.Label-import Language.PureScript.Types-import qualified Language.PureScript.Constants.Libs as C-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.SourcePos (nullSourceSpan)+import Language.PureScript.CoreFn.Ann (Ann)+import Language.PureScript.CoreFn.CSE (optimizeCommonSubexpressions)+import Language.PureScript.CoreFn.Expr (Bind, Expr(..))+import Language.PureScript.CoreFn.Module (Module(..))+import Language.PureScript.CoreFn.Traversals (everywhereOnValues)+import Language.PureScript.Label (Label(..))+import Language.PureScript.Types (pattern REmptyKinded, Type(..))+import Language.PureScript.Constants.Libs qualified as C+import Language.PureScript.Constants.Prim qualified as C  -- | -- CoreFn optimization pass.

@@ -7,24 +7,24 @@   ( moduleToJSON   ) where -import           Prelude+import Prelude -import           Control.Arrow ((***))-import           Data.Either (isLeft)-import qualified Data.Map.Strict as M-import           Data.Aeson hiding ((.=))-import qualified Data.Aeson-import qualified Data.Aeson.Key-import           Data.Aeson.Types (Pair)-import           Data.Version (Version, showVersion)-import           Data.Text (Text)-import qualified Data.Text as T+import Control.Arrow ((***))+import Data.Either (isLeft)+import Data.Map.Strict qualified as M+import Data.Aeson (ToJSON(..), Value(..), object)+import Data.Aeson qualified+import Data.Aeson.Key qualified+import Data.Aeson.Types (Pair)+import Data.Version (Version, showVersion)+import Data.Text (Text)+import Data.Text qualified as T -import           Language.PureScript.AST.Literals-import           Language.PureScript.AST.SourcePos (SourceSpan(..))-import           Language.PureScript.CoreFn-import           Language.PureScript.Names-import           Language.PureScript.PSString (PSString)+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.SourcePos (SourceSpan(..))+import Language.PureScript.CoreFn (Ann, Bind(..), Binder(..), CaseAlternative(..), ConstructorType(..), Expr(..), Meta(..), Module(..))+import Language.PureScript.Names (Ident, ModuleName(..), ProperName(..), Qualified(..), QualifiedBy(..), runIdent)+import Language.PureScript.PSString (PSString)  constructorTypeToJSON :: ConstructorType -> Value constructorTypeToJSON ProductType = toJSON "ProductType"

@@ -8,9 +8,9 @@ import Control.Arrow (second, (***), (+++)) import Data.Bitraversable (bitraverse) -import Language.PureScript.AST.Literals-import Language.PureScript.CoreFn.Binders-import Language.PureScript.CoreFn.Expr+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.CoreFn.Binders (Binder(..))+import Language.PureScript.CoreFn.Expr (Bind(..), CaseAlternative(..), Expr(..))  everywhereOnValues :: (Bind a -> Bind a) ->                       (Expr a -> Expr a) ->

@@ -8,10 +8,10 @@ import Data.Text (Text)  import Language.PureScript.AST (SourceSpan(..))-import Language.PureScript.Comments+import Language.PureScript.Comments (Comment) import Language.PureScript.Names (ModuleName) import Language.PureScript.PSString (PSString)-import Language.PureScript.Traversals+import Language.PureScript.Traversals (sndM)  -- | Built-in unary operators data UnaryOperator

@@ -1,10 +1,10 @@ module Language.PureScript.CoreImp.Module where  import Protolude-import qualified Data.List.NonEmpty as NEL (NonEmpty)+import Data.List.NonEmpty qualified as NEL (NonEmpty) -import Language.PureScript.Comments-import Language.PureScript.CoreImp.AST+import Language.PureScript.Comments (Comment)+import Language.PureScript.CoreImp.AST (AST) import Language.PureScript.PSString (PSString)  data Module = Module

@@ -24,13 +24,13 @@ import Data.Text (Text)  import Control.Monad.Supply.Class (MonadSupply)-import Language.PureScript.CoreImp.AST-import Language.PureScript.CoreImp.Optimizer.Blocks-import Language.PureScript.CoreImp.Optimizer.Common-import Language.PureScript.CoreImp.Optimizer.Inliner-import Language.PureScript.CoreImp.Optimizer.MagicDo-import Language.PureScript.CoreImp.Optimizer.TCO-import Language.PureScript.CoreImp.Optimizer.Unused+import Language.PureScript.CoreImp.AST (AST(..), InitializerEffects(..))+import Language.PureScript.CoreImp.Optimizer.Blocks (collapseNestedBlocks, collapseNestedIfs)+import Language.PureScript.CoreImp.Optimizer.Common (applyAll, replaceIdents)+import Language.PureScript.CoreImp.Optimizer.Inliner (etaConvert, evaluateIifes, inlineCommonOperators, inlineCommonValues, inlineFnComposition, inlineFnIdentity, inlineUnsafeCoerce, inlineUnsafePartial, inlineVariables, unThunk)+import Language.PureScript.CoreImp.Optimizer.MagicDo (inlineST, magicDoEff, magicDoEffect, magicDoST)+import Language.PureScript.CoreImp.Optimizer.TCO (tco)+import Language.PureScript.CoreImp.Optimizer.Unused (removeCodeAfterReturnStatements, removeUndefinedApp, removeUnusedEffectFreeVars)  -- | Apply a series of optimizer passes to simplified JavaScript code optimize :: forall m. MonadSupply m => [Text] -> [[AST]] -> m [[AST]]

@@ -6,7 +6,7 @@  import Prelude -import Language.PureScript.CoreImp.AST+import Language.PureScript.CoreImp.AST (AST(..), BinaryOperator(..), everywhere)  -- | Collapse blocks which appear nested directly below another block collapseNestedBlocks :: AST -> AST

@@ -7,8 +7,8 @@ import Data.List (foldl') import Data.Maybe (fromMaybe) -import Language.PureScript.Crash-import Language.PureScript.CoreImp.AST+import Language.PureScript.Crash (internalError)+import Language.PureScript.CoreImp.AST (AST(..), everything, everywhere) import Language.PureScript.Names (ModuleName) import Language.PureScript.PSString (PSString) 

@@ -19,15 +19,15 @@ import Data.Either (rights) import Data.Maybe (fromMaybe) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.Names (ModuleName) import Language.PureScript.PSString (PSString, mkString)-import Language.PureScript.CoreImp.AST-import Language.PureScript.CoreImp.Optimizer.Common+import Language.PureScript.CoreImp.AST (AST(..), BinaryOperator(..), InitializerEffects(..), UnaryOperator(..), everywhere, everywhereTopDown, everywhereTopDownM, getSourceSpan)+import Language.PureScript.CoreImp.Optimizer.Common (pattern Ref, applyAll, isReassigned, isRebound, isUpdated, removeFromBlock, replaceIdent, replaceIdents) import Language.PureScript.AST (SourceSpan(..))-import qualified Language.PureScript.Constants.Libs as C-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Constants.Libs qualified as C+import Language.PureScript.Constants.Prim qualified as C  -- TODO: Potential bug: -- Shouldn't just inline this case: { var x = 0; x.toFixed(10); }

@@ -7,11 +7,11 @@  import Data.Maybe (fromJust, isJust) -import Language.PureScript.CoreImp.AST-import Language.PureScript.CoreImp.Optimizer.Common+import Language.PureScript.CoreImp.AST (AST(..), InitializerEffects(..), UnaryOperator(..), everything, everywhere, everywhereTopDown)+import Language.PureScript.CoreImp.Optimizer.Common (pattern Ref) import Language.PureScript.Names (ModuleName) import Language.PureScript.PSString (mkString)-import qualified Language.PureScript.Constants.Libs as C+import Language.PureScript.Constants.Libs qualified as C  -- | Inline type class dictionaries for >>= and return for the Eff monad --

@@ -7,9 +7,9 @@ import Control.Monad (guard) import Control.Monad.State (State, evalState, get, modify) import Data.Functor (($>), (<&>))-import qualified Data.Set as S+import Data.Set qualified as S import Data.Text (Text, pack)-import Language.PureScript.CoreImp.AST+import Language.PureScript.CoreImp.AST (AST(..), InitializerEffects(..), UnaryOperator(..), everything, everywhereTopDownM) import Language.PureScript.AST.SourcePos (SourceSpan) import Safe (headDef, tailSafe) @@ -40,8 +40,8 @@       innerArgs = headDef [] argss       outerArgs = concat . reverse $ tailSafe argss       arity = length argss-      -- ^ this is the number of calls, not the number of arguments, if there's-      -- ever a practical difference.+        -- this is the number of calls, not the number of arguments, if there's+        -- ever a practical difference.       (argss, body', replace) = topCollectAllFunctionArgs [] id fn   convert js = pure js 

@@ -9,12 +9,12 @@  import Control.Monad (filterM) import Data.Monoid (Any(..))-import qualified Data.Set as S+import Data.Set qualified as S import Data.Text (Text) -import Language.PureScript.CoreImp.AST-import Language.PureScript.CoreImp.Optimizer.Common-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.CoreImp.AST (AST(..), InitializerEffects(..), everything, everywhere)+import Language.PureScript.CoreImp.Optimizer.Common (removeFromBlock)+import Language.PureScript.Constants.Prim qualified as C  removeCodeAfterReturnStatements :: AST -> AST removeCodeAfterReturnStatements = everywhere (removeFromBlock go)

@@ -19,24 +19,24 @@ import Data.Bifunctor (bimap) import Data.Char (isUpper) import Data.Either (isRight)-import qualified Data.List.NonEmpty as NE+import Data.List.NonEmpty qualified as NE import Data.Maybe (fromMaybe) import Data.Foldable (for_) import Data.String (fromString)  import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Text.Blaze.Html5 as H hiding (map)-import qualified Text.Blaze.Html5.Attributes as A-import qualified Cheapskate+import Text.Blaze.Html5.Attributes qualified as A+import Cheapskate qualified -import qualified Language.PureScript as P+import Language.PureScript qualified as P  import Language.PureScript.Docs.Types-import Language.PureScript.Docs.RenderedCode hiding (sp)-import qualified Language.PureScript.Docs.Render as Render-import qualified Language.PureScript.CST as CST+import Language.PureScript.Docs.RenderedCode (Link(..), outputWith)+import Language.PureScript.Docs.Render qualified as Render+import Language.PureScript.CST qualified as CST  data HtmlOutput a = HtmlOutput   { htmlIndex     :: [(Maybe Char, a)]

@@ -13,12 +13,12 @@ import Data.Foldable (for_) import Data.List (partition) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T -import Language.PureScript.Docs.RenderedCode-import Language.PureScript.Docs.Types-import qualified Language.PureScript as P-import qualified Language.PureScript.Docs.Render as Render+import Language.PureScript.Docs.RenderedCode (RenderedCode, RenderedCodeElement(..), outputWith)+import Language.PureScript.Docs.Types (ChildDeclaration(..), ChildDeclarationInfo(..), Declaration(..), Module(..), ignorePackage)+import Language.PureScript qualified as P+import Language.PureScript.Docs.Render qualified as Render  moduleAsMarkdown :: Module -> Docs moduleAsMarkdown Module{..} = do

@@ -6,27 +6,27 @@ import Protolude hiding (check)  import Control.Arrow ((&&&))-import qualified Data.Aeson.BetterErrors as ABE-import qualified Data.ByteString as BS-import qualified Data.Map as Map-import qualified Data.Set as Set-import qualified Data.Text as T-import qualified Data.Text.IO as TIO+import Data.Aeson.BetterErrors qualified as ABE+import Data.ByteString qualified as BS+import Data.Map qualified as Map+import Data.Set qualified as Set+import Data.Text qualified as T+import Data.Text.IO qualified as TIO import System.FilePath ((</>)) import System.IO.UTF8 (readUTF8FileT, readUTF8FilesT)  import Language.PureScript.Docs.Convert.ReExports (updateReExports) import Language.PureScript.Docs.Prim (primModules)-import Language.PureScript.Docs.Types+import Language.PureScript.Docs.Types (InPackage(..), Module(..), asModule, displayPackageError, ignorePackage) -import qualified Language.PureScript.AST as P-import qualified Language.PureScript.CST as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Errors as P-import qualified Language.PureScript.Externs as P-import qualified Language.PureScript.Make as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Options as P+import Language.PureScript.AST qualified as P+import Language.PureScript.CST qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Errors qualified as P+import Language.PureScript.Externs qualified as P+import Language.PureScript.Make qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Options qualified as P  import Web.Bower.PackageMeta (PackageName) 

@@ -10,24 +10,24 @@ import Control.Category ((>>>)) import Control.Monad.Writer.Strict (runWriterT) import Control.Monad.Supply (evalSupplyT)-import qualified Data.List.NonEmpty as NE-import qualified Data.Map as Map+import Data.List.NonEmpty qualified as NE+import Data.Map qualified as Map import Data.String (String)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.Docs.Convert.Single (convertSingleModule)-import Language.PureScript.Docs.Types-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.AST as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Errors as P-import qualified Language.PureScript.Externs as P-import qualified Language.PureScript.Environment as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Roles as P-import qualified Language.PureScript.Sugar as P-import qualified Language.PureScript.Types as P-import qualified Language.PureScript.Constants.Prim as Prim+import Language.PureScript.Docs.Types (Declaration(..), DeclarationInfo(..), KindInfo(..), Module(..), Type')+import Language.PureScript.CST qualified as CST+import Language.PureScript.AST qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Errors qualified as P+import Language.PureScript.Externs qualified as P+import Language.PureScript.Environment qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Roles qualified as P+import Language.PureScript.Sugar qualified as P+import Language.PureScript.Types qualified as P+import Language.PureScript.Constants.Prim qualified as Prim import Language.PureScript.Sugar (RebracketCaller(CalledByDocs))  -- |@@ -66,7 +66,6 @@ insertValueTypesAndAdjustKinds env m =   m { modDeclarations = map (go . insertInferredRoles . convertFFIDecl) (modDeclarations m) }   where-  -- |   -- Convert FFI declarations into data declaration   -- by generating the type parameters' names based on its kind signature.   -- Note: `Prim` modules' docs don't go through this conversion process@@ -99,7 +98,6 @@   insertInferredRoles other =     other -  -- |   -- Given an FFI declaration like this   -- ```   -- foreign import data Foo@@ -171,7 +169,6 @@       Nothing ->         err ("name not found: " ++ show key) -  -- |   -- Extracts the keyword for a declaration (if there is one)   extractKeyword :: DeclarationInfo -> Maybe P.KindSignatureFor   extractKeyword = \case@@ -182,7 +179,6 @@     TypeClassDeclaration _ _ _ -> Just P.ClassSig     _ -> Nothing -  -- |   -- Returns True if the kind signature is "uninteresting", which   -- is a kind that follows this form:   -- - `Type`

@@ -5,29 +5,29 @@ import Prelude  import Control.Arrow ((&&&), first, second)-import Control.Monad+import Control.Monad (foldM, (<=<)) import Control.Monad.Reader.Class (MonadReader, ask) import Control.Monad.State.Class (MonadState, gets, modify) import Control.Monad.Trans.Reader (runReaderT) import Control.Monad.Trans.State.Strict (execState) -import Data.Either+import Data.Either (partitionEithers) import Data.Foldable (fold, traverse_) import Data.Map (Map) import Data.Maybe (mapMaybe)-import qualified Data.Map as Map+import Data.Map qualified as Map import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.Docs.Types -import qualified Language.PureScript.AST as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Errors as P-import qualified Language.PureScript.Externs as P-import qualified Language.PureScript.ModuleDependencies as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Types as P+import Language.PureScript.AST qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Errors qualified as P+import Language.PureScript.Externs qualified as P+import Language.PureScript.ModuleDependencies qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Types qualified as P   -- |

@@ -7,16 +7,16 @@  import Control.Category ((>>>)) -import qualified Data.Text as T+import Data.Text qualified as T -import Language.PureScript.Docs.Types+import Language.PureScript.Docs.Types (ChildDeclaration(..), ChildDeclarationInfo(..), Declaration(..), DeclarationInfo(..), KindInfo(..), Module(..), Type', convertFundepsToStrings, isType, isTypeClass) -import qualified Language.PureScript.AST as P-import qualified Language.PureScript.Comments as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Roles as P-import qualified Language.PureScript.Types as P+import Language.PureScript.AST qualified as P+import Language.PureScript.Comments qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Roles qualified as P+import Language.PureScript.Types qualified as P  -- | -- Convert a single Module, but ignore re-exports; any re-exported types or

@@ -9,14 +9,14 @@ import Prelude hiding (fail) import Data.Functor (($>)) import Data.Text (Text)-import qualified Data.Text as T-import qualified Data.Map as Map-import Language.PureScript.Docs.Types+import Data.Text qualified as T+import Data.Map qualified as Map+import Language.PureScript.Docs.Types (Declaration(..), DeclarationInfo(..), Module(..), Type', convertFundepsToStrings) -import qualified Language.PureScript.Constants.Prim as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Environment as P-import qualified Language.PureScript.Names as P+import Language.PureScript.Constants.Prim qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Environment qualified as P+import Language.PureScript.Names qualified as P  primModules :: [Module] primModules =

@@ -13,16 +13,16 @@  import Data.Maybe (maybeToList) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.Docs.RenderedCode-import Language.PureScript.Docs.Types-import Language.PureScript.Docs.Utils.MonoidExtras+import Language.PureScript.Docs.Types (ChildDeclaration(..), ChildDeclarationInfo(..), Constraint', Declaration(..), DeclarationInfo(..), KindInfo(..), Type', isTypeClassMember, kindSignatureForKeyword)+import Language.PureScript.Docs.Utils.MonoidExtras (mintersperse) -import qualified Language.PureScript.AST as P-import qualified Language.PureScript.Environment as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Types as P+import Language.PureScript.AST qualified as P+import Language.PureScript.Environment qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Types qualified as P  renderKindSig :: Text -> KindInfo -> RenderedCode renderKindSig declTitle KindInfo{..} =

@@ -21,16 +21,16 @@ import Control.Arrow ((<+>)) import Control.PatternArrows as PA -import Language.PureScript.Crash-import Language.PureScript.Label-import Language.PureScript.Names-import Language.PureScript.Pretty.Types-import Language.PureScript.Roles-import Language.PureScript.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Label (Label)+import Language.PureScript.Names (coerceProperName)+import Language.PureScript.Pretty.Types (PrettyPrintConstraint, PrettyPrintType(..), convertPrettyPrintType, prettyPrintLabel)+import Language.PureScript.Roles (Role, displayRole)+import Language.PureScript.Types (Type) import Language.PureScript.PSString (prettyPrintString) -import Language.PureScript.Docs.RenderedCode.Types-import Language.PureScript.Docs.Utils.MonoidExtras+import Language.PureScript.Docs.RenderedCode.Types (RenderedCode, keywordForall, roleAnn, sp, syntax, typeCtor, typeOp, typeVar)+import Language.PureScript.Docs.Utils.MonoidExtras (mintersperse)  typeLiterals :: Pattern () PrettyPrintType RenderedCode typeLiterals = mkPattern match

@@ -39,13 +39,13 @@ import Control.Monad.Error.Class (MonadError(..))  import Data.Aeson.BetterErrors (Parse, nth, withText, withValue, toAesonParser, perhaps, asText)-import qualified Data.Aeson as A+import Data.Aeson qualified as A import Data.Text (Text)-import qualified Data.Text as T-import qualified Data.ByteString.Lazy as BS-import qualified Data.Text.Encoding as TE+import Data.Text qualified as T+import Data.ByteString.Lazy qualified as BS+import Data.Text.Encoding qualified as TE -import Language.PureScript.Names+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, OpName(..), OpNameType(..), ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), moduleNameFromString, runIdent, runModuleName) import Language.PureScript.AST (Associativity(..))  -- | Given a list of actions, attempt them all, returning the first success.

@@ -6,12 +6,12 @@  import Prelude -import           Control.Arrow (first)-import           Data.List (sort)-import           Data.Maybe (mapMaybe)-import qualified Data.Text as T+import Control.Arrow (first)+import Data.List (sort)+import Data.Maybe (mapMaybe)+import Data.Text qualified as T import Language.PureScript.AST (SourceSpan, sourcePosLine, spanStart)-import Language.PureScript.Docs.Types+import Language.PureScript.Docs.Types (ChildDeclaration(..), Declaration(..), Module(..))  tags :: Module -> [(String, Int)] tags = map (first T.unpack) . concatMap dtags . modDeclarations

@@ -10,30 +10,30 @@ import Control.Arrow ((***))  import Data.Aeson ((.=))-import qualified Data.Aeson.Key as A.Key+import Data.Aeson.Key qualified as A.Key import Data.Aeson.BetterErrors   (Parse, keyOrDefault, throwCustomError, key, asText,    keyMay, withString, eachInArray, asNull, (.!), toAesonParser, toAesonParser',    fromAesonParser, perhaps, withText, asIntegral, nth, eachInObjectWithKey,    asString)-import qualified Data.Map as Map+import Data.Map qualified as Map import Data.Time.Clock (UTCTime)-import qualified Data.Time.Format as TimeFormat-import Data.Version-import qualified Data.Aeson as A-import qualified Data.Text as T-import qualified Data.Vector as V+import Data.Time.Format qualified as TimeFormat+import Data.Version (Version(..), showVersion)+import Data.Aeson qualified as A+import Data.Text qualified as T+import Data.Vector qualified as V -import qualified Language.PureScript.AST as P-import qualified Language.PureScript.CoreFn.FromJSON as P-import qualified Language.PureScript.Crash as P-import qualified Language.PureScript.Environment as P-import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Roles as P-import qualified Language.PureScript.Types as P-import qualified Paths_purescript as Paths+import Language.PureScript.AST qualified as P+import Language.PureScript.CoreFn.FromJSON qualified as P+import Language.PureScript.Crash qualified as P+import Language.PureScript.Environment qualified as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Roles qualified as P+import Language.PureScript.Types qualified as P+import Paths_purescript qualified as Paths -import Web.Bower.PackageMeta hiding (Version, displayError)+import Web.Bower.PackageMeta (BowerError, PackageMeta(..), PackageName, asPackageMeta, parsePackageName, runPackageName, showBowerError)  import Language.PureScript.Docs.RenderedCode as ReExports   (RenderedCode,

@@ -1,6 +1,6 @@ module Language.PureScript.Docs.Utils.MonoidExtras where -import Data.Monoid+import Data.Monoid (Monoid(..), (<>))  mintersperse :: (Monoid m) => m -> [m] -> m mintersperse _ []       = mempty

@@ -7,26 +7,26 @@ import Control.Monad (unless) import Codec.Serialise (Serialise) import Data.Aeson ((.=), (.:))-import qualified Data.Aeson as A+import Data.Aeson qualified as A import Data.Foldable (find, fold) import Data.Functor ((<&>))-import qualified Data.IntMap as IM-import qualified Data.IntSet as IS-import qualified Data.Map as M-import qualified Data.Set as S+import Data.IntMap qualified as IM+import Data.IntSet qualified as IS+import Data.Map qualified as M+import Data.Set qualified as S import Data.Maybe (fromMaybe) import Data.Semigroup (First(..)) import Data.Text (Text)-import qualified Data.Text as T-import qualified Data.List.NonEmpty as NEL+import Data.Text qualified as T+import Data.List.NonEmpty qualified as NEL -import Language.PureScript.AST.SourcePos-import Language.PureScript.Crash-import Language.PureScript.Names-import Language.PureScript.Roles-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Types-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.AST.SourcePos (nullSourceAnn)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Names (Ident, ProperName(..), ProperNameType(..), Qualified, QualifiedBy, coerceProperName)+import Language.PureScript.Roles (Role(..))+import Language.PureScript.TypeClassDictionaries (NamedDict)+import Language.PureScript.Types (SourceConstraint, SourceType, Type(..), eqType, srcTypeConstructor)+import Language.PureScript.Constants.Prim qualified as C  -- | The @Environment@ defines all values and types which are currently in scope: data Environment = Environment

@@ -3,56 +3,56 @@   , module Language.PureScript.Errors   ) where -import           Prelude-import           Protolude (unsnoc)+import Prelude+import Protolude (unsnoc) -import           Control.Arrow ((&&&))-import           Control.Exception (displayException)-import           Control.Lens (both, head1, over)-import           Control.Monad-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.Trans.State.Lazy-import           Control.Monad.Writer-import           Data.Bifunctor (first, second)-import           Data.Bitraversable (bitraverse)-import           Data.Char (isSpace)-import           Data.Containers.ListUtils (nubOrdOn)-import           Data.Either (partitionEithers)-import           Data.Foldable (fold)-import           Data.Function (on)-import           Data.Functor (($>))-import           Data.Functor.Identity (Identity(..))-import           Data.List (transpose, nubBy, partition, dropWhileEnd, sortOn, uncons)-import qualified Data.List.NonEmpty as NEL-import           Data.List.NonEmpty (NonEmpty((:|)))-import           Data.Maybe (maybeToList, fromMaybe, isJust, mapMaybe)-import qualified Data.Map as M-import           Data.Ord (Down(..))-import qualified Data.Set as S-import qualified Data.Text as T-import           Data.Text (Text)-import           Data.Traversable (for)-import qualified GHC.Stack-import           Language.PureScript.AST-import qualified Language.PureScript.Bundle as Bundle-import qualified Language.PureScript.Constants.Libs as C-import qualified Language.PureScript.Constants.Prim as C-import           Language.PureScript.Crash-import qualified Language.PureScript.CST.Errors as CST-import qualified Language.PureScript.CST.Print as CST-import           Language.PureScript.Label (Label(..))-import           Language.PureScript.Names-import           Language.PureScript.Pretty-import           Language.PureScript.Pretty.Common (endWith)-import           Language.PureScript.PSString (decodeStringWithReplacement)-import           Language.PureScript.Roles-import           Language.PureScript.Traversals-import           Language.PureScript.Types-import qualified Language.PureScript.Publish.BoxesHelpers as BoxHelpers-import qualified System.Console.ANSI as ANSI-import           System.FilePath (makeRelative)-import qualified Text.PrettyPrint.Boxes as Box-import           Witherable (wither)+import Control.Arrow ((&&&))+import Control.Exception (displayException)+import Control.Lens (both, head1, over)+import Control.Monad (forM, unless)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.Trans.State.Lazy (State, evalState, get, put)+import Control.Monad.Writer (Last(..), MonadWriter(..), censor)+import Data.Bifunctor (first, second)+import Data.Bitraversable (bitraverse)+import Data.Char (isSpace)+import Data.Containers.ListUtils (nubOrdOn)+import Data.Either (partitionEithers)+import Data.Foldable (fold)+import Data.Function (on)+import Data.Functor (($>))+import Data.Functor.Identity (Identity(..))+import Data.List (transpose, nubBy, partition, dropWhileEnd, sortOn, uncons)+import Data.List.NonEmpty qualified as NEL+import Data.List.NonEmpty (NonEmpty((:|)))+import Data.Maybe (maybeToList, fromMaybe, isJust, mapMaybe)+import Data.Map qualified as M+import Data.Ord (Down(..))+import Data.Set qualified as S+import Data.Text qualified as T+import Data.Text (Text)+import Data.Traversable (for)+import GHC.Stack qualified+import Language.PureScript.AST+import Language.PureScript.Bundle qualified as Bundle+import Language.PureScript.Constants.Libs qualified as C+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Crash (internalError)+import Language.PureScript.CST.Errors qualified as CST+import Language.PureScript.CST.Print qualified as CST+import Language.PureScript.Label (Label(..))+import Language.PureScript.Names+import Language.PureScript.Pretty (prettyPrintBinderAtom, prettyPrintLabel, prettyPrintObjectKey, prettyPrintSuggestedType, prettyPrintValue, typeAsBox, typeAtomAsBox, typeDiffAsBox)+import Language.PureScript.Pretty.Common (endWith)+import Language.PureScript.PSString (decodeStringWithReplacement)+import Language.PureScript.Roles (Role, displayRole)+import Language.PureScript.Traversals (sndM)+import Language.PureScript.Types (Constraint(..), ConstraintData(..), RowListItem(..), SourceConstraint, SourceType, Type(..), eraseForAllKindAnnotations, eraseKindApps, everywhereOnTypesTopDownM, getAnnForType, overConstraintArgs, rowFromList, rowToList, srcTUnknown)+import Language.PureScript.Publish.BoxesHelpers qualified as BoxHelpers+import System.Console.ANSI qualified as ANSI+import System.FilePath (makeRelative)+import Text.PrettyPrint.Boxes qualified as Box+import Witherable (wither)  -- | A type of error messages data SimpleErrorMessage@@ -1676,7 +1676,7 @@   paras :: forall f. Foldable f => f Box.Box -> Box.Box   paras = Box.vcat Box.left -  -- | Simplify an error message+  -- Simplify an error message   simplifyErrorMessage :: ErrorMessage -> ErrorMessage   simplifyErrorMessage (ErrorMessage hints simple) = ErrorMessage (simplifyHints hints) simple     where@@ -1692,7 +1692,7 @@         (_, OtherHint) -> False         (c1, c2) -> c1 == c2 -    -- | See https://github.com/purescript/purescript/issues/1802+    -- See https://github.com/purescript/purescript/issues/1802     stripRedundantHints :: SimpleErrorMessage -> [ErrorMessageHint] -> [ErrorMessageHint]     stripRedundantHints ExprDoesNotHaveType{} = stripFirst isCheckHint       where@@ -1764,7 +1764,7 @@         Box.<> (line . displayStartEndPos . fst $ getAnnForType ty)     Qualified mn (Right inst) -> line . markCode . showQualified showIdent $ Qualified mn inst -  -- | As of this writing, this function assumes that all provided SourceSpans+  -- As of this writing, this function assumes that all provided SourceSpans   -- are non-overlapping (except for exact duplicates) and span no line breaks. A   -- more sophisticated implementation without this limitation would be possible   -- but isn't yet needed.@@ -1845,7 +1845,7 @@     lineNumberStyle :: String -> Box.Box     lineNumberStyle = colorCodeBox (codeColor $> (ANSI.Vivid, ANSI.Black)) . Box.alignHoriz Box.right 5 . lineS -  -- | Lookup the nth element of a list, but without retraversing the list every+  -- Lookup the nth element of a list, but without retraversing the list every   -- time, by instead keeping a tail of the list and the current element number   -- in State. Only works if the argument provided is strictly ascending over   -- the life of the State.

@@ -4,11 +4,11 @@  import Prelude -import qualified Data.Aeson.TH as A-import qualified Data.List.NonEmpty as NEL+import Data.Aeson.TH qualified as A+import Data.List.NonEmpty qualified as NEL import Data.Text (Text) -import qualified Language.PureScript as P+import Language.PureScript qualified as P  data ErrorPosition = ErrorPosition   { startLine :: Int

@@ -23,18 +23,18 @@ import Data.List (foldl', find) import Data.Foldable (fold) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T import Data.Version (showVersion)-import qualified Data.Map as M-import qualified Data.List.NonEmpty as NEL+import Data.Map qualified as M+import Data.List.NonEmpty qualified as NEL -import Language.PureScript.AST+import Language.PureScript.AST (Associativity, Declaration(..), DeclarationRef(..), Fixity(..), ImportDeclarationType, Module(..), NameSource(..), Precedence, SourceSpan, pattern TypeFixityDeclaration, pattern ValueFixityDeclaration, getTypeOpRef, getValueOpRef) import Language.PureScript.AST.Declarations.ChainId (ChainId)-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Names-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType, Environment(..), FunctionalDependency, NameKind(..), NameVisibility(..), TypeClassData(..), TypeKind(..), dictTypeName, makeTypeClassData)+import Language.PureScript.Names (Ident, ModuleName, OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, isPlainIdent)+import Language.PureScript.TypeClassDictionaries (NamedDict, TypeClassDictionaryInScope(..))+import Language.PureScript.Types (SourceConstraint, SourceType, srcInstanceType)  import Paths_purescript as Paths 

@@ -2,27 +2,27 @@  import Prelude -import qualified Data.Aeson as Json-import qualified Data.Aeson.Key as Json.Key-import qualified Data.Aeson.KeyMap as Json.Map-import qualified Data.Map as Map+import Data.Aeson qualified as Json+import Data.Aeson.Key qualified as Json.Key+import Data.Aeson.KeyMap qualified as Json.Map+import Data.Map qualified as Map -import           Control.Monad (forM)-import           Data.Aeson ((.=))-import           Data.Foldable (foldl')-import           Data.Map (Map)-import           Data.Maybe (fromMaybe)-import           Data.Text (Text)-import           System.IO.UTF8 (readUTF8FileT)+import Control.Monad (forM)+import Data.Aeson ((.=))+import Data.Foldable (foldl')+import Data.Map (Map)+import Data.Maybe (fromMaybe)+import Data.Text (Text)+import System.IO.UTF8 (readUTF8FileT) -import qualified Language.PureScript.Crash as Crash-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.Make as Make-import qualified Language.PureScript.ModuleDependencies as Dependencies-import qualified Language.PureScript.Options as Options+import Language.PureScript.Crash qualified as Crash+import Language.PureScript.CST qualified as CST+import Language.PureScript.Make qualified as Make+import Language.PureScript.ModuleDependencies qualified as Dependencies+import Language.PureScript.Options qualified as Options -import           Language.PureScript.Errors (MultipleErrors)-import           Language.PureScript.Names (ModuleName, runModuleName)+import Language.PureScript.Errors (MultipleErrors)+import Language.PureScript.Names (ModuleName, runModuleName)   -- | Given a set of filepaths, try to build the dependency graph and return

@@ -15,12 +15,12 @@  module Language.PureScript.Hierarchy where -import           Prelude-import           Protolude (ordNub)+import Prelude+import Protolude (ordNub) -import           Data.List (sort)-import qualified Data.Text as T-import qualified Language.PureScript as P+import Data.List (sort)+import Data.Text qualified as T+import Language.PureScript qualified as P  newtype SuperMap = SuperMap   { _unSuperMap :: Either (P.ProperName 'P.ClassName) (P.ProperName 'P.ClassName, P.ProperName 'P.ClassName)

@@ -18,31 +18,31 @@        ( handleCommand        ) where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           "monad-logger" Control.Monad.Logger-import qualified Data.Map                           as Map-import qualified Data.Text                          as T-import qualified Language.PureScript                as P-import qualified Language.PureScript.Ide.CaseSplit  as CS-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.Completion-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Externs-import           Language.PureScript.Ide.Filter-import           Language.PureScript.Ide.Imports hiding (Import)-import           Language.PureScript.Ide.Imports.Actions-import           Language.PureScript.Ide.Matcher-import           Language.PureScript.Ide.Prim-import           Language.PureScript.Ide.Rebuild-import           Language.PureScript.Ide.SourceFile-import           Language.PureScript.Ide.State-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           Language.PureScript.Ide.Usage (findUsages)-import           System.Directory (getCurrentDirectory, getDirectoryContents, doesDirectoryExist, doesFileExist)-import           System.FilePath ((</>), normalise)-import           System.FilePath.Glob (glob)+import "monad-logger" Control.Monad.Logger (MonadLogger, logWarnN)+import Data.Map qualified as Map+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Ide.CaseSplit qualified as CS+import Language.PureScript.Ide.Command (Command(..), ImportCommand(..), ListType(..))+import Language.PureScript.Ide.Completion (CompletionOptions, completionFromMatch, getCompletions, getExactCompletions, simpleExport)+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.Externs (readExternFile)+import Language.PureScript.Ide.Filter (Filter)+import Language.PureScript.Ide.Imports (parseImportsFromFile)+import Language.PureScript.Ide.Imports.Actions (addImplicitImport, addImportForIdentifier, addQualifiedImport, answerRequest)+import Language.PureScript.Ide.Matcher (Matcher)+import Language.PureScript.Ide.Prim (idePrimDeclarations)+import Language.PureScript.Ide.Rebuild (rebuildFileAsync, rebuildFileSync)+import Language.PureScript.Ide.SourceFile (parseModulesFromFiles)+import Language.PureScript.Ide.State (getAllModules, getLoadedModulenames, insertExterns, insertModule, populateVolatileState, populateVolatileStateSync, resetIdeState)+import Language.PureScript.Ide.Types (Annotation(..), Ide, IdeConfiguration(..), IdeDeclarationAnn(..), IdeEnvironment(..), Success(..))+import Language.PureScript.Ide.Util (discardAnn, identifierFromIdeDeclaration, namespaceForDeclaration, withEmptyAnn)+import Language.PureScript.Ide.Usage (findUsages)+import System.Directory (getCurrentDirectory, getDirectoryContents, doesDirectoryExist, doesFileExist)+import System.FilePath ((</>), normalise)+import System.FilePath.Glob (glob)  -- | Accepts a Command and runs it against psc-ide's State. This is the main -- entry point for the server.

@@ -21,18 +21,18 @@        , caseSplit        ) where -import           Protolude                     hiding (Constructor)+import Protolude                     hiding (Constructor) -import qualified Data.List.NonEmpty            as NE-import qualified Data.Map                      as M-import qualified Data.Text                     as T-import qualified Language.PureScript           as P-import qualified Language.PureScript.CST       as CST+import Data.List.NonEmpty qualified as NE+import Data.Map qualified as M+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST -import           Language.PureScript.Externs-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.State-import           Language.PureScript.Ide.Types+import Language.PureScript.Externs (ExternsDeclaration(..), ExternsFile(..))+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.State (cachedRebuild, getExternFiles)+import Language.PureScript.Ide.Types (Ide)  type Constructor = (P.ProperName 'P.ConstructorName, [P.SourceType]) 

@@ -14,18 +14,18 @@  module Language.PureScript.Ide.Command where -import           Protolude+import Protolude -import           Control.Monad.Fail (fail)-import           Data.Aeson-import qualified Data.Map as Map-import qualified Data.Set as Set-import qualified Language.PureScript               as P-import           Language.PureScript.Ide.CaseSplit-import           Language.PureScript.Ide.Completion-import           Language.PureScript.Ide.Filter-import           Language.PureScript.Ide.Matcher-import           Language.PureScript.Ide.Types+import Control.Monad.Fail (fail)+import Data.Aeson (FromJSON(..), withObject, (.!=), (.:), (.:?))+import Data.Map qualified as Map+import Data.Set qualified as Set+import Language.PureScript qualified as P+import Language.PureScript.Ide.CaseSplit (WildcardAnnotations, explicitAnnotations, noAnnotations)+import Language.PureScript.Ide.Completion (CompletionOptions, defaultCompletionOptions)+import Language.PureScript.Ide.Filter (Filter)+import Language.PureScript.Ide.Matcher (Matcher)+import Language.PureScript.Ide.Types (IdeDeclarationAnn, IdeNamespace)  data Command     = Load [P.ModuleName]

@@ -9,18 +9,18 @@        , applyCompletionOptions        ) where -import           Protolude hiding ((<&>), moduleName)+import Protolude hiding ((<&>), moduleName) -import           Control.Lens hiding (op, (&))-import           Data.Aeson-import qualified Data.Map as Map-import qualified Data.Text as T-import qualified Language.PureScript as P-import           Language.PureScript.Ide.Error (prettyPrintTypeSingleLine)-import           Language.PureScript.Ide.Filter-import           Language.PureScript.Ide.Matcher-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util+import Control.Lens ((.~), (<&>), (^.))+import Data.Aeson (FromJSON(..), withObject, (.!=), (.:?))+import Data.Map qualified as Map+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Ide.Error (prettyPrintTypeSingleLine)+import Language.PureScript.Ide.Filter (Filter, applyFilters, exactFilter)+import Language.PureScript.Ide.Matcher (Matcher, runMatcher)+import Language.PureScript.Ide.Types+import Language.PureScript.Ide.Util (identT, identifierFromIdeDeclaration, namespaceForDeclaration, properNameT, typeOperatorAliasT, valueOperatorAliasT)  -- | Applies the CompletionFilters and the Matcher to the given Modules --   and sorts the found Completions according to the Matching Score

@@ -17,14 +17,14 @@        , prettyPrintTypeSingleLine        ) where -import           Data.Aeson-import qualified Data.Aeson.Types as Aeson-import qualified Data.Aeson.KeyMap as KM-import qualified Data.Text as T-import qualified Language.PureScript as P-import           Language.PureScript.Errors.JSON-import           Language.PureScript.Ide.Types   (ModuleIdent, Completion(..))-import           Protolude+import Data.Aeson (KeyValue(..), ToJSON(..), Value, object)+import Data.Aeson.Types qualified as Aeson+import Data.Aeson.KeyMap qualified as KM+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Errors.JSON (toJSONError)+import Language.PureScript.Ide.Types (ModuleIdent, Completion(..))+import Protolude  data IdeError     = GeneralError Text

@@ -5,18 +5,18 @@   , convertExterns   ) where -import           Protolude hiding (to, from, (&))+import Protolude hiding (to, from, (&)) -import           Codec.CBOR.Term as Term-import           Control.Lens hiding (anyOf)-import           "monad-logger" Control.Monad.Logger-import           Data.Version (showVersion)-import qualified Data.Text as Text-import qualified Language.PureScript as P-import qualified Language.PureScript.Make.Monad as Make-import           Language.PureScript.Ide.Error (IdeError (..))-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util (properNameT)+import Codec.CBOR.Term as Term+import Control.Lens (preview, view, (&), (^.))+import "monad-logger" Control.Monad.Logger (MonadLogger, logErrorN)+import Data.Version (showVersion)+import Data.Text qualified as Text+import Language.PureScript qualified as P+import Language.PureScript.Make.Monad qualified as Make+import Language.PureScript.Ide.Error (IdeError (..))+import Language.PureScript.Ide.Types (IdeDataConstructor(..), IdeDeclaration(..), IdeDeclarationAnn(..), IdeType(..), IdeTypeClass(..), IdeTypeOperator(..), IdeTypeSynonym(..), IdeValue(..), IdeValueOperator(..), _IdeDeclType, anyOf, emptyAnn, ideTypeKind, ideTypeName)+import Language.PureScript.Ide.Util (properNameT)  readExternFile   :: (MonadIO m, MonadError IdeError m, MonadLogger m)

@@ -23,22 +23,22 @@        , applyFilters        ) where -import           Protolude                     hiding (isPrefixOf, Prefix)+import Protolude                     hiding (isPrefixOf, Prefix) -import           Control.Monad.Fail (fail)-import           Data.Aeson-import           Data.Text (isPrefixOf)-import qualified Data.Set as Set-import qualified Data.Map as Map-import           Language.PureScript.Ide.Filter.Declaration (DeclarationType)-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Imports-import           Language.PureScript.Ide.Util+import Control.Monad.Fail (fail)+import Data.Aeson (FromJSON(..), withObject, (.:), (.:?))+import Data.Text (isPrefixOf)+import Data.Set qualified as Set+import Data.Map qualified as Map+import Language.PureScript.Ide.Filter.Declaration (DeclarationType)+import Language.PureScript.Ide.Types (IdeDeclarationAnn, IdeNamespace, ModuleMap, declarationType)+import Language.PureScript.Ide.Imports (Import, sliceImportSection)+import Language.PureScript.Ide.Util (discardAnn, identifierFromIdeDeclaration, namespaceForDeclaration) -import qualified Language.PureScript           as P-import qualified Data.Text as T+import Language.PureScript qualified as P+import Data.Text qualified as T -import Language.PureScript.Ide.Filter.Imports +import Language.PureScript.Ide.Filter.Imports (matchImport)  newtype Filter = Filter (Either (Set P.ModuleName) DeclarationFilter)   deriving Show

@@ -2,10 +2,10 @@        ( DeclarationType(..)        ) where -import           Protolude                     hiding (isPrefixOf)+import Protolude                     hiding (isPrefixOf) -import           Control.Monad.Fail (fail)-import           Data.Aeson+import Control.Monad.Fail (fail)+import Data.Aeson (FromJSON(..), ToJSON(..), withText)  data DeclarationType   = Value

@@ -1,12 +1,12 @@ module Language.PureScript.Ide.Filter.Imports where  -import           Protolude                     hiding (isPrefixOf)+import Protolude                     hiding (isPrefixOf) -import Language.PureScript.Ide.Types-import Language.PureScript.Ide.Imports+import Language.PureScript.Ide.Types (IdeDataConstructor(..), IdeDeclaration(..), IdeDeclarationAnn(..), IdeType(..), IdeTypeClass(..), IdeTypeOperator(..), IdeTypeSynonym(..), IdeValue(..), IdeValueOperator(..))+import Language.PureScript.Ide.Imports (Import(..)) -import qualified Language.PureScript as P+import Language.PureScript qualified as P  matchImport :: Maybe P.ModuleName -> P.ModuleName -> IdeDeclarationAnn -> Import -> Bool matchImport matchQualifier declMod (IdeDeclarationAnn _ decl) (Import importMod declTy qualifier) | declMod == importMod && matchQualifier == qualifier =

@@ -24,16 +24,16 @@        )        where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           Control.Lens                       ((^.), (%~), ix)-import           Data.List                          (partition)-import qualified Data.List.NonEmpty                 as NE-import qualified Data.Text                          as T-import qualified Language.PureScript                as P-import qualified Language.PureScript.CST            as CST-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Util+import Control.Lens ((^.), (%~), ix)+import Data.List (partition)+import Data.List.NonEmpty qualified as NE+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.Util (ideReadFile)  data Import = Import P.ModuleName P.ImportDeclarationType (Maybe P.ModuleName)               deriving (Eq, Show)

@@ -11,23 +11,23 @@        ) where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           Control.Lens                       ((^.), has)-import           Data.List                          (nubBy)-import qualified Data.Map                           as Map-import qualified Data.Text                          as T-import qualified Language.PureScript                as P-import qualified Language.PureScript.Constants.Prim as C-import           Language.PureScript.Ide.Completion-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Filter-import           Language.PureScript.Ide.Imports-import           Language.PureScript.Ide.State-import           Language.PureScript.Ide.Prim-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           System.IO.UTF8                     (writeUTF8FileT)+import Control.Lens ((^.), has)+import Data.List (nubBy)+import Data.Map qualified as Map+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Ide.Completion (getExactMatches)+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.Filter (Filter)+import Language.PureScript.Ide.Imports (Import(..), parseImportsFromFile', prettyPrintImportSection)+import Language.PureScript.Ide.State (getAllModules)+import Language.PureScript.Ide.Prim (idePrimDeclarations)+import Language.PureScript.Ide.Types (Ide, IdeDeclaration(..), IdeType(..), Match(..), Success(..), _IdeDeclModule, ideDtorName, ideDtorTypeName, ideTCName, ideTypeName, ideTypeOpName, ideValueOpName)+import Language.PureScript.Ide.Util (discardAnn, identifierFromIdeDeclaration)+import System.IO.UTF8 (writeUTF8FileT)  -- | Adds an implicit import like @import Prelude@ to a Sourcefile. addImplicitImport@@ -118,7 +118,7 @@     refFromDeclaration d =       P.ValueRef ideSpan (P.Ident (identifierFromIdeDeclaration d)) -    -- | Adds a declaration to an import:+    -- Adds a declaration to an import:     -- TypeDeclaration "Maybe" + Data.Maybe (maybe) -> Data.Maybe(Maybe, maybe)     insertDeclIntoImport :: IdeDeclaration -> Import -> Import     insertDeclIntoImport decl' (Import mn (P.Explicit refs) qual) =

@@ -7,13 +7,13 @@        , labelTimespec        ) where -import           Protolude+import Protolude -import           "monad-logger" Control.Monad.Logger-import qualified Data.Text as T-import           Language.PureScript.Ide.Types-import           System.Clock-import           Text.Printf+import "monad-logger" Control.Monad.Logger (LogLevel(..), LoggingT, MonadLogger, filterLogger, logOtherN, runStdoutLoggingT)+import Data.Text qualified as T+import Language.PureScript.Ide.Types (IdeLogLevel(..))+import System.Clock (Clock(..), TimeSpec, diffTimeSpec, getTime, toNanoSecs)+import Text.Printf (printf)  runLogger :: MonadIO m => IdeLogLevel -> LoggingT m a -> m a runLogger logLevel' =

@@ -19,16 +19,16 @@        , flexMatcher        ) where -import           Protolude+import Protolude -import           Control.Monad.Fail (fail)-import           Data.Aeson-import qualified Data.Text                     as T-import qualified Data.Text.Encoding            as TE-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           Text.EditDistance-import           Text.Regex.TDFA               ((=~))+import Control.Monad.Fail (fail)+import Data.Aeson (FromJSON(..), withObject, (.:), (.:?))+import Data.Text qualified as T+import Data.Text.Encoding qualified as TE+import Language.PureScript.Ide.Types (IdeDeclarationAnn, Match)+import Language.PureScript.Ide.Util (discardAnn, identifierFromIdeDeclaration, unwrapMatch)+import Text.EditDistance (defaultEditCosts, levenshteinDistance)+import Text.Regex.TDFA ((=~))   type ScoredMatch a = (Match a, Double)

@@ -1,13 +1,13 @@ module Language.PureScript.Ide.Prim (idePrimDeclarations) where -import           Protolude+import Protolude -import qualified Data.Text as T-import qualified Data.Map as Map-import qualified Language.PureScript as P-import qualified Language.PureScript.Constants.Prim as C-import qualified Language.PureScript.Environment as PEnv-import           Language.PureScript.Ide.Types+import Data.Text qualified as T+import Data.Map qualified as Map+import Language.PureScript qualified as P+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Environment qualified as PEnv+import Language.PureScript.Ide.Types (IdeDeclaration(..), IdeDeclarationAnn(..), IdeType(..), IdeTypeClass(..), ModuleMap, emptyAnn)  idePrimDeclarations :: ModuleMap [IdeDeclarationAnn] idePrimDeclarations = Map.fromList

@@ -6,26 +6,26 @@   , rebuildFile   ) where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           "monad-logger" Control.Monad.Logger-import qualified Data.List                       as List-import qualified Data.Map.Lazy                   as M-import           Data.Maybe                      (fromJust)-import qualified Data.Set                        as S-import qualified Data.Time                       as Time-import qualified Data.Text                       as Text-import qualified Language.PureScript             as P-import           Language.PureScript.Make (ffiCodegen')-import           Language.PureScript.Make.Cache (CacheInfo(..), normaliseForCache)-import qualified Language.PureScript.CST         as CST+import "monad-logger" Control.Monad.Logger (LoggingT, MonadLogger, logDebug)+import Data.List qualified as List+import Data.Map.Lazy qualified as M+import Data.Maybe (fromJust)+import Data.Set qualified as S+import Data.Time qualified as Time+import Data.Text qualified as Text+import Language.PureScript qualified as P+import Language.PureScript.Make (ffiCodegen')+import Language.PureScript.Make.Cache (CacheInfo(..), normaliseForCache)+import Language.PureScript.CST qualified as CST -import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Logging-import           Language.PureScript.Ide.State-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           System.Directory (getCurrentDirectory)+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.Logging (labelTimespec, logPerf, runLogger)+import Language.PureScript.Ide.State (cacheRebuild, getExternFiles, insertExterns, insertModule, populateVolatileState, updateCacheTimestamp)+import Language.PureScript.Ide.Types (Ide, IdeConfiguration(..), IdeEnvironment(..), ModuleMap, Success(..))+import Language.PureScript.Ide.Util (ideReadFile)+import System.Directory (getCurrentDirectory)  -- | Given a filepath performs the following steps: --

@@ -22,13 +22,13 @@   , resolveReexports'   ) where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           Control.Lens                  hiding (anyOf, (&))-import qualified Data.Map                      as Map-import qualified Language.PureScript           as P-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util+import Control.Lens (set)+import Data.Map qualified as Map+import Language.PureScript qualified as P+import Language.PureScript.Ide.Types+import Language.PureScript.Ide.Util (discardAnn)  -- | Contains the module with resolved reexports, and possible failures data ReexportResult a

@@ -20,15 +20,15 @@   , extractTypeAnnotations   ) where -import           Protolude+import Protolude -import           Control.Parallel.Strategies (withStrategy, parList, rseq)-import qualified Data.Map                      as Map-import qualified Language.PureScript           as P-import qualified Language.PureScript.CST       as CST-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util+import Control.Parallel.Strategies (withStrategy, parList, rseq)+import Data.Map qualified as Map+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Ide.Error (IdeError)+import Language.PureScript.Ide.Types (DefinitionSites, IdeNamespace(..), IdeNamespaced(..), TypeAnnotations)+import Language.PureScript.Ide.Util (ideReadFile)  parseModule :: FilePath -> Text -> Either FilePath (FilePath, P.Module) parseModule path file =

@@ -37,25 +37,25 @@   , resolveDataConstructorsForModule   ) where -import           Protolude hiding (moduleName, unzip)+import Protolude hiding (moduleName, unzip) -import           Control.Concurrent.STM-import           Control.Lens                       hiding (anyOf, op, (&))-import           "monad-logger" Control.Monad.Logger-import           Data.IORef-import qualified Data.Map.Lazy                      as Map-import           Data.Time.Clock (UTCTime)-import           Data.Zip (unzip)-import qualified Language.PureScript                as P-import           Language.PureScript.Docs.Convert.Single (convertComments)-import           Language.PureScript.Externs-import           Language.PureScript.Make.Actions (cacheDbFile)-import           Language.PureScript.Ide.Externs-import           Language.PureScript.Ide.Reexports-import           Language.PureScript.Ide.SourceFile-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           System.Directory (getModificationTime)+import Control.Concurrent.STM (TVar, modifyTVar, readTVar, readTVarIO, writeTVar)+import Control.Lens (Ixed(..), preview, view, (%~), (.~), (^.))+import "monad-logger" Control.Monad.Logger (MonadLogger, logWarnN)+import Data.IORef (readIORef, writeIORef)+import Data.Map.Lazy qualified as Map+import Data.Time.Clock (UTCTime)+import Data.Zip (unzip)+import Language.PureScript qualified as P+import Language.PureScript.Docs.Convert.Single (convertComments)+import Language.PureScript.Externs (ExternsDeclaration(..), ExternsFile(..))+import Language.PureScript.Make.Actions (cacheDbFile)+import Language.PureScript.Ide.Externs (convertExterns)+import Language.PureScript.Ide.Reexports (ReexportResult(..), prettyPrintReexportResult, reexportHasFailures, resolveReexports)+import Language.PureScript.Ide.SourceFile (extractAstInformation)+import Language.PureScript.Ide.Types+import Language.PureScript.Ide.Util (discardAnn, displayTimeSpec, logPerf, opNameT, properNameT, runLogger)+import System.Directory (getModificationTime)  -- | Resets all State inside psc-ide resetIdeState :: Ide m => m ()

@@ -5,19 +5,19 @@  module Language.PureScript.Ide.Types where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           Control.Concurrent.STM (TVar)-import           Control.Lens hiding (op, (.=))-import           Control.Monad.Fail (fail)-import           Data.Aeson (ToJSON, FromJSON, (.=))-import qualified Data.Aeson as Aeson-import           Data.IORef (IORef)-import           Data.Time.Clock (UTCTime)-import qualified Data.Map.Lazy as M-import qualified Language.PureScript as P-import qualified Language.PureScript.Errors.JSON as P-import           Language.PureScript.Ide.Filter.Declaration (DeclarationType(..))+import Control.Concurrent.STM (TVar)+import Control.Lens (Getting, Traversal', makeLenses)+import Control.Monad.Fail (fail)+import Data.Aeson (ToJSON, FromJSON, (.=))+import Data.Aeson qualified as Aeson+import Data.IORef (IORef)+import Data.Time.Clock (UTCTime)+import Data.Map.Lazy qualified as M+import Language.PureScript qualified as P+import Language.PureScript.Errors.JSON qualified as P+import Language.PureScript.Ide.Filter.Declaration (DeclarationType(..))  type ModuleIdent = Text type ModuleMap a = Map P.ModuleName a

@@ -6,15 +6,15 @@   , findUsages   ) where -import           Protolude hiding (moduleName)+import Protolude hiding (moduleName) -import           Control.Lens (preview)-import qualified Data.Map as Map-import qualified Data.Set as Set-import qualified Language.PureScript as P-import           Language.PureScript.Ide.State (getAllModules, getFileState)-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util+import Control.Lens (preview)+import Data.Map qualified as Map+import Data.Set qualified as Set+import Language.PureScript qualified as P+import Language.PureScript.Ide.State (getAllModules, getFileState)+import Language.PureScript.Ide.Types+import Language.PureScript.Ide.Util (identifierFromIdeDeclaration, namespaceForDeclaration)  -- | -- How we find usages, given an IdeDeclaration and the module it was defined in:

@@ -29,20 +29,20 @@   , module Language.PureScript.Ide.Logging   ) where -import           Protolude                           hiding (decodeUtf8,+import Protolude                           hiding (decodeUtf8,                                                       encodeUtf8, to) -import           Control.Lens                        hiding (op, (&))-import           Data.Aeson-import qualified Data.Text                           as T-import qualified Data.Text.Lazy                      as TL-import           Data.Text.Lazy.Encoding             as TLE-import qualified Language.PureScript                 as P-import           Language.PureScript.Ide.Error       (IdeError(..))-import           Language.PureScript.Ide.Logging-import           Language.PureScript.Ide.Types-import           System.IO.UTF8                      (readUTF8FileT)-import           System.Directory                    (makeAbsolute)+import Control.Lens (Getting, to, (^.))+import Data.Aeson (FromJSON, ToJSON, eitherDecode, encode)+import Data.Text qualified as T+import Data.Text.Lazy qualified as TL+import Data.Text.Lazy.Encoding             as TLE+import Language.PureScript qualified as P+import Language.PureScript.Ide.Error (IdeError(..))+import Language.PureScript.Ide.Logging+import Language.PureScript.Ide.Types (IdeDeclaration(..), IdeDeclarationAnn(..), IdeNamespace(..), Match(..), emptyAnn, ideDtorName, ideSynonymName, ideTCName, ideTypeName, ideTypeOpName, ideValueIdent, ideValueOpName)+import System.IO.UTF8 (readUTF8FileT)+import System.Directory (makeAbsolute)  identifierFromIdeDeclaration :: IdeDeclaration -> Text identifierFromIdeDeclaration d = case d of

@@ -9,39 +9,39 @@   , runMake   ) where -import           Prelude-import           Protolude (ordNub)+import Prelude+import Protolude (ordNub) -import           Data.List (sort, find, foldl')-import           Data.Maybe (fromMaybe, mapMaybe)-import qualified Data.Map as M-import qualified Data.Set as S-import           Data.Text (Text)-import qualified Data.Text as T+import Data.List (sort, find, foldl')+import Data.Maybe (fromMaybe, mapMaybe)+import Data.Map qualified as M+import Data.Set qualified as S+import Data.Text (Text)+import Data.Text qualified as T -import           Control.Monad.IO.Class (MonadIO, liftIO)-import           Control.Monad.State.Class-import           Control.Monad.Reader.Class-import           Control.Monad.Trans.Except (ExceptT(..), runExceptT)-import           Control.Monad.Trans.State.Strict (StateT, runStateT, evalStateT)-import           Control.Monad.Writer.Strict (Writer(), runWriter)+import Control.Monad.IO.Class (MonadIO, liftIO)+import Control.Monad.State.Class (MonadState(..), gets, modify)+import Control.Monad.Reader.Class (MonadReader, asks)+import Control.Monad.Trans.Except (ExceptT(..), runExceptT)+import Control.Monad.Trans.State.Strict (StateT, runStateT, evalStateT)+import Control.Monad.Writer.Strict (Writer(), runWriter) -import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.Names as N-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Names qualified as N+import Language.PureScript.Constants.Prim qualified as C -import           Language.PureScript.Interactive.Completion   as Interactive-import           Language.PureScript.Interactive.IO           as Interactive-import           Language.PureScript.Interactive.Message      as Interactive-import           Language.PureScript.Interactive.Module       as Interactive-import           Language.PureScript.Interactive.Parser       as Interactive-import           Language.PureScript.Interactive.Printer      as Interactive-import           Language.PureScript.Interactive.Types        as Interactive+import Language.PureScript.Interactive.Completion   as Interactive+import Language.PureScript.Interactive.IO           as Interactive+import Language.PureScript.Interactive.Message      as Interactive+import Language.PureScript.Interactive.Module       as Interactive+import Language.PureScript.Interactive.Parser       as Interactive+import Language.PureScript.Interactive.Printer      as Interactive+import Language.PureScript.Interactive.Types        as Interactive -import           System.Directory (getCurrentDirectory)-import           System.FilePath ((</>))-import           System.FilePath.Glob (glob)+import System.Directory (getCurrentDirectory)+import System.FilePath ((</>))+import System.FilePath.Glob (glob)  -- | Pretty-print errors printErrors :: MonadIO m => P.MultipleErrors -> m ()

@@ -9,17 +9,17 @@ import Prelude import Protolude (ordNub) -import           Control.Monad.IO.Class (MonadIO(..))-import           Control.Monad.State.Class (MonadState(..))-import           Control.Monad.Trans.Reader (asks, runReaderT, ReaderT)-import           Data.List (nub, isPrefixOf, isInfixOf, isSuffixOf, sortBy, stripPrefix)-import           Data.Map (keys)-import           Data.Maybe (mapMaybe)-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.Interactive.Directive as D-import           Language.PureScript.Interactive.Types-import           System.Console.Haskeline+import Control.Monad.IO.Class (MonadIO(..))+import Control.Monad.State.Class (MonadState(..))+import Control.Monad.Trans.Reader (asks, runReaderT, ReaderT)+import Data.List (nub, isPrefixOf, isInfixOf, isSuffixOf, sortBy, stripPrefix)+import Data.Map (keys)+import Data.Maybe (mapMaybe)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Interactive.Directive qualified as D+import Language.PureScript.Interactive.Types (Directive(..), PSCiState, psciExports, psciImports, psciLoadedExterns, replQueryStrings)+import System.Console.Haskeline (Completion(..), CompletionFunc, completeWordWithPrev, listFiles, simpleCompletion)  -- Completions may read the state, but not modify it. type CompletionM = ReaderT PSCiState IO

@@ -9,7 +9,7 @@ import Data.List (isPrefixOf) import Data.Tuple (swap) -import Language.PureScript.Interactive.Types+import Language.PureScript.Interactive.Types (Directive(..))  -- | -- A mapping of directives to the different strings that can be used to invoke

@@ -1,12 +1,12 @@ module Language.PureScript.Interactive.Message where -import           Prelude+import Prelude -import           Data.List (intercalate)-import           Data.Version (showVersion)-import qualified Paths_purescript as Paths-import qualified Language.PureScript.Interactive.Directive as D-import           Language.PureScript.Interactive.Types+import Data.List (intercalate)+import Data.Version (showVersion)+import Paths_purescript qualified as Paths+import Language.PureScript.Interactive.Directive qualified as D+import Language.PureScript.Interactive.Types (Directive)  -- Messages 

@@ -1,13 +1,13 @@ module Language.PureScript.Interactive.Module where -import           Prelude+import Prelude -import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Interactive.Types-import           System.Directory (getCurrentDirectory)-import           System.FilePath (pathSeparator, makeRelative)-import           System.IO.UTF8 (readUTF8FilesT)+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Interactive.Types (ImportedModule, PSCiState, initialInteractivePrint, psciImportedModules, psciInteractivePrint, psciLetBindings)+import System.Directory (getCurrentDirectory)+import System.FilePath (pathSeparator, makeRelative)+import System.IO.UTF8 (readUTF8FilesT)  -- * Support Module 

@@ -6,19 +6,19 @@   , parseCommand   ) where -import           Prelude+import Prelude -import           Control.Monad (join)-import           Data.Bifunctor (bimap)-import           Data.Char (isSpace)-import           Data.List (intercalate)-import qualified Data.List.NonEmpty as NE-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.CST.Monad as CSTM-import qualified Language.PureScript.Interactive.Directive as D-import           Language.PureScript.Interactive.Types+import Control.Monad (join)+import Data.Bifunctor (bimap)+import Data.Char (isSpace)+import Data.List (intercalate)+import Data.List.NonEmpty qualified as NE+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.CST.Monad qualified as CSTM+import Language.PureScript.Interactive.Directive qualified as D+import Language.PureScript.Interactive.Types (Command(..), Directive(..), ReplQuery(..), parseReplQuery, replQueryStrings)  -- | -- Parses a limited set of commands from from .purs-repl

@@ -1,14 +1,14 @@ module Language.PureScript.Interactive.Printer where -import           Prelude+import Prelude -import           Data.List (intersperse)-import qualified Data.Map as M-import           Data.Maybe (mapMaybe)-import qualified Data.Text as T-import           Data.Text (Text)-import qualified Language.PureScript as P-import qualified Text.PrettyPrint.Boxes as Box+import Data.List (intersperse)+import Data.Map qualified as M+import Data.Maybe (mapMaybe)+import Data.Text qualified as T+import Data.Text (Text)+import Language.PureScript qualified as P+import Text.PrettyPrint.Boxes qualified as Box  -- TODO (Christoph): Text version of boxes textT :: Text -> Box.Box

@@ -30,14 +30,14 @@  import Prelude -import qualified Language.PureScript as P-import qualified Data.Map as M-import           Data.List (foldl')-import           Language.PureScript.Sugar.Names.Env (nullImports, primExports)-import           Control.Monad (foldM)-import           Control.Monad.Trans.Except (runExceptT)-import           Control.Monad.Trans.State (execStateT)-import           Control.Monad.Writer.Strict (runWriterT)+import Language.PureScript qualified as P+import Data.Map qualified as M+import Data.List (foldl')+import Language.PureScript.Sugar.Names.Env (nullImports, primExports)+import Control.Monad (foldM)+import Control.Monad.Trans.Except (runExceptT)+import Control.Monad.Trans.State (execStateT)+import Control.Monad.Writer.Strict (runWriterT)   -- | The PSCI configuration.

@@ -6,7 +6,7 @@ import Control.DeepSeq (NFData) import Data.Monoid () import Data.String (IsString(..))-import qualified Data.Aeson as A+import Data.Aeson qualified as A  import Language.PureScript.PSString (PSString) 

@@ -5,21 +5,21 @@  import Prelude -import Control.Monad.Writer.Class+import Control.Monad.Writer.Class (MonadWriter(..), censor)  import Data.Maybe (mapMaybe)-import qualified Data.Set as S+import Data.Set qualified as S import Data.Text (Text)-import qualified Data.Text as Text+import Data.Text qualified as Text import Control.Monad ((<=<))  import Language.PureScript.AST-import Language.PureScript.Errors+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage') import Language.PureScript.Linter.Exhaustive as L import Language.PureScript.Linter.Imports as L-import Language.PureScript.Names-import Language.PureScript.Types-import qualified Language.PureScript.Constants.Libs as C+import Language.PureScript.Names (Ident(..), Qualified(..), QualifiedBy(..), getIdentName, runIdent)+import Language.PureScript.Types (Constraint(..), SourceType, Type(..), everythingWithContextOnTypes)+import Language.PureScript.Constants.Libs qualified as C  -- | Lint the PureScript AST. -- |@@ -182,6 +182,8 @@             errs' = addHint (ErrorInValueDeclaration $ valdeclIdent vd) errs         in           (vars, errs')++    goDecl (ValueFixityDeclaration _ _ (Qualified _ (Left v)) _) = (S.singleton v, mempty)      goDecl (TypeInstanceDeclaration _ _ _ _ _ _ _ _ (ExplicitInstance decls)) = mconcat $ map goDecl decls     goDecl _ = mempty

@@ -11,27 +11,27 @@ import Prelude import Protolude (ordNub) -import Control.Applicative+import Control.Applicative (Applicative(..)) import Control.Arrow (first, second) import Control.Monad (unless)-import Control.Monad.Writer.Class+import Control.Monad.Writer.Class (MonadWriter(..))  import Data.List (foldl', sortOn) import Data.Maybe (fromMaybe)-import qualified Data.Map as M-import qualified Data.Text as T+import Data.Map qualified as M+import Data.Text qualified as T -import Language.PureScript.AST.Binders-import Language.PureScript.AST.Declarations-import Language.PureScript.AST.Literals-import Language.PureScript.Crash-import Language.PureScript.Environment hiding (tyVar)-import Language.PureScript.Errors+import Language.PureScript.AST.Binders (Binder(..))+import Language.PureScript.AST.Declarations (CaseAlternative(..), Expr(..), Guard(..), GuardedExpr(..), pattern MkUnguarded, isTrueExpr)+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.Traversals (everywhereOnValuesM)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType, Environment(..), TypeKind(..))+import Language.PureScript.Errors (MultipleErrors, pattern NullSourceAnn, SimpleErrorMessage(..), SourceSpan, errorMessage') import Language.PureScript.Names as P import Language.PureScript.Pretty.Values (prettyPrintBinderAtom)-import Language.PureScript.Traversals import Language.PureScript.Types as P-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Constants.Prim qualified as C  -- | There are two modes of failure for the redundancy check: --@@ -273,7 +273,7 @@       tellRedundant = tell . errorMessage' ss . uncurry OverlappingPattern . second null . splitAt 5 $ bss'       tellIncomplete = tell . errorMessage' ss $ IncompleteExhaustivityCheck -  -- | We add a Partial constraint by annotating the expression to have type `Partial => _`.+  -- We add a Partial constraint by annotating the expression to have type `Partial => _`.   --   -- The binder information is provided so that it can be embedded in the constraint,   -- and then included in the error message.@@ -297,36 +297,13 @@    -> ModuleName    -> Expr    -> m Expr-checkExhaustiveExpr initSS env mn = onExpr initSS+checkExhaustiveExpr ss env mn = onExpr'   where-  onDecl :: Declaration -> m Declaration-  onDecl (BindingGroupDeclaration bs) = BindingGroupDeclaration <$> mapM (\(sai@((ss, _), _), nk, expr) -> (sai, nk,) <$> onExpr ss expr) bs-  onDecl (ValueDecl sa@(ss, _) name x y [MkUnguarded e]) =-     ValueDecl sa name x y . mkUnguardedExpr <$> censor (addHint (ErrorInValueDeclaration name)) (onExpr ss e)-  onDecl decl = return decl--  onExpr :: SourceSpan -> Expr -> m Expr-  onExpr _ (UnaryMinus ss e) = UnaryMinus ss <$> onExpr ss e-  onExpr _ (Literal ss (ArrayLiteral es)) = Literal ss . ArrayLiteral <$> mapM (onExpr ss) es-  onExpr _ (Literal ss (ObjectLiteral es)) = Literal ss . ObjectLiteral <$> mapM (sndM (onExpr ss)) es-  onExpr ss (Accessor x e) = Accessor x <$> onExpr ss e-  onExpr ss (ObjectUpdate o es) = ObjectUpdate <$> onExpr ss o <*> mapM (sndM (onExpr ss)) es-  onExpr ss (Abs x e) = Abs x <$> onExpr ss e-  onExpr ss (App e1 e2) = App <$> onExpr ss e1 <*> onExpr ss e2-  onExpr ss (IfThenElse e1 e2 e3) = IfThenElse <$> onExpr ss e1 <*> onExpr ss e2 <*> onExpr ss e3-  onExpr ss (Case es cas) = do-    case' <- Case <$> mapM (onExpr ss) es <*> mapM (onCaseAlternative ss) cas-    checkExhaustive ss env mn (length es) cas case'-  onExpr ss (TypedValue x e y) = TypedValue x <$> onExpr ss e <*> pure y-  onExpr ss (Let w ds e) = Let w <$> mapM onDecl ds <*> onExpr ss e-  onExpr _ (PositionedValue ss x e) = PositionedValue ss x <$> onExpr ss e-  onExpr _ expr = return expr--  onCaseAlternative :: SourceSpan -> CaseAlternative -> m CaseAlternative-  onCaseAlternative ss (CaseAlternative x [MkUnguarded e]) = CaseAlternative x . mkUnguardedExpr <$> onExpr ss e-  onCaseAlternative ss (CaseAlternative x es) = CaseAlternative x <$> mapM (onGuardedExpr ss) es--  onGuardedExpr :: SourceSpan -> GuardedExpr -> m GuardedExpr-  onGuardedExpr ss (GuardedExpr guard rhs) = GuardedExpr guard <$> onExpr ss rhs+  (_, onExpr', _) = everywhereOnValuesM pure onExpr pure -  mkUnguardedExpr = pure . MkUnguarded+  onExpr :: Expr -> m Expr+  onExpr e = case e of+    Case es cas ->+      checkExhaustive ss env mn (length es) cas e+    _ ->+      pure e

@@ -8,7 +8,7 @@ import Protolude (ordNub)  import Control.Monad (join, unless, foldM, (<=<))-import Control.Monad.Writer.Class+import Control.Monad.Writer.Class (MonadWriter(..))  import Data.Function (on) import Data.Foldable (for_)@@ -16,18 +16,18 @@ import Data.Maybe (mapMaybe) import Data.Monoid (Sum(..)) import Data.Traversable (forM)-import qualified Data.Text as T-import qualified Data.Map as M+import Data.Text qualified as T+import Data.Map qualified as M -import Language.PureScript.AST.Declarations-import Language.PureScript.AST.SourcePos-import Language.PureScript.Crash-import Language.PureScript.Errors+import Language.PureScript.AST.Declarations (Declaration(..), DeclarationRef(..), ExportSource, ImportDeclarationType(..), Module(..), getTypeRef, isExplicit)+import Language.PureScript.AST.SourcePos (SourceSpan)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage') import Language.PureScript.Names import Language.PureScript.Sugar.Names.Common (warnDuplicateRefs)-import Language.PureScript.Sugar.Names.Env-import Language.PureScript.Sugar.Names.Imports-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Sugar.Names.Env (Env, Exports(..), ImportRecord(..), Imports(..), envModuleExports, nullImports)+import Language.PureScript.Sugar.Names.Imports (ImportDef, findImports)+import Language.PureScript.Constants.Prim qualified as C  -- | -- Map of module name to list of imported names from that module which have

@@ -4,8 +4,8 @@  import Protolude hiding (Type) -import Language.PureScript.AST-import Language.PureScript.Types+import Language.PureScript.AST (Binder(..), Declaration, Expr(..), everywhereWithContextOnValues)+import Language.PureScript.Types (Type(..), WildcardData(..), everythingOnTypes, everywhereOnTypes)  -- | -- Replaces `TypeWildcard _ UnnamedWildcard` with

@@ -9,47 +9,47 @@   , module Actions   ) where -import           Prelude+import Prelude -import           Control.Concurrent.Lifted as C-import           Control.Exception.Base (onException)-import           Control.Monad hiding (sequence)-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.IO.Class-import           Control.Monad.Supply-import           Control.Monad.Trans.Control (MonadBaseControl(..), control)-import           Control.Monad.Trans.State (runStateT)-import           Control.Monad.Writer.Class (MonadWriter(..), censor)-import           Control.Monad.Writer.Strict (runWriterT)-import           Data.Function (on)-import           Data.Foldable (fold, for_)-import           Data.List (foldl', sortOn)-import qualified Data.List.NonEmpty as NEL-import           Data.Maybe (fromMaybe)-import qualified Data.Map as M-import qualified Data.Set as S-import qualified Data.Text as T-import           Language.PureScript.AST-import           Language.PureScript.Crash-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.Docs.Convert as Docs-import           Language.PureScript.Environment-import           Language.PureScript.Errors-import           Language.PureScript.Externs-import           Language.PureScript.Linter-import           Language.PureScript.ModuleDependencies-import           Language.PureScript.Names-import           Language.PureScript.Renamer-import           Language.PureScript.Sugar-import           Language.PureScript.TypeChecker-import           Language.PureScript.Make.BuildPlan-import qualified Language.PureScript.Make.BuildPlan as BuildPlan-import qualified Language.PureScript.Make.Cache as Cache-import           Language.PureScript.Make.Actions as Actions-import           Language.PureScript.Make.Monad as Monad-import qualified Language.PureScript.CoreFn as CF-import           System.Directory (doesFileExist)-import           System.FilePath (replaceExtension)+import Control.Concurrent.Lifted as C+import Control.Exception.Base (onException)+import Control.Monad (foldM, unless, when)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.IO.Class (MonadIO(..))+import Control.Monad.Supply (evalSupplyT, runSupply, runSupplyT)+import Control.Monad.Trans.Control (MonadBaseControl(..), control)+import Control.Monad.Trans.State (runStateT)+import Control.Monad.Writer.Class (MonadWriter(..), censor)+import Control.Monad.Writer.Strict (runWriterT)+import Data.Function (on)+import Data.Foldable (fold, for_)+import Data.List (foldl', sortOn)+import Data.List.NonEmpty qualified as NEL+import Data.Maybe (fromMaybe)+import Data.Map qualified as M+import Data.Set qualified as S+import Data.Text qualified as T+import Language.PureScript.AST (ErrorMessageHint(..), Module(..), SourceSpan(..), getModuleName, getModuleSourceSpan, importPrim)+import Language.PureScript.Crash (internalError)+import Language.PureScript.CST qualified as CST+import Language.PureScript.Docs.Convert qualified as Docs+import Language.PureScript.Environment (initEnvironment)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, defaultPPEOptions, errorMessage', errorMessage'', prettyPrintMultipleErrors)+import Language.PureScript.Externs (ExternsFile, applyExternsFileToEnvironment, moduleToExternsFile)+import Language.PureScript.Linter (Name(..), lint, lintImports)+import Language.PureScript.ModuleDependencies (DependencyDepth(..), moduleSignature, sortModules)+import Language.PureScript.Names (ModuleName, isBuiltinModuleName, runModuleName)+import Language.PureScript.Renamer (renameInModule)+import Language.PureScript.Sugar (Env, collapseBindingGroups, createBindingGroups, desugar, desugarCaseGuards, externsEnv, primEnv)+import Language.PureScript.TypeChecker (CheckState(..), emptyCheckState, typeCheckModule)+import Language.PureScript.Make.BuildPlan (BuildJobResult(..), BuildPlan(..), getResult)+import Language.PureScript.Make.BuildPlan qualified as BuildPlan+import Language.PureScript.Make.Cache qualified as Cache+import Language.PureScript.Make.Actions as Actions+import Language.PureScript.Make.Monad as Monad+import Language.PureScript.CoreFn qualified as CF+import System.Directory (doesFileExist)+import System.FilePath (replaceExtension)  -- | Rebuild a single module. --

@@ -11,53 +11,53 @@   , ffiCodegen'   ) where -import           Prelude+import Prelude -import           Control.Monad hiding (sequence)-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.IO.Class-import           Control.Monad.Reader (asks)-import           Control.Monad.Supply-import           Control.Monad.Trans.Class (MonadTrans(..))-import           Control.Monad.Writer.Class (MonadWriter(..))-import           Data.Aeson (Value(String), (.=), object)-import           Data.Bifunctor (bimap, first)-import           Data.Either (partitionEithers)-import           Data.Foldable (for_)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M-import           Data.Maybe (fromMaybe, maybeToList)-import qualified Data.Set as S-import qualified Data.Text as T-import qualified Data.Text.IO as TIO-import qualified Data.Text.Encoding as TE-import           Data.Time.Clock (UTCTime)-import           Data.Version (showVersion)-import qualified Language.JavaScript.Parser as JS-import           Language.PureScript.AST-import qualified Language.PureScript.Bundle as Bundle-import qualified Language.PureScript.CodeGen.JS as J-import           Language.PureScript.CodeGen.JS.Printer-import qualified Language.PureScript.CoreFn as CF-import qualified Language.PureScript.CoreFn.ToJSON as CFJ-import           Language.PureScript.Crash-import qualified Language.PureScript.CST as CST-import qualified Language.PureScript.Docs.Prim as Docs.Prim-import qualified Language.PureScript.Docs.Types as Docs-import           Language.PureScript.Errors-import           Language.PureScript.Externs (ExternsFile, externsFileName)-import           Language.PureScript.Make.Monad-import           Language.PureScript.Make.Cache-import           Language.PureScript.Names-import           Language.PureScript.Options hiding (codegenTargets)-import           Language.PureScript.Pretty.Common (SMap(..))-import qualified Paths_purescript as Paths-import           SourceMap-import           SourceMap.Types-import           System.Directory (getCurrentDirectory)-import           System.FilePath ((</>), makeRelative, splitPath, normalise, splitDirectories)-import qualified System.FilePath.Posix as Posix-import           System.IO (stderr)+import Control.Monad (unless, when)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.IO.Class (MonadIO(..))+import Control.Monad.Reader (asks)+import Control.Monad.Supply (SupplyT)+import Control.Monad.Trans.Class (MonadTrans(..))+import Control.Monad.Writer.Class (MonadWriter(..))+import Data.Aeson (Value(String), (.=), object)+import Data.Bifunctor (bimap, first)+import Data.Either (partitionEithers)+import Data.Foldable (for_)+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M+import Data.Maybe (fromMaybe, maybeToList)+import Data.Set qualified as S+import Data.Text qualified as T+import Data.Text.IO qualified as TIO+import Data.Text.Encoding qualified as TE+import Data.Time.Clock (UTCTime)+import Data.Version (showVersion)+import Language.JavaScript.Parser qualified as JS+import Language.PureScript.AST (SourcePos(..))+import Language.PureScript.Bundle qualified as Bundle+import Language.PureScript.CodeGen.JS qualified as J+import Language.PureScript.CodeGen.JS.Printer (prettyPrintJS, prettyPrintJSWithSourceMaps)+import Language.PureScript.CoreFn qualified as CF+import Language.PureScript.CoreFn.ToJSON qualified as CFJ+import Language.PureScript.Crash (internalError)+import Language.PureScript.CST qualified as CST+import Language.PureScript.Docs.Prim qualified as Docs.Prim+import Language.PureScript.Docs.Types qualified as Docs+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage, errorMessage')+import Language.PureScript.Externs (ExternsFile, externsFileName)+import Language.PureScript.Make.Monad (Make, copyFile, getTimestamp, getTimestampMaybe, hashFile, makeIO, readExternsFile, readJSONFile, readTextFile, writeCborFile, writeJSONFile, writeTextFile)+import Language.PureScript.Make.Cache (CacheDb, ContentHash, normaliseForCache)+import Language.PureScript.Names (Ident(..), ModuleName, runModuleName)+import Language.PureScript.Options (CodegenTarget(..), Options(..))+import Language.PureScript.Pretty.Common (SMap(..))+import Paths_purescript qualified as Paths+import SourceMap (generate)+import SourceMap.Types (Mapping(..), Pos(..), SourceMapping(..))+import System.Directory (getCurrentDirectory)+import System.FilePath ((</>), makeRelative, splitPath, normalise, splitDirectories)+import System.FilePath.Posix qualified as Posix+import System.IO (stderr)  -- | Determines when to rebuild a module data RebuildPolicy

@@ -9,28 +9,28 @@   , needsRebuild   ) where -import           Prelude+import Prelude -import           Control.Concurrent.Async.Lifted as A-import           Control.Concurrent.Lifted as C-import           Control.Monad.Base (liftBase)-import           Control.Monad hiding (sequence)-import           Control.Monad.Trans.Control (MonadBaseControl(..))-import           Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)-import           Data.Foldable (foldl')-import qualified Data.Map as M-import           Data.Maybe (fromMaybe, mapMaybe)-import           Data.Time.Clock (UTCTime)-import           Language.PureScript.AST-import           Language.PureScript.Crash-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Errors-import           Language.PureScript.Externs-import           Language.PureScript.Make.Actions as Actions-import           Language.PureScript.Make.Cache-import           Language.PureScript.Names (ModuleName)-import           Language.PureScript.Sugar.Names.Env-import           System.Directory (getCurrentDirectory)+import Control.Concurrent.Async.Lifted as A+import Control.Concurrent.Lifted as C+import Control.Monad.Base (liftBase)+import Control.Monad (foldM)+import Control.Monad.Trans.Control (MonadBaseControl(..))+import Control.Monad.Trans.Maybe (MaybeT(..), runMaybeT)+import Data.Foldable (foldl')+import Data.Map qualified as M+import Data.Maybe (fromMaybe, mapMaybe)+import Data.Time.Clock (UTCTime)+import Language.PureScript.AST (Module, getModuleName)+import Language.PureScript.Crash (internalError)+import Language.PureScript.CST qualified as CST+import Language.PureScript.Errors (MultipleErrors(..))+import Language.PureScript.Externs (ExternsFile)+import Language.PureScript.Make.Actions as Actions+import Language.PureScript.Make.Cache (CacheDb, CacheInfo, checkChanged)+import Language.PureScript.Names (ModuleName)+import Language.PureScript.Sugar.Names.Env (Env, primEnv)+import System.Directory (getCurrentDirectory)  -- | The BuildPlan tracks information about our build progress, and holds all -- prebuilt modules for incremental builds.

@@ -13,13 +13,13 @@ import Control.Category ((>>>)) import Control.Monad ((>=>)) import Crypto.Hash (HashAlgorithm, Digest, SHA512)-import qualified Crypto.Hash as Hash-import qualified Data.Aeson as Aeson+import Crypto.Hash qualified as Hash+import Data.Aeson qualified as Aeson import Data.Align (align) import Data.ByteArray.Encoding (Base(Base16), convertToBase, convertFromBase)-import qualified Data.ByteString as BS+import Data.ByteString qualified as BS import Data.Map (Map)-import qualified Data.Map as Map+import Data.Map qualified as Map import Data.Maybe (fromMaybe) import Data.Monoid (All(..)) import Data.Set (Set)@@ -28,7 +28,7 @@ import Data.These (These(..)) import Data.Time.Clock (UTCTime) import Data.Traversable (for)-import qualified System.FilePath as FilePath+import System.FilePath qualified as FilePath  import Language.PureScript.Names (ModuleName) 

@@ -19,34 +19,34 @@   , copyFile   ) where -import           Prelude+import Prelude -import           Codec.Serialise (Serialise)-import qualified Codec.Serialise as Serialise-import           Control.Exception (fromException, tryJust)-import           Control.Monad (join, guard)-import           Control.Monad.Base (MonadBase(..))-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.IO.Class-import           Control.Monad.Logger-import           Control.Monad.Reader (MonadReader(..), ReaderT(..))-import           Control.Monad.Trans.Control (MonadBaseControl(..))-import           Control.Monad.Trans.Except-import           Control.Monad.Writer.Class (MonadWriter(..))-import qualified Data.Aeson as Aeson-import qualified Data.ByteString as B-import           Data.Text (Text)-import qualified Data.Text as Text-import           Data.Time.Clock (UTCTime)-import           Language.PureScript.Errors-import           Language.PureScript.Externs (ExternsFile, externsIsCurrentVersion)-import           Language.PureScript.Make.Cache (ContentHash, hash)-import           Language.PureScript.Options-import           System.Directory (createDirectoryIfMissing, getModificationTime)-import qualified System.Directory as Directory-import           System.FilePath (takeDirectory)-import           System.IO.Error (tryIOError, isDoesNotExistError)-import           System.IO.UTF8 (readUTF8FileT)+import Codec.Serialise (Serialise)+import Codec.Serialise qualified as Serialise+import Control.Exception (fromException, tryJust)+import Control.Monad (join, guard)+import Control.Monad.Base (MonadBase(..))+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.IO.Class (MonadIO(..))+import Control.Monad.Logger (Logger, runLogger')+import Control.Monad.Reader (MonadReader(..), ReaderT(..))+import Control.Monad.Trans.Control (MonadBaseControl(..))+import Control.Monad.Trans.Except (ExceptT, runExceptT)+import Control.Monad.Writer.Class (MonadWriter(..))+import Data.Aeson qualified as Aeson+import Data.ByteString qualified as B+import Data.Text (Text)+import Data.Text qualified as Text+import Data.Time.Clock (UTCTime)+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors, SimpleErrorMessage(..), singleError)+import Language.PureScript.Externs (ExternsFile, externsIsCurrentVersion)+import Language.PureScript.Make.Cache (ContentHash, hash)+import Language.PureScript.Options (Options)+import System.Directory (createDirectoryIfMissing, getModificationTime)+import System.Directory qualified as Directory+import System.FilePath (takeDirectory)+import System.IO.Error (tryIOError, isDoesNotExistError)+import System.IO.UTF8 (readUTF8FileT)  -- | A monad for running make actions newtype Make a = Make

@@ -7,16 +7,16 @@   , moduleSignature   ) where -import           Protolude hiding (head)+import Protolude hiding (head) -import           Data.Array ((!))-import           Data.Graph-import qualified Data.Set as S-import           Language.PureScript.AST-import qualified Language.PureScript.Constants.Prim as C-import           Language.PureScript.Crash-import           Language.PureScript.Errors hiding (nonEmpty)-import           Language.PureScript.Names+import Data.Array ((!))+import Data.Graph (SCC(..), graphFromEdges, reachable, stronglyConnComp)+import Data.Set qualified as S+import Language.PureScript.AST (Declaration(..), ErrorMessageHint(..), Module(..), SourceSpan)+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage', errorMessage'', parU)+import Language.PureScript.Names (ModuleName)  -- | A list of modules with their transitive dependencies type ModuleGraph = [(ModuleName, [ModuleName])]

@@ -9,16 +9,16 @@  import Codec.Serialise (Serialise) import Control.Applicative ((<|>))-import Control.Monad.Supply.Class+import Control.Monad.Supply.Class (MonadSupply(..)) import Control.DeepSeq (NFData) import Data.Functor.Contravariant (contramap)-import qualified Data.Vector as V+import Data.Vector qualified as V  import GHC.Generics (Generic)-import Data.Aeson-import Data.Aeson.TH+import Data.Aeson (FromJSON(..), FromJSONKey(..), Options(..), SumEncoding(..), ToJSON(..), ToJSONKey(..), defaultOptions, parseJSON2, toJSON2, withArray)+import Data.Aeson.TH (deriveJSON) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.AST.SourcePos (SourcePos, pattern SourcePos) 

@@ -2,9 +2,9 @@ module Language.PureScript.Options where  import Prelude-import qualified Data.Set as S+import Data.Set qualified as S import Data.Map (Map)-import qualified Data.Map as Map+import Data.Map qualified as Map  -- | The data type of compiler options data Options = Options

@@ -15,24 +15,24 @@ import Control.DeepSeq (NFData) import Control.Exception (try, evaluate) import Control.Applicative ((<|>))-import qualified Data.Char as Char+import Data.Char qualified as Char import Data.Bits (shiftR) import Data.Either (fromRight) import Data.List (unfoldr) import Data.Scientific (toBoundedInteger) import Data.String (IsString(..)) import Data.ByteString (ByteString)-import qualified Data.ByteString as BS+import Data.ByteString qualified as BS import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T import Data.Text.Encoding (decodeUtf16BE) import Data.Text.Encoding.Error (UnicodeException)-import qualified Data.Vector as V+import Data.Vector qualified as V import Data.Word (Word16, Word8) import Numeric (showHex) import System.IO.Unsafe (unsafePerformIO)-import qualified Data.Aeson as A-import qualified Data.Aeson.Types as A+import Data.Aeson qualified as A+import Data.Aeson.Types qualified as A  -- | -- Strings in PureScript are sequences of UTF-16 code units, which do not

@@ -9,13 +9,13 @@  import Data.List (elemIndices, intersperse) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T  import Language.PureScript.AST (SourcePos(..), SourceSpan(..), nullSourceSpan) import Language.PureScript.CST.Lexer (isUnquotedKey) -import Text.PrettyPrint.Boxes hiding ((<>))-import qualified Text.PrettyPrint.Boxes as Box+import Text.PrettyPrint.Boxes (Box(..), emptyBox, text, top, vcat, (//))+import Text.PrettyPrint.Boxes qualified as Box  parensT :: Text -> Text parensT s = "(" <> s <> ")"@@ -61,9 +61,7 @@       plus (a, c) (StrPos (a', _, c')) = (a `addPos` a', (bumpPos a <$> c') : c)  instance Emit StrPos where-  -- |   -- Augment a string with its length (rows/column)-  --   emit str =     -- TODO(Christoph): get rid of T.unpack     let newlines = elemIndices '\n' (T.unpack str)@@ -71,9 +69,7 @@     in     StrPos (SourcePos { sourcePosLine = length newlines, sourcePosColumn = T.length str - index }, str, []) -  -- |   -- Add a new mapping entry for given source position with initially zero generated position-  --   addMapping ss@SourceSpan { spanName = file, spanStart = startPos } = StrPos (zeroPos, mempty, [ mapping | ss /= nullSourceSpan ])     where       mapping = SMap (T.pack file) startPos zeroPos

@@ -1,6 +1,3 @@--- HLint is confused by the identifier `pattern` if PatternSynonyms is enabled.-{-# LANGUAGE NoPatternSynonyms #-}- -- | -- Pretty printer for Types --@@ -27,17 +24,17 @@ import Data.Bifunctor (first) import Data.Maybe (fromMaybe, catMaybes) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T -import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Names-import Language.PureScript.Pretty.Common-import Language.PureScript.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (tyFunction, tyRecord)+import Language.PureScript.Names (OpName(..), OpNameType(..), ProperName(..), ProperNameType(..), Qualified, coerceProperName, disqualify, showQualified)+import Language.PureScript.Pretty.Common (before, objectKeyRequiresQuoting)+import Language.PureScript.Types (Constraint(..), pattern REmptyKinded, RowListItem(..), Type(..), WildcardData(..), eqType, rowToSortedList) import Language.PureScript.PSString (PSString, prettyPrintString, decodeString) import Language.PureScript.Label (Label(..)) -import Text.PrettyPrint.Boxes hiding ((<+>))+import Text.PrettyPrint.Boxes (Box(..), hcat, hsep, left, moveRight, nullBox, render, text, top, vcat, (<>))  data PrettyPrintType   = PPTUnknown Int

@@ -12,19 +12,19 @@ import Control.Arrow (second)  import Data.Text (Text)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Monoid as Monoid ((<>))-import qualified Data.Text as T+import Data.List.NonEmpty qualified as NEL+import Data.Monoid qualified as Monoid ((<>))+import Data.Text qualified as T -import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Names-import Language.PureScript.Pretty.Common+import Language.PureScript.AST (AssocList(..), Binder(..), CaseAlternative(..), Declaration(..), DoNotationElement(..), Expr(..), Guard(..), GuardedExpr(..), Literal(..), PathNode(..), PathTree(..), TypeDeclarationData(..), pattern ValueDecl, WhereProvenance(..))+import Language.PureScript.Crash (internalError)+import Language.PureScript.Names (OpName(..), ProperName(..), Qualified(..), disqualify, runModuleName, showIdent)+import Language.PureScript.Pretty.Common (before, beforeWithSpace, parensT) import Language.PureScript.Pretty.Types (typeAsBox, typeAtomAsBox, prettyPrintObjectKey) import Language.PureScript.Types (Constraint(..)) import Language.PureScript.PSString (PSString, prettyPrintString) -import Text.PrettyPrint.Boxes+import Text.PrettyPrint.Boxes (Box, left, moveRight, text, vcat, vsep, (//), (<>))  -- TODO(Christoph): remove T.unpack s 

@@ -23,29 +23,29 @@ import Control.Category ((>>>)) import Control.Monad.Writer.Strict (MonadWriter, WriterT, runWriterT, tell) -import qualified Data.ByteString.Lazy as BL+import Data.ByteString.Lazy qualified as BL import Data.String (String, lines) import Data.List (stripPrefix, (\\))-import qualified Data.Text as T+import Data.Text qualified as T import Data.Time.Clock (UTCTime) import Data.Time.Clock.POSIX (posixSecondsToUTCTime)-import Data.Version-import qualified Distribution.SPDX as SPDX-import qualified Distribution.Parsec as CabalParsec+import Data.Version (Version)+import Distribution.SPDX qualified as SPDX+import Distribution.Parsec qualified as CabalParsec  import System.Directory (doesFileExist) import System.FilePath.Glob (globDir1) import System.Process (readProcess)  import Web.Bower.PackageMeta (PackageMeta(..), PackageName, Repository(..))-import qualified Web.Bower.PackageMeta as Bower+import Web.Bower.PackageMeta qualified as Bower -import Language.PureScript.Publish.ErrorsWarnings-import Language.PureScript.Publish.Registry.Compat-import Language.PureScript.Publish.Utils-import qualified Language.PureScript as P (version, ModuleName)-import qualified Language.PureScript.CoreFn.FromJSON as P-import qualified Language.PureScript.Docs as D+import Language.PureScript.Publish.ErrorsWarnings (InternalError(..), OtherError(..), PackageError(..), PackageWarning(..), RepositoryFieldError(..), UserError(..), printError, printWarnings)+import Language.PureScript.Publish.Registry.Compat (asPursJson, toBowerPackage)+import Language.PureScript.Publish.Utils (globRelative, purescriptSourceFiles)+import Language.PureScript qualified as P (version, ModuleName)+import Language.PureScript.CoreFn.FromJSON qualified as P+import Language.PureScript.Docs qualified as D import Data.Aeson.BetterErrors (Parse, withString, eachInObjectWithKey, asString, key, keyMay, parse, mapError) import Language.PureScript.Docs.Types (ManifestError(BowerManifest, PursManifest)) 

@@ -7,10 +7,10 @@ import Prelude  import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T import System.IO (hPutStr, stderr) -import qualified Text.PrettyPrint.Boxes as Boxes+import Text.PrettyPrint.Boxes qualified as Boxes  width :: Int width = 79

@@ -19,19 +19,19 @@ import Data.Aeson.BetterErrors (ParseError, displayError) import Data.List (intersperse) import Data.List.NonEmpty (NonEmpty(..))-import Data.Maybe-import Data.Monoid-import Data.Version-import qualified Data.List.NonEmpty as NonEmpty+import Data.Maybe (catMaybes, fromMaybe)+import Data.Monoid (Any(..))+import Data.Version (Version, showVersion)+import Data.List.NonEmpty qualified as NonEmpty import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T -import qualified Language.PureScript.Docs.Types as D-import qualified Language.PureScript as P-import Language.PureScript.Publish.BoxesHelpers+import Language.PureScript.Docs.Types qualified as D+import Language.PureScript qualified as P+import Language.PureScript.Publish.BoxesHelpers (Box, bulletedList, bulletedListT, indented, nullBox, para, printToStderr, spacer, successivelyIndented, vcat)  import Web.Bower.PackageMeta (PackageName, runPackageName, showBowerError)-import qualified Web.Bower.PackageMeta as Bower+import Web.Bower.PackageMeta qualified as Bower import Language.PureScript.Docs.Types (showManifestError)  -- | An error which meant that it was not possible to retrieve metadata for a

@@ -8,8 +8,8 @@ module Language.PureScript.Publish.Registry.Compat where  import Protolude-import qualified Data.Map as Map-import qualified Web.Bower.PackageMeta as Bower+import Data.Map qualified as Map+import Web.Bower.PackageMeta qualified as Bower import Data.Bitraversable (Bitraversable(..)) import Data.Aeson.BetterErrors (key, asText, keyMay, eachInObject, Parse, throwCustomError) 

@@ -2,7 +2,7 @@ 
 import Prelude 
-import System.Directory+import System.Directory (getCurrentDirectory) import System.FilePath.Glob (Pattern, compile, globDir1) 
 -- | Glob relative to the current directory, and produce relative pathnames.

@@ -5,18 +5,18 @@  import Prelude -import Control.Monad.State+import Control.Monad.State (MonadState(..), State, gets, modify, runState, (>=>))  import Data.Functor ((<&>)) import Data.List (find) import Data.Maybe (fromJust, fromMaybe)-import qualified Data.Map as M-import qualified Data.Set as S-import qualified Data.Text as T+import Data.Map qualified as M+import Data.Set qualified as S+import Data.Text qualified as T -import Language.PureScript.CoreFn-import Language.PureScript.Names-import Language.PureScript.Traversals+import Language.PureScript.CoreFn (Ann, Bind(..), Binder(..), CaseAlternative(..), Expr(..), Literal(..), Module(..))+import Language.PureScript.Names (Ident(..), Qualified(..), isBySourcePos, isPlainIdent, runIdent, showIdent)+import Language.PureScript.Traversals (eitherM, pairM, sndM)  -- | -- The state object used in this module

@@ -12,8 +12,8 @@  import Codec.Serialise (Serialise) import Control.DeepSeq (NFData)-import qualified Data.Aeson as A-import qualified Data.Aeson.TH as A+import Data.Aeson qualified as A+import Data.Aeson.TH qualified as A import Data.Text (Text) import GHC.Generics (Generic) 

@@ -4,16 +4,16 @@ module Language.PureScript.Sugar (desugar, module S) where  import Control.Category ((>>>))-import Control.Monad+import Control.Monad ((>=>)) import Control.Monad.Error.Class (MonadError) import Control.Monad.Supply.Class (MonadSupply) import Control.Monad.State.Class (MonadState) import Control.Monad.Writer.Class (MonadWriter) -import Language.PureScript.AST-import Language.PureScript.Errors-import Language.PureScript.Externs-import Language.PureScript.Linter.Imports+import Language.PureScript.AST (Module)+import Language.PureScript.Errors (MultipleErrors)+import Language.PureScript.Externs (ExternsFile)+import Language.PureScript.Linter.Imports (UsedImports) import Language.PureScript.Sugar.BindingGroups as S import Language.PureScript.Sugar.CaseDeclarations as S import Language.PureScript.Sugar.DoNotation as S

@@ -3,16 +3,16 @@  module Language.PureScript.Sugar.AdoNotation (desugarAdoModule) where -import           Prelude hiding (abs)+import Prelude hiding (abs) -import           Control.Monad (foldM)-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.Supply.Class-import           Data.List (foldl')-import           Language.PureScript.AST-import           Language.PureScript.Errors-import           Language.PureScript.Names-import qualified Language.PureScript.Constants.Libs as C+import Control.Monad (foldM)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.Supply.Class (MonadSupply)+import Data.List (foldl')+import Language.PureScript.AST (Binder(..), CaseAlternative(..), Declaration, DoNotationElement(..), Expr(..), pattern MkUnguarded, Module(..), SourceSpan, WhereProvenance(..), declSourceSpan, everywhereOnValuesM)+import Language.PureScript.Errors (MultipleErrors, parU, rethrowWithPosition)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, Qualified(..), byMaybeModuleName, freshIdent')+import Language.PureScript.Constants.Libs qualified as C  -- | Replace all @AdoNotationBind@ and @AdoNotationValue@ constructors with -- applications of the pure and apply functions in scope, and all @AdoNotationLet@

@@ -14,22 +14,22 @@ import Control.Monad ((<=<), guard) import Control.Monad.Error.Class (MonadError(..)) -import Data.Graph+import Data.Graph (SCC(..), stronglyConnComp, stronglyConnCompR) import Data.List (intersect, (\\)) import Data.List.NonEmpty (NonEmpty((:|)), nonEmpty) import Data.Foldable (find) import Data.Functor (($>)) import Data.Maybe (isJust, mapMaybe)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M-import qualified Data.Set as S+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M+import Data.Set qualified as S  import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors hiding (nonEmpty)-import Language.PureScript.Names-import Language.PureScript.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (NameKind)+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors(..), SimpleErrorMessage(..), errorMessage', parU, positionedError)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident, ModuleName, ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName)+import Language.PureScript.Types (Constraint(..), SourceConstraint, SourceType, Type(..), everythingOnTypes)  data VertexType   = VertexDefinition@@ -62,9 +62,7 @@   handleExprs (Let w ds val) = (\ds' -> Let w ds' val) <$> handleDecls ds   handleExprs other = return other -  -- |   -- Replace all sets of mutually-recursive declarations with binding groups-  --   handleDecls :: [Declaration] -> m [Declaration]   handleDecls ds = do     let values = mapMaybe (fmap (fmap extractGuardedExpr) . getValueDeclaration) ds

@@ -16,13 +16,13 @@  import Control.Monad ((<=<), forM, replicateM, join, unless) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.Supply.Class+import Control.Monad.Supply.Class (MonadSupply)  import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (NameKind(..))+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors(..), SimpleErrorMessage(..), addHint, errorMessage', parU, rethrow, withPosition)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident, Qualified(..), freshIdent') import Language.PureScript.TypeChecker.Monad (guardWith)  -- |

@@ -3,18 +3,18 @@  module Language.PureScript.Sugar.DoNotation (desugarDoModule) where -import           Prelude+import Prelude -import           Control.Applicative ((<|>))-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.Supply.Class-import           Data.Maybe (fromMaybe)-import           Data.Monoid (First(..))-import           Language.PureScript.AST-import           Language.PureScript.Crash-import           Language.PureScript.Errors-import           Language.PureScript.Names-import qualified Language.PureScript.Constants.Libs as C+import Control.Applicative ((<|>))+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.Supply.Class (MonadSupply)+import Data.Maybe (fromMaybe)+import Data.Monoid (First(..))+import Language.PureScript.AST (Binder(..), CaseAlternative(..), Declaration, DoNotationElement(..), Expr(..), pattern MkUnguarded, Module(..), SourceSpan, pattern ValueDecl, WhereProvenance(..), binderNames, declSourceSpan, everywhereOnValuesM)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage, errorMessage', parU, rethrowWithPosition)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, Qualified(..), byMaybeModuleName, freshIdent')+import Language.PureScript.Constants.Libs qualified as C  -- | Replace all @DoNotationBind@ and @DoNotationValue@ constructors with -- applications of the bind function in scope, and all @DoNotationLet@

@@ -9,8 +9,8 @@ import Data.List (groupBy) import Data.Function (on) -import Language.PureScript.AST-import Language.PureScript.Crash+import Language.PureScript.AST (Binder, CaseAlternative(..), Declaration(..), Expr(..), pattern MkUnguarded, Module(..), SourceAnn, WhereProvenance, everywhereOnValues)+import Language.PureScript.Crash (internalError)  -- | Replace every @BoundValueDeclaration@ in @Let@ expressions with @Case@ -- expressions.@@ -28,11 +28,11 @@   replace other = other    go :: WhereProvenance-     -- ^ Metadata about whether the let-in was a where clause+          -- Metadata about whether the let-in was a where clause      -> [Either [Declaration] (SourceAnn, Binder, Expr)]-     -- ^ Declarations to desugar+          -- Declarations to desugar      -> Expr-     -- ^ The original let-in result expression+          -- The original let-in result expression      -> Expr   go _ [] e = e   go w (Right ((pos, com), binder, boundE) : ds) e =

@@ -13,27 +13,27 @@ import Protolude (sortOn, swap, foldl')  import Control.Arrow (first, second, (&&&))-import Control.Monad+import Control.Monad (foldM, when, (>=>)) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.State.Lazy+import Control.Monad.State.Lazy (MonadState, StateT(..), gets, modify) import Control.Monad.Writer (MonadWriter(..)) -import qualified Data.List.NonEmpty as NEL+import Data.List.NonEmpty qualified as NEL import Data.Maybe (fromMaybe, mapMaybe)-import qualified Data.Map as M-import qualified Data.Set as S+import Data.Map qualified as M+import Data.Set qualified as S  import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors-import Language.PureScript.Externs-import Language.PureScript.Linter.Imports-import Language.PureScript.Names-import Language.PureScript.Sugar.Names.Env-import Language.PureScript.Sugar.Names.Exports-import Language.PureScript.Sugar.Names.Imports-import Language.PureScript.Traversals-import Language.PureScript.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage, errorMessage'', nonEmpty, parU, warnAndRethrow, warnAndRethrowWithPosition)+import Language.PureScript.Externs (ExternsDeclaration(..), ExternsFile(..), ExternsImport(..))+import Language.PureScript.Linter.Imports (Name(..), UsedImports)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident, OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..))+import Language.PureScript.Sugar.Names.Env (Env, Exports(..), ImportProvenance(..), ImportRecord(..), Imports(..), checkImportConflicts, nullImports, primEnv)+import Language.PureScript.Sugar.Names.Exports (findExportable, resolveExports)+import Language.PureScript.Sugar.Names.Imports (resolveImports, resolveModuleImport)+import Language.PureScript.Traversals (defS, sndM)+import Language.PureScript.Types (Constraint(..), SourceConstraint, SourceType, Type(..), everywhereOnTypesM)  -- | -- Replaces all local names with qualified names.

@@ -9,9 +9,9 @@ import Data.List (group, sort, (\\)) import Data.Maybe (mapMaybe) -import Language.PureScript.AST-import Language.PureScript.Errors-import Language.PureScript.Names+import Language.PureScript.AST (DeclarationRef(..), SourceSpan)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage, errorMessage, warnWithPosition)+import Language.PureScript.Names (Name(..))  -- | -- Warns about duplicate values in a list of declaration refs.

@@ -20,7 +20,7 @@  import Prelude -import Control.Monad+import Control.Monad (forM_, when) import Control.Monad.Error.Class (MonadError(..)) import Control.Monad.Writer.Class (MonadWriter(..)) @@ -29,15 +29,15 @@ import Data.List (groupBy, sortOn, delete) import Data.Maybe (mapMaybe) import Safe (headMay)-import qualified Data.Map as M-import qualified Data.Set as S+import Data.Map qualified as M+import Data.Set qualified as S -import qualified Language.PureScript.Constants.Prim as C-import Language.PureScript.AST-import Language.PureScript.Crash+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.AST (ExportSource(..), SourceSpan, internalModuleSourceSpan, nullSourceSpan)+import Language.PureScript.Crash (internalError) import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage, errorMessage')+import Language.PureScript.Names (Ident, ModuleName, Name(..), OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, disqualify, getQual)  -- | -- The details for an import: the name of the thing that is being imported

@@ -5,7 +5,7 @@  import Prelude -import Control.Monad+import Control.Monad (filterM, foldM, liftM2, unless, void, when) import Control.Monad.Writer.Class (MonadWriter(..)) import Control.Monad.Error.Class (MonadError(..)) @@ -13,13 +13,13 @@ import Data.Foldable (traverse_) import Data.List (intersect, groupBy, sortOn) import Data.Maybe (fromMaybe, mapMaybe)-import qualified Data.Map as M+import Data.Map qualified as M  import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Sugar.Names.Env+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage', rethrow, rethrowWithPosition, warnAndRethrow)+import Language.PureScript.Names (Ident, ModuleName, Name(..), OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), disqualifyFor, isQualifiedWith, isUnqualified)+import Language.PureScript.Sugar.Names.Env (Env, ExportMode(..), Exports(..), ImportRecord(..), Imports(..), checkImportConflicts, envModuleExports, exportType, exportTypeClass, exportTypeOp, exportValue, exportValueOp, nullExports) import Language.PureScript.Sugar.Names.Common (warnDuplicateRefs)  -- |

@@ -7,19 +7,19 @@  import Prelude -import Control.Monad+import Control.Monad (foldM, when) import Control.Monad.Error.Class (MonadError(..))  import Data.Foldable (for_, traverse_) import Data.Maybe (fromMaybe)-import qualified Data.Map as M-import qualified Data.Set as S+import Data.Map qualified as M+import Data.Set qualified as S -import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Sugar.Names.Env+import Language.PureScript.AST (Declaration(..), DeclarationRef(..), ErrorMessageHint(..), ExportSource(..), ImportDeclarationType(..), Module(..), SourceSpan, internalModuleSourceSpan)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage', rethrow)+import Language.PureScript.Names (pattern ByNullSourcePos, ModuleName, Name(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), byMaybeModuleName)+import Language.PureScript.Sugar.Names.Env (Env, Exports(..), ImportProvenance(..), ImportRecord(..), Imports(..), envModuleExports, nullImports)  type ImportDef = (SourceSpan, ImportDeclarationType, Maybe ModuleName) 

@@ -3,19 +3,19 @@   , desugarDecl   ) where -import           Prelude+import Prelude -import           Control.Monad (forM)-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.Supply.Class-import           Data.Foldable (toList)-import           Data.List (foldl')-import           Data.Maybe (catMaybes)-import           Language.PureScript.AST-import           Language.PureScript.Environment (NameKind(..))-import           Language.PureScript.Errors-import           Language.PureScript.Names-import           Language.PureScript.PSString (PSString)+import Control.Monad (forM)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.Supply.Class (MonadSupply)+import Data.Foldable (toList)+import Data.List (foldl')+import Data.Maybe (catMaybes)+import Language.PureScript.AST+import Language.PureScript.Environment (NameKind(..))+import Language.PureScript.Errors (MultipleErrors, rethrowWithPosition)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident, Qualified(..), freshIdent')+import Language.PureScript.PSString (PSString)   desugarObjectConstructors

@@ -16,15 +16,15 @@ import Prelude  import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors-import Language.PureScript.Externs-import Language.PureScript.Names-import Language.PureScript.Sugar.Operators.Binders-import Language.PureScript.Sugar.Operators.Expr-import Language.PureScript.Sugar.Operators.Types+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage, errorMessage', parU, rethrow, rethrowWithPosition)+import Language.PureScript.Externs (ExternsFile(..), ExternsFixity(..), ExternsTypeFixity(..))+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), Name(..), OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), freshIdent')+import Language.PureScript.Sugar.Operators.Binders (matchBinderOperators)+import Language.PureScript.Sugar.Operators.Expr (matchExprOperators)+import Language.PureScript.Sugar.Operators.Types (matchTypeOperators) import Language.PureScript.Traversals (defS, sndM)-import Language.PureScript.Types+import Language.PureScript.Types (Constraint(..), SourceType, Type(..), everywhereOnTypesTopDownM, overConstraintArgs)  import Control.Monad (unless, (<=<)) import Control.Monad.Error.Class (MonadError(..))@@ -37,10 +37,10 @@ import Data.Functor.Identity (Identity(..), runIdentity) import Data.List (groupBy, sortOn) import Data.Maybe (mapMaybe, listToMaybe)-import qualified Data.Map as M+import Data.Map qualified as M import Data.Ord (Down(..)) -import qualified Language.PureScript.Constants.Libs as C+import Language.PureScript.Constants.Libs qualified as C  -- | -- Removes unary negation operators and replaces them with calls to `negate`.@@ -212,7 +212,7 @@     fmap (map (\d -> if pred_ d then removeParens d else d)) .     flip parU (usingPredicate pred_ h) -  -- | The AST will run through all the desugar passes when compiling+  -- The AST will run through all the desugar passes when compiling   -- and only some of the desugar passes when generating docs.   -- When generating docs, `case _ of` syntax used in an instance declaration   -- can trigger the `IncorrectAnonymousArgument` error because it does not

@@ -2,12 +2,12 @@  import Prelude -import Control.Monad.Except+import Control.Monad.Except (MonadError) -import Language.PureScript.AST-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Sugar.Operators.Common+import Language.PureScript.AST (Associativity, Binder(..), SourceSpan)+import Language.PureScript.Errors (MultipleErrors)+import Language.PureScript.Names (OpName(..), OpNameType(..), Qualified(..))+import Language.PureScript.Sugar.Operators.Common (matchOperators)  matchBinderOperators   :: MonadError MultipleErrors m

@@ -2,24 +2,24 @@  import Prelude -import Control.Monad.State-import Control.Monad.Except+import Control.Monad.State (guard, join)+import Control.Monad.Except (MonadError(..))  import Data.Either (rights)-import Data.Functor.Identity+import Data.Functor.Identity (Identity) import Data.List (sortOn) import Data.Maybe (mapMaybe, fromJust)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M -import qualified Text.Parsec as P-import qualified Text.Parsec.Pos as P-import qualified Text.Parsec.Expr as P+import Text.Parsec qualified as P+import Text.Parsec.Pos qualified as P+import Text.Parsec.Expr qualified as P -import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors-import Language.PureScript.Names+import Language.PureScript.AST (Associativity(..), ErrorMessageHint(..), SourceSpan)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors(..), SimpleErrorMessage(..))+import Language.PureScript.Names (OpName, Qualified, eraseOpName)  type Chain a = [Either a a] 

@@ -2,16 +2,16 @@  import Prelude -import Control.Monad.Except-import Data.Functor.Identity+import Control.Monad.Except (MonadError)+import Data.Functor.Identity (Identity) -import qualified Text.Parsec as P-import qualified Text.Parsec.Expr as P+import Text.Parsec qualified as P+import Text.Parsec.Expr qualified as P -import Language.PureScript.AST-import Language.PureScript.Names-import Language.PureScript.Sugar.Operators.Common-import Language.PureScript.Errors+import Language.PureScript.AST (Associativity, Expr(..), SourceSpan)+import Language.PureScript.Names (OpName(..), OpNameType(..), Qualified(..))+import Language.PureScript.Sugar.Operators.Common (Chain, matchOperators, token)+import Language.PureScript.Errors (MultipleErrors)  matchExprOperators   :: MonadError MultipleErrors m

@@ -2,12 +2,12 @@  import Prelude -import Control.Monad.Except-import Language.PureScript.AST-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Sugar.Operators.Common-import Language.PureScript.Types+import Control.Monad.Except (MonadError)+import Language.PureScript.AST (Associativity, SourceSpan)+import Language.PureScript.Errors (MultipleErrors)+import Language.PureScript.Names (OpName(..), OpNameType(..), Qualified(..))+import Language.PureScript.Sugar.Operators.Common (matchOperators)+import Language.PureScript.Types (SourceType, Type(..), srcTypeApp)  matchTypeOperators   :: MonadError MultipleErrors m

@@ -10,30 +10,30 @@  import Prelude -import           Control.Arrow (first, second)-import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.State-import           Control.Monad.Supply.Class-import           Data.Graph-import           Data.List (find, partition)-import           Data.List.NonEmpty (nonEmpty)-import qualified Data.Map as M-import           Data.Maybe (catMaybes, mapMaybe, isJust)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Set as S-import           Data.Text (Text)-import           Data.Traversable (for)-import qualified Language.PureScript.Constants.Prim as C-import           Language.PureScript.Crash-import           Language.PureScript.Environment-import           Language.PureScript.Errors hiding (isExported, nonEmpty)-import           Language.PureScript.Externs-import           Language.PureScript.Label (Label(..))-import           Language.PureScript.Names-import           Language.PureScript.PSString (mkString)-import           Language.PureScript.Sugar.CaseDeclarations-import           Language.PureScript.TypeClassDictionaries (superclassName)-import           Language.PureScript.Types+import Control.Arrow (first, second)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.State (MonadState(..), StateT, evalStateT, modify)+import Control.Monad.Supply.Class (MonadSupply)+import Data.Graph (SCC(..), stronglyConnComp)+import Data.List (find, partition)+import Data.List.NonEmpty (nonEmpty)+import Data.Map qualified as M+import Data.Maybe (catMaybes, mapMaybe, isJust)+import Data.List.NonEmpty qualified as NEL+import Data.Set qualified as S+import Data.Text (Text)+import Data.Traversable (for)+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), NameKind(..), TypeClassData(..), dictTypeName, function, makeTypeClassData, primClasses, primCoerceClasses, primIntClasses, primRowClasses, primRowListClasses, primSymbolClasses, primTypeErrorClasses, tyRecord)+import Language.PureScript.Errors hiding (isExported, nonEmpty)+import Language.PureScript.Externs (ExternsDeclaration(..), ExternsFile(..))+import Language.PureScript.Label (Label(..))+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, Name(..), ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, freshIdent, qualify, runIdent)+import Language.PureScript.PSString (mkString)+import Language.PureScript.Sugar.CaseDeclarations (desugarCases)+import Language.PureScript.TypeClassDictionaries (superclassName)+import Language.PureScript.Types  type MemberMap = M.Map (ModuleName, ProperName 'ClassName) TypeClassData @@ -229,7 +229,6 @@     return (expRef name' className tys, [d, dictDecl])   go other = return (Nothing, [other]) -  -- |   -- Completes the name generation for type class instances that do not have   -- a unique name defined in source code.   desugarInstName :: MonadSupply m => Either Text Ident -> Desugar m Ident

@@ -1,22 +1,22 @@ -- | This module implements the generic deriving elaboration that takes place during desugaring. module Language.PureScript.Sugar.TypeClasses.Deriving (deriveInstances) where -import           Prelude-import           Protolude (note)+import Prelude+import Protolude (note) -import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.Supply.Class (MonadSupply)-import           Data.List (foldl', find, unzip5)-import           Language.PureScript.AST-import           Language.PureScript.AST.Utils-import qualified Language.PureScript.Constants.Libs as Libs-import           Language.PureScript.Crash-import           Language.PureScript.Environment-import           Language.PureScript.Errors-import           Language.PureScript.Names-import           Language.PureScript.PSString (mkString)-import           Language.PureScript.Types-import           Language.PureScript.TypeChecker (checkNewtype)+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.Supply.Class (MonadSupply)+import Data.List (foldl', find, unzip5)+import Language.PureScript.AST (Binder(..), CaseAlternative(..), DataConstructorDeclaration(..), Declaration(..), Expr(..), pattern MkUnguarded, Module(..), SourceSpan(..), TypeInstanceBody(..), pattern ValueDecl)+import Language.PureScript.AST.Utils (UnwrappedTypeConstructor(..), lamCase, unguarded, unwrapTypeConstructor)+import Language.PureScript.Constants.Libs qualified as Libs+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), NameKind(..))+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage')+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), freshIdent)+import Language.PureScript.PSString (mkString)+import Language.PureScript.Types (SourceType, Type(..), WildcardData(..), replaceAllTypeVars, srcTypeApp, srcTypeConstructor, srcTypeLevelString)+import Language.PureScript.TypeChecker (checkNewtype)  -- | Elaborates deriving instance declarations by code generation. deriveInstances

@@ -11,10 +11,10 @@ import Control.Monad (unless) import Control.Monad.Error.Class (MonadError(..)) -import Language.PureScript.AST-import Language.PureScript.Names-import Language.PureScript.Environment-import Language.PureScript.Errors+import Language.PureScript.AST (Declaration(..), ErrorMessageHint(..), Expr(..), GuardedExpr(..), KindSignatureFor(..), pattern MkUnguarded, Module(..), RoleDeclarationData(..), TypeDeclarationData(..), TypeInstanceBody(..), pattern ValueDecl, declSourceSpan, everywhereOnValuesTopDownM)+import Language.PureScript.Names (Ident, coerceProperName)+import Language.PureScript.Environment (DataDeclType(..), NameKind)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage', rethrow)  -- | -- Replace all top level type declarations in a module with type annotations

@@ -19,24 +19,24 @@  import Data.Foldable (for_, traverse_, toList) import Data.List (nub, nubBy, (\\), sort, group)-import Data.Maybe+import Data.Maybe (fromMaybe, listToMaybe, mapMaybe) import Data.Either (partitionEithers) import Data.Text (Text)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M-import qualified Data.Set as S-import qualified Data.Text as T+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M+import Data.Set qualified as S+import Data.Text qualified as T  import Language.PureScript.AST import Language.PureScript.AST.Declarations.ChainId (ChainId)-import qualified Language.PureScript.Constants.Libs as Libs-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Linter-import Language.PureScript.Linter.Wildcards-import Language.PureScript.Names-import Language.PureScript.Roles+import Language.PureScript.Constants.Libs qualified as Libs+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), Environment(..), FunctionalDependency, NameKind(..), NameVisibility(..), TypeClassData(..), TypeKind(..), isDictTypeName, kindArity, makeTypeClassData, nominalRolesForKind, tyFunction)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage, errorMessage', positionedError, rethrow, warnAndRethrow)+import Language.PureScript.Linter (checkExhaustiveExpr)+import Language.PureScript.Linter.Wildcards (ignoreWildcardsUnderCompleteTypeSignatures)+import Language.PureScript.Names (Ident, ModuleName, ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, disqualify, isPlainIdent, mkQualified)+import Language.PureScript.Roles (Role) import Language.PureScript.Sugar.Names.Env (Exports(..)) import Language.PureScript.TypeChecker.Kinds as T import Language.PureScript.TypeChecker.Monad as T@@ -44,8 +44,8 @@ import Language.PureScript.TypeChecker.Synonyms as T import Language.PureScript.TypeChecker.Types as T import Language.PureScript.TypeChecker.Unify (varIfUnknown)-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Types+import Language.PureScript.TypeClassDictionaries (NamedDict, TypeClassDictionaryInScope(..))+import Language.PureScript.Types (Constraint(..), SourceConstraint, SourceType, Type(..), containsForAll, eqType, everythingOnTypes, freeTypeVariables, overConstraintArgs, srcInstanceType, unapplyTypes)  addDataType   :: (MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)@@ -561,7 +561,6 @@     | moduleName `S.member` nonOrphanModules = return ()     | otherwise = throwError . errorMessage $ OrphanInstance dictName className nonOrphanModules tys' -  -- |   -- This function adds the argument kinds for a type constructor so that they may appear in the externs file,   -- extracted from the kind of the type constructor itself.   --

@@ -12,26 +12,26 @@ import Data.Align (align, unalign) import Data.Foldable (foldl1, foldr1) import Data.List (init, last, zipWith3, (!!))-import qualified Data.Map as M+import Data.Map qualified as M import Data.These (These(..), mergeTheseWith, these) -import Control.Monad.Supply.Class-import Language.PureScript.AST-import Language.PureScript.AST.Utils-import qualified Language.PureScript.Constants.Libs as Libs-import qualified Language.PureScript.Constants.Prim as Prim-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors hiding (nonEmpty)+import Control.Monad.Supply.Class (MonadSupply)+import Language.PureScript.AST (Binder(..), CaseAlternative(..), ErrorMessageHint(..), Expr(..), InstanceDerivationStrategy(..), Literal(..), SourceSpan, nullSourceSpan)+import Language.PureScript.AST.Utils (UnwrappedTypeConstructor(..), lam, lamCase, lamCase2, mkBinder, mkCtor, mkCtorBinder, mkLit, mkRef, mkVar, unguarded, unwrapTypeConstructor, utcQTyCon)+import Language.PureScript.Constants.Libs qualified as Libs+import Language.PureScript.Constants.Prim qualified as Prim+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), Environment(..), FunctionalDependency(..), TypeClassData(..), TypeKind(..), kindType, (-:>))+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, errorMessage, internalCompilerError) import Language.PureScript.Label (Label(..))-import Language.PureScript.Names-import Language.PureScript.PSString-import Language.PureScript.Sugar.TypeClasses-import Language.PureScript.TypeChecker.Entailment-import Language.PureScript.TypeChecker.Monad-import Language.PureScript.TypeChecker.Synonyms-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Types+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName(..), Name(..), ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, freshIdent, qualify)+import Language.PureScript.PSString (PSString, mkString)+import Language.PureScript.Sugar.TypeClasses (superClassDictionaryNames)+import Language.PureScript.TypeChecker.Entailment (InstanceContext, findDicts)+import Language.PureScript.TypeChecker.Monad (CheckState, getEnv, getTypeClassDictionaries, unsafeCheckCurrentModule)+import Language.PureScript.TypeChecker.Synonyms (replaceAllTypeSynonyms)+import Language.PureScript.TypeClassDictionaries (TypeClassDictionaryInScope(..))+import Language.PureScript.Types (Constraint(..), pattern REmptyKinded, SourceType, Type(..), completeBinderList, eqType, everythingOnTypes, replaceAllTypeVars, srcTypeVar, usedTypeVariables)  -- | Extract the name of the newtype appearing in the last type argument of -- a derived newtype instance.@@ -533,10 +533,10 @@     where     tcdAppliesToType tcd = case tcdInstanceTypes tcd of       [headOfType -> ht'] -> ht == ht'-      -- ^ It's possible that, if ht and ht' are Lefts, this might require-      -- verifying that the name isn't shadowed by something in tcdForAll. I-      -- can't devise a legal program that causes this issue, but if in the-      -- future it seems like a good idea, it probably is.+        -- It's possible that, if ht and ht' are Lefts, this might require+        -- verifying that the name isn't shadowed by something in tcdForAll. I+        -- can't devise a legal program that causes this issue, but if in the+        -- future it seems like a good idea, it probably is.       _ -> False    headOfType :: SourceType -> Qualified (Either Text (ProperName 'TypeName))

@@ -15,9 +15,9 @@  import Control.Arrow (second, (&&&)) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.State+import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, foldM, gets, guard, join, modify, zipWithM, zipWithM_, (<=<)) import Control.Monad.Supply.Class (MonadSupply(..))-import Control.Monad.Writer+import Control.Monad.Writer (Any(..), MonadWriter(..), WriterT(..))  import Data.Either (lefts, partitionEithers) import Data.Foldable (for_, fold, toList)@@ -25,31 +25,31 @@ import Data.Functor (($>)) import Data.List (delete, findIndices, minimumBy, nubBy, sortOn, tails) import Data.Maybe (catMaybes, fromMaybe, listToMaybe, mapMaybe)-import qualified Data.Map as M-import qualified Data.Set as S+import Data.Map qualified as M+import Data.Set qualified as S import Data.Traversable (for) import Data.Text (Text, stripPrefix, stripSuffix)-import qualified Data.Text as T+import Data.Text qualified as T import Data.List.NonEmpty (NonEmpty(..))-import qualified Data.List.NonEmpty as NEL+import Data.List.NonEmpty qualified as NEL -import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.TypeChecker.Entailment.Coercible-import Language.PureScript.TypeChecker.Entailment.IntCompare+import Language.PureScript.AST (Binder(..), ErrorMessageHint(..), Expr(..), Literal(..), pattern NullSourceSpan, everywhereOnValuesTopDownM, nullSourceSpan)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (Environment(..), FunctionalDependency(..), TypeClassData(..), dictTypeName, kindRow, tyBoolean, tyInt, tyString)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), addHint, addHints, errorMessage, rethrow)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), byMaybeModuleName, coerceProperName, disqualify, freshIdent, getQual)+import Language.PureScript.TypeChecker.Entailment.Coercible (GivenSolverState(..), WantedSolverState(..), initialGivenSolverState, initialWantedSolverState, insoluble, solveGivens, solveWanteds)+import Language.PureScript.TypeChecker.Entailment.IntCompare (mkFacts, mkRelation, solveRelation) import Language.PureScript.TypeChecker.Kinds (elaborateKind, unifyKinds')-import Language.PureScript.TypeChecker.Monad+import Language.PureScript.TypeChecker.Monad (CheckState(..), withErrorMessageHint) import Language.PureScript.TypeChecker.Synonyms (replaceAllTypeSynonyms)-import Language.PureScript.TypeChecker.Unify-import Language.PureScript.TypeClassDictionaries+import Language.PureScript.TypeChecker.Unify (freshTypeWithKind, substituteType, unifyTypes)+import Language.PureScript.TypeClassDictionaries (NamedDict, TypeClassDictionaryInScope(..), superclassName) import Language.PureScript.Types import Language.PureScript.Label (Label(..)) import Language.PureScript.PSString (PSString, mkString, decodeString)-import qualified Language.PureScript.Constants.Libs as C-import qualified Language.PureScript.Constants.Prim as C+import Language.PureScript.Constants.Libs qualified as C+import Language.PureScript.Constants.Prim qualified as C  -- | Describes what sort of dictionary to generate for type class instances data Evidence@@ -321,7 +321,7 @@                 -- with no unsolved constraints. Hopefully, we can solve this later.                 return (TypeClassDictionary (srcConstraint className' kinds'' tys'' conInfo) context hints')           where-            -- | When checking functional dependencies, we need to use unification to make+            -- When checking functional dependencies, we need to use unification to make             -- sure it is safe to use the selected instance. We will unify the solved type with             -- the type in the instance head under the substitution inferred from its instantiation.             -- As an example, when solving MonadState t0 (State Int), we choose the@@ -380,7 +380,6 @@             canBeGeneralized (KindedType _ t _) = canBeGeneralized t             canBeGeneralized _ = False -            -- |             -- Check if two dictionaries are overlapping             --             -- Dictionaries which are subclass dictionaries cannot overlap, since otherwise the overlap would have@@ -475,7 +474,7 @@       pure [TypeClassDictionaryInScope Nothing 0 EmptyClassInstance [] C.SymbolAppend [] [] args' Nothing Nothing]     solveSymbolAppend _ = Nothing -    -- | Append type level symbols, or, run backwards, strip a prefix or suffix+    -- Append type level symbols, or, run backwards, strip a prefix or suffix     appendSymbols :: SourceType -> SourceType -> SourceType -> Maybe (SourceType, SourceType, SourceType)     appendSymbols arg0@(TypeLevelString _ lhs) arg1@(TypeLevelString _ rhs) _ = Just (arg0, arg1, srcTypeLevelString (lhs <> rhs))     appendSymbols arg0@(TypeLevelString _ lhs) _ arg2@(TypeLevelString _ out) = do@@ -544,11 +543,11 @@     solveIntAdd _ = Nothing      addInts :: SourceType -> SourceType -> SourceType -> Maybe (SourceType, SourceType, SourceType)-    -- | l r -> o, l + r = o+    -- l r -> o, l + r = o     addInts arg0@(TypeLevelInt _ l) arg1@(TypeLevelInt _ r) _ = pure (arg0, arg1, srcTypeLevelInt (l + r))-    -- | l o -> r, o - l = r+    -- l o -> r, o - l = r     addInts arg0@(TypeLevelInt _ l) _ arg2@(TypeLevelInt _ o) = pure (arg0, srcTypeLevelInt (o - l), arg2)-    -- | r o -> l, o - r = l+    -- r o -> l, o - r = l     addInts _ arg1@(TypeLevelInt _ r) arg2@(TypeLevelInt _ o) = pure (srcTypeLevelInt (o - r), arg1, arg2)     addInts _ _ _                                             = Nothing @@ -582,7 +581,7 @@       pure [ TypeClassDictionaryInScope Nothing 0 EmptyClassInstance [] C.RowUnion vars kinds [lOut, rOut, uOut] cst Nothing ]     solveUnion _ _ = Nothing -    -- | Left biased union of two row types+    -- Left biased union of two row types      unionRows :: [SourceType] -> SourceType -> SourceType -> SourceType -> Maybe (SourceType, SourceType, SourceType, Maybe [SourceConstraint], [(Text, SourceType)])     unionRows kinds l r u =@@ -643,7 +642,7 @@       pure [ TypeClassDictionaryInScope Nothing 0 EmptyClassInstance [] C.RowToList [] [kind] [r, entries] Nothing Nothing ]     solveRowToList _ _ = Nothing -    -- | Convert a closed row to a sorted list of entries+    -- Convert a closed row to a sorted list of entries     rowToRowList :: SourceType -> SourceType -> Maybe SourceType     rowToRowList kind r =         guard (isREmpty rest) $>@@ -705,7 +704,7 @@                 solved = map snd . filter ((`S.notMember` determinedSet) . fst) $ zipWith (\(_, ts) i -> (i, ts)) matched [0..]             in verifySubstitution (M.unionsWith (++) solved)   where-    -- | Find the closure of a set of functional dependencies.+    -- Find the closure of a set of functional dependencies.     covers :: [(Matched (), subst)] -> Bool     covers ms = finalSet == S.fromList [0..length ms - 1]       where@@ -875,10 +874,10 @@ tails1 :: NonEmpty a -> NonEmpty (NonEmpty a) tails1 =   -- NEL.fromList is an unsafe function, but this usage should be safe, since:-  -- * `tails xs = [xs, tail xs, tail (tail xs), ..., []]`-  -- * If `xs` is nonempty, it follows that `tails xs` contains at least one nonempty+  -- - `tails xs = [xs, tail xs, tail (tail xs), ..., []]`+  -- - If `xs` is nonempty, it follows that `tails xs` contains at least one nonempty   --   list, since `head (tails xs) = xs`.-  -- * The only empty element of `tails xs` is the last one (by the definition of `tails`)-  -- * Therefore, if we take all but the last element of `tails xs` i.e.+  -- - The only empty element of `tails xs` is the last one (by the definition of `tails`)+  -- - Therefore, if we take all but the last element of `tails xs` i.e.   --   `init (tails xs)`, we have a nonempty list of nonempty lists   NEL.fromList . map NEL.fromList . init . tails . NEL.toList

@@ -32,21 +32,21 @@ import Data.Monoid (Any(..)) import Data.Text (Text) -import qualified Data.Map as M-import qualified Data.Set as S+import Data.Map qualified as M+import Data.Set qualified as S -import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors hiding (inScope)-import Language.PureScript.Names-import Language.PureScript.TypeChecker.Kinds hiding (kindOf)-import Language.PureScript.TypeChecker.Monad-import Language.PureScript.TypeChecker.Roles-import Language.PureScript.TypeChecker.Synonyms-import Language.PureScript.TypeChecker.Unify-import Language.PureScript.Roles-import Language.PureScript.Types-import qualified Language.PureScript.Constants.Prim as Prim+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (DataDeclType(..), Environment(..), TypeKind(..), unapplyKinds)+import Language.PureScript.Errors (DeclarationRef(..), ErrorMessageHint(..), ExportSource, ImportDeclarationType(..), MultipleErrors, SimpleErrorMessage(..), SourceAnn, errorMessage)+import Language.PureScript.Names (ModuleName, ProperName, ProperNameType(..), Qualified(..), byMaybeModuleName, toMaybeModuleName)+import Language.PureScript.TypeChecker.Kinds (elaborateKind, freshKindWithKind, unifyKinds')+import Language.PureScript.TypeChecker.Monad (CheckState(..))+import Language.PureScript.TypeChecker.Roles (lookupRoles)+import Language.PureScript.TypeChecker.Synonyms (replaceAllTypeSynonyms)+import Language.PureScript.TypeChecker.Unify (alignRowsWith, freshTypeWithKind, substituteType)+import Language.PureScript.Roles (Role(..))+import Language.PureScript.Types (Constraint(..), SourceType, Type(..), completeBinderList, containsUnknowns, everythingOnTypes, isMonoType, replaceAllTypeVars, rowFromList, srcConstraint, srcTypeApp, unapplyTypes)+import Language.PureScript.Constants.Prim qualified as Prim  -- | State of the given constraints solver. data GivenSolverState =

@@ -6,12 +6,12 @@  import Protolude -import qualified Data.Graph as G-import qualified Data.Map as M+import Data.Graph qualified as G+import Data.Map qualified as M -import qualified Language.PureScript.Names as P-import qualified Language.PureScript.Types as P-import qualified Language.PureScript.Constants.Prim as P+import Language.PureScript.Names qualified as P+import Language.PureScript.Types qualified as P+import Language.PureScript.Constants.Prim qualified as P  data Relation a   = Equal a a

@@ -29,33 +29,33 @@  import Control.Arrow ((***)) import Control.Lens ((^.), _1, _2, _3)-import Control.Monad+import Control.Monad (join, unless, void, when, (<=<)) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.State-import Control.Monad.Supply.Class+import Control.Monad.State (MonadState, gets, modify)+import Control.Monad.Supply.Class (MonadSupply(..))  import Data.Bifunctor (first) import Data.Bitraversable (bitraverse) import Data.Foldable (for_, traverse_) import Data.Function (on) import Data.Functor (($>))-import qualified Data.IntSet as IS+import Data.IntSet qualified as IS import Data.List (nubBy, sortOn, (\\))-import qualified Data.Map as M+import Data.Map qualified as M import Data.Maybe (fromJust, fromMaybe) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T import Data.Traversable (for) -import Language.PureScript.Crash-import qualified Language.PureScript.Environment as E+import Language.PureScript.Crash (HasCallStack, internalError)+import Language.PureScript.Environment qualified as E import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.TypeChecker.Monad+import Language.PureScript.Names (pattern ByNullSourcePos, ModuleName, Name(..), ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, mkQualified)+import Language.PureScript.TypeChecker.Monad (CheckState(..), Substitution(..), UnkLevel(..), Unknown, bindLocalTypeVariables, debugType, getEnv, lookupTypeVariable, unsafeCheckCurrentModule, withErrorMessageHint, withFreshSubstitution) import Language.PureScript.TypeChecker.Skolems (newSkolemConstant, newSkolemScope, skolemize)-import Language.PureScript.TypeChecker.Synonyms+import Language.PureScript.TypeChecker.Synonyms (replaceAllTypeSynonyms) import Language.PureScript.Types-import Language.PureScript.Pretty.Types+import Language.PureScript.Pretty.Types (prettyPrintType)  generalizeUnknowns :: [(Unknown, SourceType)] -> SourceType -> SourceType generalizeUnknowns unks ty =

@@ -9,23 +9,23 @@  import Control.Arrow (second) import Control.Monad.Error.Class (MonadError(..))-import Control.Monad.State+import Control.Monad.State (MonadState(..), StateT(..), forM_, gets, guard, join, modify, when, (<=<)) import Control.Monad.Writer.Class (MonadWriter(..), censor) -import Data.Maybe-import qualified Data.Map as M-import qualified Data.Set as S+import Data.Maybe (fromMaybe)+import Data.Map qualified as M+import Data.Set qualified as S import Data.Text (Text, isPrefixOf, unpack)-import qualified Data.List.NonEmpty as NEL+import Data.List.NonEmpty qualified as NEL  import Language.PureScript.Crash (internalError)-import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Pretty.Types-import Language.PureScript.Pretty.Values-import Language.PureScript.TypeClassDictionaries-import Language.PureScript.Types+import Language.PureScript.Environment (Environment(..), NameKind(..), NameVisibility(..), TypeClassData(..), TypeKind(..))+import Language.PureScript.Errors (Context, ErrorMessageHint, ExportSource, Expr, ImportDeclarationType, MultipleErrors, SimpleErrorMessage(..), SourceAnn, SourceSpan(..), addHint, errorMessage, positionedError, rethrow, warnWithPosition)+import Language.PureScript.Names (Ident(..), ModuleName, ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), coerceProperName, disqualify, runIdent, runModuleName, showQualified, toMaybeModuleName)+import Language.PureScript.Pretty.Types (prettyPrintType)+import Language.PureScript.Pretty.Values (prettyPrintValue)+import Language.PureScript.TypeClassDictionaries (NamedDict, TypeClassDictionaryInScope(..))+import Language.PureScript.Types (Constraint(..), SourceType, Type(..), srcKindedType, srcTypeVar) import Text.PrettyPrint.Boxes (render)  newtype UnkLevel = UnkLevel (NEL.NonEmpty Unknown)

@@ -18,17 +18,17 @@ import Control.Monad.Error.Class (MonadError(..)) import Control.Monad.State (MonadState(..), runState, state) import Data.Coerce (coerce)-import qualified Data.Map as M+import Data.Map qualified as M import Data.Maybe (fromMaybe)-import qualified Data.Set as S+import Data.Set qualified as S import Data.Semigroup (Any(..)) import Data.Text (Text) -import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Roles-import Language.PureScript.Types+import Language.PureScript.Environment (Environment(..), TypeKind(..))+import Language.PureScript.Errors (DataConstructorDeclaration(..), MultipleErrors, RoleDeclarationData(..), SimpleErrorMessage(..), errorMessage)+import Language.PureScript.Names (ModuleName, ProperName, ProperNameType(..), Qualified(..), QualifiedBy(..))+import Language.PureScript.Roles (Role(..))+import Language.PureScript.Types (Constraint(..), SourceType, Type(..), freeTypeVariables, unapplyTypes)  -- | -- A map of a type's formal parameter names to their roles. This type's

@@ -16,12 +16,12 @@ import Data.Functor.Identity (Identity(), runIdentity) import Data.Set (Set, fromList, notMember) import Data.Text (Text)-import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Errors+import Language.PureScript.AST (Binder(..), ErrorMessageHint(..), Expr(..), SourceAnn, SourceSpan, everythingWithContextOnValues, everywhereWithContextOnValuesM, nonEmptySpan)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors, SimpleErrorMessage(..), positionedError, singleError) import Language.PureScript.Traversals (defS)-import Language.PureScript.TypeChecker.Monad-import Language.PureScript.Types+import Language.PureScript.TypeChecker.Monad (CheckState(..))+import Language.PureScript.Types (SkolemScope(..), SourceType, Type(..), everythingOnTypes, everywhereOnTypesM, replaceTypeVars)  -- | Generate a new skolem constant newSkolemConstant :: MonadState CheckState m => m Int

@@ -16,14 +16,14 @@ import Data.List.Ordered (minusBy') import Data.Ord (comparing) -import Language.PureScript.AST-import Language.PureScript.Crash-import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.TypeChecker.Monad-import Language.PureScript.TypeChecker.Skolems-import Language.PureScript.TypeChecker.Unify-import Language.PureScript.Types+import Language.PureScript.AST (ErrorMessageHint(..), Expr(..), pattern NullSourceAnn)+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment (tyFunction, tyRecord)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), errorMessage, internalCompilerError)+import Language.PureScript.TypeChecker.Monad (CheckState, getHints, getTypeClassDictionaries, withErrorMessageHint)+import Language.PureScript.TypeChecker.Skolems (newSkolemConstant, skolemize)+import Language.PureScript.TypeChecker.Unify (alignRowsWith, freshTypeWithKind, unifyTypes)+import Language.PureScript.Types (RowListItem(..), SourceType, Type(..), eqType, isREmpty, replaceTypeVars, rowFromList)  -- | Subsumption can operate in two modes: --

@@ -10,18 +10,18 @@   , replaceAllTypeSynonymsM   ) where -import           Prelude+import Prelude -import           Control.Monad.Error.Class (MonadError(..))-import           Control.Monad.State-import           Data.Maybe (fromMaybe)-import qualified Data.Map as M-import           Data.Text (Text)-import           Language.PureScript.Environment-import           Language.PureScript.Errors-import           Language.PureScript.Names-import           Language.PureScript.TypeChecker.Monad-import           Language.PureScript.Types+import Control.Monad.Error.Class (MonadError(..))+import Control.Monad.State (MonadState)+import Data.Maybe (fromMaybe)+import Data.Map qualified as M+import Data.Text (Text)+import Language.PureScript.Environment (Environment(..), TypeKind)+import Language.PureScript.Errors (MultipleErrors, SimpleErrorMessage(..), SourceSpan, errorMessage')+import Language.PureScript.Names (ProperName, ProperNameType(..), Qualified)+import Language.PureScript.TypeChecker.Monad (CheckState, getEnv)+import Language.PureScript.Types (SourceType, Type(..), completeBinderList, everywhereOnTypesTopDownM, getAnnForType, replaceAllTypeVars)  -- | Type synonym information (arguments with kinds, aliased type), indexed by name type SynonymMap = M.Map (Qualified (ProperName 'TypeName)) ([(Text, Maybe SourceType)], SourceType)

@@ -2,26 +2,26 @@   ( typeSearch   ) where -import           Protolude+import Protolude -import           Control.Monad.Writer (WriterT, runWriterT)-import qualified Data.Map                                    as Map-import qualified Language.PureScript.TypeChecker.Entailment  as Entailment+import Control.Monad.Writer (WriterT, runWriterT)+import Data.Map qualified as Map+import Language.PureScript.TypeChecker.Entailment qualified as Entailment -import qualified Language.PureScript.TypeChecker.Monad       as TC-import           Language.PureScript.TypeChecker.Subsumption-import           Language.PureScript.TypeChecker.Unify       as P+import Language.PureScript.TypeChecker.Monad qualified as TC+import Language.PureScript.TypeChecker.Subsumption (subsumes)+import Language.PureScript.TypeChecker.Unify       as P -import           Control.Monad.Supply                        as P-import           Language.PureScript.AST                     as P-import           Language.PureScript.Environment             as P-import           Language.PureScript.Errors                  as P-import           Language.PureScript.Label-import           Language.PureScript.Names                   as P-import           Language.PureScript.Pretty.Types            as P-import           Language.PureScript.TypeChecker.Skolems     as Skolem-import           Language.PureScript.TypeChecker.Synonyms    as P-import           Language.PureScript.Types                   as P+import Control.Monad.Supply                        as P+import Language.PureScript.AST                     as P+import Language.PureScript.Environment             as P+import Language.PureScript.Errors                  as P+import Language.PureScript.Label (Label)+import Language.PureScript.Names                   as P+import Language.PureScript.Pretty.Types            as P+import Language.PureScript.TypeChecker.Skolems     as Skolem+import Language.PureScript.TypeChecker.Synonyms    as P+import Language.PureScript.Types                   as P  checkInEnvironment   :: Environment

@@ -27,7 +27,7 @@ import Protolude (ordNub, fold, atMay)  import Control.Arrow (first, second, (***))-import Control.Monad+import Control.Monad (forM, forM_, guard, replicateM, unless, when, zipWithM, (<=<)) import Control.Monad.Error.Class (MonadError(..)) import Control.Monad.State.Class (MonadState(..), gets) import Control.Monad.Supply.Class (MonadSupply)@@ -40,26 +40,25 @@ import Data.Maybe (fromMaybe) import Data.Text (Text) import Data.Traversable (for)-import qualified Data.List.NonEmpty as NEL-import qualified Data.Map as M-import qualified Data.Set as S-import qualified Data.IntSet as IS+import Data.List.NonEmpty qualified as NEL+import Data.Map qualified as M+import Data.Set qualified as S+import Data.IntSet qualified as IS  import Language.PureScript.AST-import Language.PureScript.Crash+import Language.PureScript.Crash (internalError) import Language.PureScript.Environment-import Language.PureScript.Errors-import Language.PureScript.Names-import Language.PureScript.Traversals-import Language.PureScript.TypeChecker.Deriving-import Language.PureScript.TypeChecker.Entailment-import Language.PureScript.TypeChecker.Kinds+import Language.PureScript.Errors (ErrorMessage(..), MultipleErrors, SimpleErrorMessage(..), errorMessage, errorMessage', escalateWarningWhen, internalCompilerError, onErrorMessages, onTypesInErrorMessage, parU)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName, Name(..), ProperName(..), ProperNameType(..), Qualified(..), QualifiedBy(..), byMaybeModuleName, coerceProperName, freshIdent)+import Language.PureScript.TypeChecker.Deriving (deriveInstance)+import Language.PureScript.TypeChecker.Entailment (InstanceContext, newDictionaries, replaceTypeClassDictionaries)+import Language.PureScript.TypeChecker.Kinds (checkConstraint, checkTypeKind, kindOf, kindOfWithScopedVars, unifyKinds', unknownsWithKinds) import Language.PureScript.TypeChecker.Monad-import Language.PureScript.TypeChecker.Skolems-import Language.PureScript.TypeChecker.Subsumption-import Language.PureScript.TypeChecker.Synonyms-import Language.PureScript.TypeChecker.TypeSearch-import Language.PureScript.TypeChecker.Unify+import Language.PureScript.TypeChecker.Skolems (introduceSkolemScope, newSkolemConstant, newSkolemScope, skolemEscapeCheck, skolemize, skolemizeTypesInValue)+import Language.PureScript.TypeChecker.Subsumption (subsumes)+import Language.PureScript.TypeChecker.Synonyms (replaceAllTypeSynonyms)+import Language.PureScript.TypeChecker.TypeSearch (typeSearch)+import Language.PureScript.TypeChecker.Unify (freshTypeWithKind, replaceTypeWildcards, substituteType, unifyTypes, unknownsInType, varIfUnknown) import Language.PureScript.Types import Language.PureScript.Label (Label(..)) import Language.PureScript.PSString (PSString)@@ -197,12 +196,12 @@       -> ErrorMessage     replaceTypes subst = onTypesInErrorMessage (substituteType subst) -    -- | Run type search to complete any typed hole error messages+    -- Run type search to complete any typed hole error messages     runTypeSearch       :: Maybe [(Ident, InstanceContext, SourceConstraint)]-      -- ^ Any unsolved constraints which we need to continue to satisfy+           -- Any unsolved constraints which we need to continue to satisfy       -> CheckState-      -- ^ The final type checker state+           -- The final type checker state       -> ErrorMessage       -> ErrorMessage     runTypeSearch cons st = \case@@ -214,7 +213,7 @@         in ErrorMessage hints (HoleInferredType x ty y (Just searchResult))       other -> other -    -- | Add any unsolved constraints+    -- Add any unsolved constraints     constrain cs ty = foldr srcConstrainedType ty (map (\(_, _, x) -> x) cs)      -- Apply the substitution that was returned from runUnify to both types and (type-annotated) values@@ -271,7 +270,7 @@                           ]     return (SplitBindingGroup untyped' typed' dict)   where-    -- | Check if a value contains a type annotation, and if so, separate it+    -- Check if a value contains a type annotation, and if so, separate it     -- from the value itself.     splitTypeAnnotation :: (a, Expr) -> Either (a, Expr) (a, (Expr, SourceType, Bool))     splitTypeAnnotation (a, TypedValue checkType value ty) = Right (a, (value, ty, checkType))@@ -369,38 +368,62 @@   return $ TypedValue' True (Literal ss (ArrayLiteral ts')) (srcTypeApp tyArray els) infer' (Literal ss (ObjectLiteral ps)) = do   ensureNoDuplicateProperties ps-  -- We make a special case for Vars in record labels, since these are the-  -- only types of expressions for which 'infer' can return a polymorphic type.-  -- They need to be instantiated here.-  let shouldInstantiate :: Expr -> Bool-      shouldInstantiate Var{} = True-      shouldInstantiate (PositionedValue _ _ e) = shouldInstantiate e-      shouldInstantiate _ = False--      inferProperty :: (PSString, Expr) -> m (PSString, (Expr, SourceType))-      inferProperty (name, val) = do-        TypedValue' _ val' ty <- infer val-        valAndType <- if shouldInstantiate val-                        then instantiatePolyTypeWithUnknowns val' ty-                        else pure (val', ty)-        pure (name, valAndType)+  typedFields <- inferProperties ps+  let+    toRowListItem :: (PSString, (Expr, SourceType)) -> RowListItem SourceAnn+    toRowListItem (l, (_, t)) = srcRowListItem (Label l) t -      toRowListItem (lbl, (_, ty)) = srcRowListItem (Label lbl) ty+    recordType :: SourceType+    recordType = srcTypeApp tyRecord $ rowFromList (toRowListItem <$> typedFields, srcKindApp srcREmpty kindType) -  fields <- forM ps inferProperty-  let ty = srcTypeApp tyRecord $ rowFromList (map toRowListItem fields, srcKindApp srcREmpty kindType)-  return $ TypedValue' True (Literal ss (ObjectLiteral (map (fmap (uncurry (TypedValue True))) fields))) ty-infer' (ObjectUpdate o ps) = do+    typedProperties :: [(PSString, Expr)]+    typedProperties = fmap (fmap (uncurry (TypedValue True))) typedFields+  pure $ TypedValue' True (Literal ss (ObjectLiteral typedProperties)) recordType+infer' (ObjectUpdate ob ps) = do   ensureNoDuplicateProperties ps-  row <- freshTypeWithKind (kindRow kindType)-  typedVals <- zipWith (\(name, _) t -> (name, t)) ps <$> traverse (infer . snd) ps-  let toRowListItem = uncurry srcRowListItem-  let newTys = map (\(name, TypedValue' _ _ ty) -> (Label name, ty)) typedVals-  oldTys <- zip (map (Label . fst) ps) <$> replicateM (length ps) (freshTypeWithKind kindType)-  let oldTy = srcTypeApp tyRecord $ rowFromList (toRowListItem <$> oldTys, row)-  o' <- TypedValue True <$> (tvToExpr <$> check o oldTy) <*> pure oldTy-  let newVals = map (fmap tvToExpr) typedVals-  return $ TypedValue' True (ObjectUpdate o' newVals) $ srcTypeApp tyRecord $ rowFromList (toRowListItem <$> newTys, row)+  -- This "tail" holds all other fields not being updated.+  rowType <- freshTypeWithKind (kindRow kindType)+  let updateLabels = Label . fst <$> ps+  -- Generate unification variables for each field in ps.+  --+  -- Given:+  --+  -- ob { a = 0, b = 0 }+  --+  -- Then:+  --+  -- obTypes = [(a, ?0), (b, ?1)]+  obTypes <- zip updateLabels <$> replicateM (length updateLabels) (freshTypeWithKind kindType)+  let obItems :: [RowListItem SourceAnn]+      obItems = uncurry srcRowListItem <$> obTypes+      -- Create a record type that contains the unification variables.+      --+      -- obRecordType = Record ( a :: ?0, b :: ?1 | rowType )+      obRecordType :: SourceType+      obRecordType = srcTypeApp tyRecord $ rowFromList (obItems, rowType)+  -- Check ob against obRecordType.+  --+  -- Given:+  --+  -- ob : { a :: Int, b :: Int }+  --+  -- Then:+  --+  -- ?0  ~  Int+  -- ?1  ~  Int+  -- ob' : { a :: ?0, b :: ?1 }+  ob' <- TypedValue True <$> (tvToExpr <$> check ob obRecordType) <*> pure obRecordType+  -- Infer the types of the values used for the record update.+  typedFields <- inferProperties ps+  let newItems :: [RowListItem SourceAnn]+      newItems = (\(l, (_, t)) -> srcRowListItem (Label l) t) <$> typedFields++      ps' :: [(PSString, Expr)]+      ps' = (\(l, (e, t)) -> (l, TypedValue True e t)) <$> typedFields++      newRecordType :: SourceType+      newRecordType = srcTypeApp tyRecord $ rowFromList (newItems, rowType)+  pure $ TypedValue' True (ObjectUpdate ob' ps') newRecordType infer' (Accessor prop val) = withErrorMessageHint (ErrorCheckingAccessor val prop) $ do   field <- freshTypeWithKind kindType   rest <- freshTypeWithKind (kindRow kindType)@@ -431,8 +454,7 @@   env <- getEnv   case M.lookup c (dataConstructors env) of     Nothing -> throwError . errorMessage . UnknownName . fmap DctorName $ c-    Just (_, _, ty, _) -> do (v', ty') <- sndM (introduceSkolemScope <=< replaceAllTypeSynonyms) <=< instantiatePolyTypeWithUnknowns v $ ty-                             return $ TypedValue' True v' ty'+    Just (_, _, ty, _) -> TypedValue' True v <$> (introduceSkolemScope <=< replaceAllTypeSynonyms $ ty) infer' (Case vals binders) = do   (vals', ts) <- instantiateForBinders vals binders   ret <- freshTypeWithKind kindType@@ -474,6 +496,44 @@   return $ TypedValue' t (PositionedValue pos c v) ty infer' v = internalError $ "Invalid argument to infer: " ++ show v +-- |+-- Infer the types of named record fields.+inferProperties+  :: ( MonadSupply m+     , MonadState CheckState m+     , MonadError MultipleErrors m+     , MonadWriter MultipleErrors m+     )+  => [(PSString, Expr)]+  -> m [(PSString, (Expr, SourceType))]+inferProperties = traverse (traverse inferWithinRecord)++-- |+-- Infer the type of a value when used as a record field.+inferWithinRecord+  :: ( MonadSupply m+     , MonadState CheckState m+     , MonadError MultipleErrors m+     , MonadWriter MultipleErrors m+     )+  => Expr+  -> m (Expr, SourceType)+inferWithinRecord e = do+  TypedValue' _ v t <- infer e+  if propertyShouldInstantiate e+    then instantiatePolyTypeWithUnknowns v t+    else pure (v, t)++-- |+-- Determines if a value's type needs to be monomorphized when+-- used inside of a record.+propertyShouldInstantiate :: Expr -> Bool+propertyShouldInstantiate = \case+  Var{} -> True+  Constructor{} -> True+  PositionedValue _ _ e -> propertyShouldInstantiate e+  _ -> False+ inferLetBinding   :: (MonadSupply m, MonadState CheckState m, MonadError MultipleErrors m, MonadWriter MultipleErrors m)   => [Declaration]@@ -795,7 +855,7 @@     Nothing -> throwError . errorMessage . UnknownName . fmap DctorName $ c     Just (_, _, ty1, _) -> do       repl <- introduceSkolemScope <=< replaceAllTypeSynonyms $ ty1-      ty' <- introduceSkolemScope ty+      ty' <- introduceSkolemScope <=< replaceAllTypeSynonyms $ ty       elaborate <- subsumes repl ty'       return $ TypedValue' True (elaborate v) ty' check' (Let w ds val) ty = do@@ -841,11 +901,11 @@   go ((p,v):ps') ts r =     case lookup (Label p) ts of       Nothing -> do-        v'@(TypedValue' _ _ ty) <- infer v+        (v', ty) <- inferWithinRecord v         rest <- freshTypeWithKind (kindRow kindType)         unifyTypes r (srcRCons (Label p) ty rest)         ps'' <- go ps' ts rest-        return $ (p, v') : ps''+        return $ (p, TypedValue' True v' ty) : ps''       Just ty -> do         v' <- check v ty         ps'' <- go ps' (delete (Label p, ty) ts) r

@@ -16,23 +16,23 @@  import Prelude -import Control.Monad+import Control.Monad (forM_, void) import Control.Monad.Error.Class (MonadError(..)) import Control.Monad.State.Class (MonadState(..), gets, modify, state) import Control.Monad.Writer.Class (MonadWriter(..))  import Data.Foldable (traverse_) import Data.Maybe (fromMaybe)-import qualified Data.Map as M-import qualified Data.Text as T+import Data.Map qualified as M+import Data.Text qualified as T -import Language.PureScript.Crash-import qualified Language.PureScript.Environment as E-import Language.PureScript.Errors+import Language.PureScript.Crash (internalError)+import Language.PureScript.Environment qualified as E+import Language.PureScript.Errors (ErrorMessageHint(..), MultipleErrors, SimpleErrorMessage(..), SourceAnn, errorMessage, internalCompilerError, onErrorMessages, rethrow, warnWithPosition, withoutPosition) import Language.PureScript.TypeChecker.Kinds (elaborateKind, instantiateKind, unifyKinds')-import Language.PureScript.TypeChecker.Monad-import Language.PureScript.TypeChecker.Skolems-import Language.PureScript.Types+import Language.PureScript.TypeChecker.Monad (CheckState(..), Substitution(..), UnkLevel(..), Unknown, getLocalContext, guardWith, lookupUnkName, withErrorMessageHint)+import Language.PureScript.TypeChecker.Skolems (newSkolemConstant, skolemize)+import Language.PureScript.Types (Constraint(..), pattern REmptyKinded, RowListItem(..), SourceType, Type(..), WildcardData(..), alignRowsWith, everythingOnTypes, everywhereOnTypes, everywhereOnTypesM, getAnnForType, mkForAll, rowFromList, srcTUnknown)  -- | Generate a fresh type variable with an unknown kind. Avoid this if at all possible. freshType :: (MonadState CheckState m) => m SourceType

@@ -7,8 +7,8 @@ import Data.Text (Text, pack)  import Language.PureScript.AST.Declarations.ChainId (ChainId)-import Language.PureScript.Names-import Language.PureScript.Types+import Language.PureScript.Names (Ident, ProperName(..), ProperNameType(..), Qualified, disqualify)+import Language.PureScript.Types (SourceConstraint, SourceType)  -- -- Data representing a type class dictionary which is in scope

@@ -13,19 +13,19 @@ import Control.Lens (Lens', (^.), set) import Control.Monad ((<=<), (>=>)) import Data.Aeson ((.:), (.:?), (.!=), (.=))-import qualified Data.Aeson as A-import qualified Data.Aeson.Types as A+import Data.Aeson qualified as A+import Data.Aeson.Types qualified as A import Data.Foldable (fold, foldl')-import qualified Data.IntSet as IS+import Data.IntSet qualified as IS import Data.List (sortOn) import Data.Maybe (fromMaybe, isJust) import Data.Text (Text)-import qualified Data.Text as T+import Data.Text qualified as T import GHC.Generics (Generic) -import Language.PureScript.AST.SourcePos-import qualified Language.PureScript.Constants.Prim as C-import Language.PureScript.Names+import Language.PureScript.AST.SourcePos (pattern NullSourceAnn, SourceAnn, SourceSpan)+import Language.PureScript.Constants.Prim qualified as C+import Language.PureScript.Names (OpName, OpNameType(..), ProperName, ProperNameType(..), Qualified, coerceProperName) import Language.PureScript.Label (Label) import Language.PureScript.PSString (PSString) 

@@ -2,13 +2,13 @@  import Prelude -import qualified Data.ByteString as BS-import qualified Data.ByteString.Lazy as BSL-import qualified Data.ByteString.Search as BSS-import qualified Data.ByteString.UTF8 as UTF8-import           Data.Text (Text)-import qualified Data.Text.Encoding as TE-import           Protolude (ordNub)+import Data.ByteString qualified as BS+import Data.ByteString.Lazy qualified as BSL+import Data.ByteString.Search qualified as BSS+import Data.ByteString.UTF8 qualified as UTF8+import Data.Text (Text)+import Data.Text.Encoding qualified as TE+import Protolude (ordNub)  -- | Unfortunately ByteString's readFile does not convert line endings on -- Windows, so we have to do it ourselves

@@ -2,13 +2,13 @@  import Protolude -import qualified Language.PureScript as P+import Language.PureScript qualified as P import Language.PureScript.Ide.Test as Test import Language.PureScript.Ide.Command as Command-import Language.PureScript.Ide.Completion-import qualified Language.PureScript.Ide.Filter.Declaration as DeclarationType-import Language.PureScript.Ide.Types-import Test.Hspec+import Language.PureScript.Ide.Completion (CompletionOptions(..), applyCompletionOptions, defaultCompletionOptions)+import Language.PureScript.Ide.Filter.Declaration qualified as DeclarationType+import Language.PureScript.Ide.Types (Completion(..), IdeDeclarationAnn, Match(..), Success(..))+import Test.Hspec (Spec, describe, it, shouldBe, shouldMatchList, shouldSatisfy)  reexportMatches :: [Match IdeDeclarationAnn] reexportMatches =

@@ -1,15 +1,15 @@ module Language.PureScript.Ide.FilterSpec where -import           Protolude-import qualified Data.Map as Map-import qualified Data.Set as Set-import           Language.PureScript.Ide.Filter-import           Language.PureScript.Ide.Filter.Declaration as D-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Imports-import           Language.PureScript.Ide.Test as T-import qualified Language.PureScript as P-import           Test.Hspec+import Protolude+import Data.Map qualified as Map+import Data.Set qualified as Set+import Language.PureScript.Ide.Filter (applyFilters, declarationTypeFilter, dependencyFilter, exactFilter, moduleFilter, namespaceFilter, prefixFilter)+import Language.PureScript.Ide.Filter.Declaration as D+import Language.PureScript.Ide.Types (IdeDeclarationAnn, IdeNamespace(..), ModuleMap)+import Language.PureScript.Ide.Imports (Import, sliceImportSection)+import Language.PureScript.Ide.Test as T+import Language.PureScript qualified as P+import Test.Hspec (Spec, describe, it, shouldBe)  type Module = (P.ModuleName, [IdeDeclarationAnn]) 

@@ -1,19 +1,19 @@ module Language.PureScript.Ide.ImportsSpec where -import           Protolude hiding (moduleName)-import           Data.Maybe (fromJust)-import qualified Data.Set as Set+import Protolude hiding (moduleName)+import Data.Maybe (fromJust)+import Data.Set qualified as Set -import qualified Language.PureScript as P-import           Language.PureScript.Ide.Command as Command-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Imports-import           Language.PureScript.Ide.Imports.Actions-import           Language.PureScript.Ide.Filter (moduleFilter)-import qualified Language.PureScript.Ide.Test as Test-import           Language.PureScript.Ide.Types-import           System.FilePath-import           Test.Hspec+import Language.PureScript qualified as P+import Language.PureScript.Ide.Command as Command+import Language.PureScript.Ide.Error (IdeError)+import Language.PureScript.Ide.Imports (Import, parseImport, prettyPrintImport', prettyPrintImportSection, sliceImportSection)+import Language.PureScript.Ide.Imports.Actions (addExplicitImport', addImplicitImport', addQualifiedImport')+import Language.PureScript.Ide.Filter (moduleFilter)+import Language.PureScript.Ide.Test qualified as Test+import Language.PureScript.Ide.Types (IdeDeclarationAnn(..), Success(..))+import System.FilePath ((</>))+import Test.Hspec (Expectation, Spec, describe, it, shouldBe, shouldSatisfy)  noImportsFile :: [Text] noImportsFile =

@@ -1,12 +1,12 @@ module Language.PureScript.Ide.MatcherSpec where -import           Protolude+import Protolude -import qualified Language.PureScript                 as P-import           Language.PureScript.Ide.Matcher-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Util-import           Test.Hspec+import Language.PureScript qualified as P+import Language.PureScript.Ide.Matcher (flexMatcher, runMatcher)+import Language.PureScript.Ide.Types (IdeDeclaration(..), IdeDeclarationAnn, IdeValue(..), Match(..))+import Language.PureScript.Ide.Util (withEmptyAnn)+import Test.Hspec (Spec, describe, it, shouldBe)  value :: Text -> IdeDeclarationAnn value s = withEmptyAnn (IdeDeclValue (IdeValue (P.Ident (toS s)) P.srcREmpty))

@@ -1,18 +1,18 @@ module Language.PureScript.Ide.RebuildSpec where -import           Protolude+import Protolude -import qualified Data.Set as Set-import qualified Language.PureScript as P-import           Language.PureScript.AST.SourcePos (spanName)-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.Completion-import           Language.PureScript.Ide.Matcher-import           Language.PureScript.Ide.Types-import qualified Language.PureScript.Ide.Test as Test-import           System.FilePath-import           System.Directory (doesFileExist, removePathForcibly)-import           Test.Hspec+import Data.Set qualified as Set+import Language.PureScript qualified as P+import Language.PureScript.AST.SourcePos (spanName)+import Language.PureScript.Ide.Command (Command(..))+import Language.PureScript.Ide.Completion (defaultCompletionOptions)+import Language.PureScript.Ide.Matcher (flexMatcher)+import Language.PureScript.Ide.Types (Completion(..), Success(..), emptyIdeState)+import Language.PureScript.Ide.Test qualified as Test+import System.FilePath ((</>))+import System.Directory (doesFileExist, removePathForcibly)+import Test.Hspec (Spec, describe, it, shouldBe, shouldSatisfy)  defaultTarget :: Set P.CodegenTarget defaultTarget = Set.singleton P.JS

@@ -1,13 +1,13 @@ module Language.PureScript.Ide.ReexportsSpec where -import           Protolude+import Protolude -import qualified Data.Map as Map-import           Language.PureScript.Ide.Reexports-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Test-import qualified Language.PureScript as P-import           Test.Hspec+import Data.Map qualified as Map+import Language.PureScript.Ide.Reexports (ReexportResult(..), reexportHasFailures, resolveReexports')+import Language.PureScript.Ide.Types (IdeDeclarationAnn, ModuleMap)+import Language.PureScript.Ide.Test (annExp, ideDtor, ideKind, ideSynonym, ideType, ideTypeClass, ideValue, mn)+import Language.PureScript qualified as P+import Test.Hspec (Spec, describe, it, shouldBe, shouldSatisfy)  valueA, typeA, synonymA, classA, dtorA1, dtorA2, kindA :: IdeDeclarationAnn valueA = ideValue "valueA" Nothing

@@ -1,13 +1,13 @@ module Language.PureScript.Ide.SourceFileSpec where -import           Protolude+import Protolude -import qualified Language.PureScript as P-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.SourceFile-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.Test-import           Test.Hspec+import Language.PureScript qualified as P+import Language.PureScript.Ide.Command (Command(..))+import Language.PureScript.Ide.SourceFile (extractSpans, extractTypeAnnotations)+import Language.PureScript.Ide.Types (Completion(..), IdeNamespace(..), IdeNamespaced(..), Success(..), emptyIdeState)+import Language.PureScript.Ide.Test+import Test.Hspec (Spec, describe, it, shouldBe)  span1, span2 :: P.SourceSpan span1 = P.SourceSpan "" (P.SourcePos 1 1) (P.SourcePos 2 2)

@@ -1,13 +1,13 @@ module Language.PureScript.Ide.StateSpec where -import           Protolude-import           Control.Lens hiding (anyOf, (&))-import           Language.PureScript.Ide.Types-import           Language.PureScript.Ide.State-import           Language.PureScript.Ide.Test-import qualified Language.PureScript as P-import           Test.Hspec-import qualified Data.Map as Map+import Protolude+import Control.Lens (Ixed(..), folded)+import Language.PureScript.Ide.Types (IdeDeclarationAnn, IdeInstance(..), ModuleMap, _IdeDeclTypeClass, anyOf, idaDeclaration, ideTCInstances)+import Language.PureScript.Ide.State (resolveDataConstructorsForModule, resolveInstances, resolveOperatorsForModule)+import Language.PureScript.Ide.Test (ideDtor, ideType, ideTypeClass, ideTypeOp, ideValue, ideValueOp, mn)+import Language.PureScript qualified as P+import Test.Hspec (Spec, describe, it, shouldSatisfy)+import Data.Map qualified as Map  valueOperator :: Maybe P.SourceType -> IdeDeclarationAnn valueOperator =

@@ -1,20 +1,20 @@ {-# LANGUAGE PackageImports    #-} module Language.PureScript.Ide.Test where -import           Control.Concurrent.STM-import           "monad-logger" Control.Monad.Logger-import           Data.IORef-import qualified Data.Map                        as Map-import           Language.PureScript.Ide-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.Error-import           Language.PureScript.Ide.Types-import           Protolude-import           System.Directory-import           System.FilePath-import           System.Process+import Control.Concurrent.STM (newTVarIO, readTVarIO)+import "monad-logger" Control.Monad.Logger (NoLoggingT(..))+import Data.IORef (newIORef)+import Data.Map qualified as Map+import Language.PureScript.Ide (handleCommand)+import Language.PureScript.Ide.Command (Command)+import Language.PureScript.Ide.Error (IdeError)+import Language.PureScript.Ide.Types+import Protolude+import System.Directory (doesDirectoryExist, getCurrentDirectory, makeAbsolute, removeDirectoryRecursive, setCurrentDirectory)+import System.FilePath ((</>))+import System.Process (createProcess, getProcessExitCode, shell) -import qualified Language.PureScript             as P+import Language.PureScript qualified as P  defConfig :: IdeConfiguration defConfig =

@@ -1,15 +1,15 @@ module Language.PureScript.Ide.UsageSpec where -import           Protolude+import Protolude -import qualified Data.Text as Text-import           Language.PureScript.Ide.Command-import           Language.PureScript.Ide.Types-import qualified Language.PureScript.Ide.Test as Test-import qualified Language.PureScript as P-import           Test.Hspec-import           Data.Text.Read (decimal)-import           System.FilePath+import Data.Text qualified as Text+import Language.PureScript.Ide.Command (Command(..))+import Language.PureScript.Ide.Types (IdeNamespace(..), Success(..))+import Language.PureScript.Ide.Test qualified as Test+import Language.PureScript qualified as P+import Test.Hspec (Expectation, Spec, describe, it, shouldBe)+import Data.Text.Read (decimal)+import System.FilePath ((</>))  load :: [Text] -> Command load = LoadSync . map Test.mn

@@ -6,21 +6,21 @@  import Test.Hspec -import qualified TestAst-import qualified TestCompiler-import qualified TestCoreFn-import qualified TestCst-import qualified TestDocs-import qualified TestHierarchy-import qualified TestPrimDocs-import qualified TestPsci-import qualified TestIde-import qualified TestPscPublish-import qualified TestSourceMaps--- import qualified TestBundle-import qualified TestMake-import qualified TestUtils-import qualified TestGraph+import TestAst qualified+import TestCompiler qualified+import TestCoreFn qualified+import TestCst qualified+import TestDocs qualified+import TestHierarchy qualified+import TestPrimDocs qualified+import TestPsci qualified+import TestIde qualified+import TestPscPublish qualified+import TestSourceMaps qualified+-- import TestBundle qualified+import TestMake qualified+import TestUtils qualified+import TestGraph qualified  import System.IO (hSetEncoding, stdout, stderr, utf8) 

@@ -5,14 +5,14 @@  import Control.Lens ((+~)) import Control.Newtype (ala')-import Generic.Random-import Test.Hspec-import Test.QuickCheck+import Generic.Random (genericArbitraryRecG, genericArbitraryUG, listOf', uniform, withBaseCase, (:+)(..))+import Test.Hspec (Spec, describe, it)+import Test.QuickCheck (Arbitrary(..), Gen, Property, Testable, counterexample, forAllShrink, subterms, (===)) -import Language.PureScript.Label-import Language.PureScript.Names-import Language.PureScript.PSString-import Language.PureScript.Types+import Language.PureScript.Label (Label(..))+import Language.PureScript.Names (pattern ByNullSourcePos, OpName(..), OpNameType(..), ProperName(..), ProperNameType(..), Qualified(..))+import Language.PureScript.PSString (PSString)+import Language.PureScript.Types (Constraint, ConstraintData, SkolemScope(..), Type(..), WildcardData, annForType, everythingOnTypes, everythingWithContextOnTypes, everywhereOnTypes, everywhereOnTypesM, everywhereOnTypesTopDownM, getAnnForType)  spec :: Spec spec = do

@@ -24,30 +24,30 @@  import Prelude -import qualified Language.PureScript as P+import Language.PureScript qualified as P import Language.PureScript.Interactive.IO (readNodeProcessWithExitCode)  import Control.Arrow ((>>>))-import qualified Data.ByteString as BS+import Data.ByteString qualified as BS import Data.Function (on) import Data.List (sort, stripPrefix, minimumBy) import Data.Maybe (mapMaybe)-import qualified Data.Text as T-import qualified Data.Text.Encoding as T+import Data.Text qualified as T+import Data.Text.Encoding qualified as T  -import Control.Monad+import Control.Monad (forM_, when) -import System.Exit-import System.FilePath-import System.IO+import System.Exit (ExitCode(..))+import System.FilePath (pathSeparator, replaceExtension, takeFileName, (</>))+import System.IO (Handle, hPutStr, hPutStrLn) import System.IO.UTF8 (readUTF8File) -import Text.Regex.Base+import Text.Regex.Base (RegexContext(..), RegexMaker(..)) import Text.Regex.TDFA (Regex) -import TestUtils-import Test.Hspec+import TestUtils (ExpectedModuleName(..), SupportModules, compile, createOutputFile, getTestFiles, goldenVsString, modulesDir, trim)+import Test.Hspec (Expectation, SpecWith, beforeAllWith, describe, expectationFailure, it, runIO)  spec :: SpecWith SupportModules spec = do

@@ -4,21 +4,21 @@  import Prelude -import Data.Aeson-import Data.Aeson.Types as Aeson+import Data.Aeson (Result(..), Value)+import Data.Aeson.Types (parse) import Data.Map as M-import Data.Version+import Data.Version (Version(..)) -import Language.PureScript.AST.Literals-import Language.PureScript.AST.SourcePos-import Language.PureScript.Comments-import Language.PureScript.CoreFn-import Language.PureScript.CoreFn.FromJSON-import Language.PureScript.CoreFn.ToJSON-import Language.PureScript.Names-import Language.PureScript.PSString+import Language.PureScript.AST.Literals (Literal(..))+import Language.PureScript.AST.SourcePos (SourcePos(..), SourceSpan(..))+import Language.PureScript.Comments (Comment(..))+import Language.PureScript.CoreFn (Ann, Bind(..), Binder(..), CaseAlternative(..), ConstructorType(..), Expr(..), Meta(..), Module(..), ssAnn)+import Language.PureScript.CoreFn.FromJSON (moduleFromJSON)+import Language.PureScript.CoreFn.ToJSON (moduleToJSON)+import Language.PureScript.Names (pattern ByNullSourcePos, Ident(..), ModuleName(..), ProperName(..), Qualified(..), QualifiedBy(..))+import Language.PureScript.PSString (mkString) -import Test.Hspec+import Test.Hspec (Spec, context, shouldBe, shouldSatisfy, specify)  parseModule :: Value -> Result (Version, Module Ann) parseModule = parse moduleFromJSON@@ -30,7 +30,7 @@   in snd <$> parseModule (moduleToJSON v m)  isSuccess :: Result a -> Bool-isSuccess (Aeson.Success _) = True+isSuccess (Success _) = True isSuccess _           = False  spec :: Spec@@ -47,49 +47,49 @@     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success v' -> v' `shouldBe` v+      Success v' -> v' `shouldBe` v    specify "should parse an empty module" $ do     let r = parseMod $ Module ss [] mn mp [] [] M.empty [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleName m `shouldBe` mn+      Success m -> moduleName m `shouldBe` mn    specify "should parse source span" $ do     let r = parseMod $ Module ss [] mn mp [] [] M.empty [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleSourceSpan m `shouldBe` ss+      Success m -> moduleSourceSpan m `shouldBe` ss    specify "should parse module path" $ do     let r = parseMod $ Module ss [] mn mp [] [] M.empty [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> modulePath m `shouldBe` mp+      Success m -> modulePath m `shouldBe` mp    specify "should parse imports" $ do     let r = parseMod $ Module ss [] mn mp [(ann, mn)] [] M.empty [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleImports m `shouldBe` [(ann, mn)]+      Success m -> moduleImports m `shouldBe` [(ann, mn)]    specify "should parse exports" $ do     let r = parseMod $ Module ss [] mn mp [] [Ident "exp"] M.empty [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleExports m `shouldBe` [Ident "exp"]+      Success m -> moduleExports m `shouldBe` [Ident "exp"]    specify "should parse re-exports" $ do     let r = parseMod $ Module ss [] mn mp [] [] (M.singleton (ModuleName "Example.A") [Ident "exp"]) [] []     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleReExports m `shouldBe` M.singleton (ModuleName "Example.A") [Ident "exp"]+      Success m -> moduleReExports m `shouldBe` M.singleton (ModuleName "Example.A") [Ident "exp"]     specify "should parse foreign" $ do@@ -97,7 +97,7 @@     r `shouldSatisfy` isSuccess     case r of       Error _   -> return ()-      Aeson.Success m -> moduleForeign m `shouldBe` [Ident "exp"]+      Success m -> moduleForeign m `shouldBe` [Ident "exp"]    context "Expr" $ do     specify "should parse literals" $ do@@ -154,7 +154,7 @@       r `shouldSatisfy` isSuccess       case r of         Error _ -> pure ()-        Aeson.Success Module{..} ->+        Success Module{..} ->           moduleDecls `shouldBe` [i]      specify "should parse Case" $ do

@@ -5,17 +5,17 @@ import Control.Monad (when, forM_) import Data.Maybe (fromMaybe) import Data.Text (Text)-import qualified Data.Text as Text-import qualified Data.Text.Encoding as Text-import qualified Data.Text.IO as Text-import Test.Hspec-import Test.QuickCheck-import TestUtils+import Data.Text qualified as Text+import Data.Text.Encoding qualified as Text+import Data.Text.IO qualified as Text+import Test.Hspec (Spec, describe, it, runIO, specify)+import Test.QuickCheck (Arbitrary(..), Gen, Testable(..), arbitrarySizedNatural, arbitraryUnicodeChar, discard, elements, frequency, listOf, listOf1, oneof, resize)+import TestUtils (getTestFiles, goldenVsString) import Text.Read (readMaybe) import Language.PureScript.CST.Errors as CST import Language.PureScript.CST.Lexer as CST import Language.PureScript.CST.Print as CST-import Language.PureScript.CST.Types+import Language.PureScript.CST.Types (SourceToken(..), Token(..)) import System.FilePath (takeBaseName, replaceExtension)  spec :: Spec

@@ -4,25 +4,25 @@  import Data.Bifunctor (first) import Data.List (findIndex)-import Data.Foldable+import Data.Foldable (find, forM_) import Safe (headMay)-import qualified Data.Map as Map+import Data.Map qualified as Map import Data.Maybe (fromMaybe, isNothing, mapMaybe)-import Data.Monoid+import Data.Monoid (Any(..), First(..)) import Data.Text (Text)-import qualified Data.Text as T-import qualified Text.PrettyPrint.Boxes as Boxes+import Data.Text qualified as T+import Text.PrettyPrint.Boxes qualified as Boxes -import qualified Language.PureScript as P-import qualified Language.PureScript.Docs as Docs+import Language.PureScript qualified as P+import Language.PureScript.Docs qualified as Docs import Language.PureScript.Docs.AsMarkdown (codeToString)-import qualified Language.PureScript.Publish.ErrorsWarnings as Publish+import Language.PureScript.Publish.ErrorsWarnings qualified as Publish  import Web.Bower.PackageMeta (parsePackageName, runPackageName)  import TestPscPublish (preparePackage) -import Test.Hspec+import Test.Hspec (Spec, beforeAll, context, expectationFailure, it)  spec :: Spec spec = beforeAll (handleDocPrepFailure <$> preparePackage "tests/purs/docs" "purs.json" "resolutions.json") $

@@ -2,11 +2,11 @@  import Prelude -import Test.Hspec+import Test.Hspec (Spec, it, shouldBe, shouldSatisfy) import Data.Either (isLeft) -import qualified Data.Aeson as Json-import qualified Language.PureScript as P+import Data.Aeson qualified as Json+import Language.PureScript qualified as P  spec :: Spec spec = do

@@ -2,10 +2,10 @@  import Prelude -import Language.PureScript.Hierarchy-import qualified Language.PureScript as P+import Language.PureScript.Hierarchy (Digraph(..), Graph(..), GraphName(..), SuperMap(..), prettyPrint, typeClassGraph)+import Language.PureScript qualified as P -import Test.Hspec+import Test.Hspec (Spec, describe, it, shouldBe)  spec :: Spec spec = describe "hierarchy" $ do

@@ -1,11 +1,11 @@ module TestIde where -import           Prelude+import Prelude -import           Control.Monad (unless)-import           Language.PureScript.Ide.Test-import qualified PscIdeSpec-import           Test.Hspec+import Control.Monad (unless)+import Language.PureScript.Ide.Test+import PscIdeSpec qualified+import Test.Hspec  spec :: Spec spec =

@@ -5,27 +5,27 @@  import Prelude -import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST  import Control.Concurrent (threadDelay)-import Control.Monad+import Control.Monad (guard, void) import Control.Exception (tryJust) import Control.Monad.IO.Class (liftIO) import Control.Concurrent.MVar (readMVar, newMVar, modifyMVar_)-import Data.Time.Calendar-import Data.Time.Clock-import qualified Data.Text as T+import Data.Time.Calendar (fromGregorian)+import Data.Time.Clock (UTCTime(..), secondsToDiffTime)+import Data.Text qualified as T import Data.Set (Set)-import qualified Data.Set as Set-import qualified Data.Map as M+import Data.Set qualified as Set+import Data.Map qualified as M -import System.FilePath-import System.Directory+import System.FilePath ((</>))+import System.Directory (createDirectory, removeDirectoryRecursive, removeFile, setModificationTime) import System.IO.Error (isDoesNotExistError) import System.IO.UTF8 (readUTF8FilesT, writeUTF8FileT) -import Test.Hspec+import Test.Hspec (Spec, before_, it, shouldReturn)  utcMidnightOnDate :: Integer -> Int -> Int -> UTCTime utcMidnightOnDate year month day = UTCTime (fromGregorian year month day) (secondsToDiffTime 0)

@@ -5,12 +5,12 @@ import Data.List (sort) import Control.Exception (evaluate) import Control.DeepSeq (force)-import qualified Data.Map as Map-import qualified Data.Text as Text-import qualified Language.PureScript as P-import qualified Language.PureScript.Docs as D+import Data.Map qualified as Map+import Data.Text qualified as Text+import Language.PureScript qualified as P+import Language.PureScript.Docs qualified as D -import Test.Hspec+import Test.Hspec (Spec, it, shouldBe)  spec :: Spec spec = do

@@ -7,21 +7,21 @@ import Control.Monad.IO.Class (liftIO) import Data.ByteString.Lazy (ByteString) import Data.Time.Clock (getCurrentTime)-import qualified Data.Aeson as A-import Data.Version+import Data.Aeson qualified as A+import Data.Version (Version(..)) import Data.Foldable (forM_)-import qualified Text.PrettyPrint.Boxes as Boxes+import Text.PrettyPrint.Boxes qualified as Boxes import System.Directory (listDirectory, removeDirectoryRecursive) import System.FilePath ((</>)) import System.IO.Error (isDoesNotExistError) -import Language.PureScript.Docs+import Language.PureScript.Docs (UploadedPackage, VerifiedPackage) import Language.PureScript.Publish (PublishOptions(..), defaultPublishOptions)-import qualified Language.PureScript.Publish as Publish-import qualified Language.PureScript.Publish.ErrorsWarnings as Publish+import Language.PureScript.Publish qualified as Publish+import Language.PureScript.Publish.ErrorsWarnings qualified as Publish -import Test.Hspec-import TestUtils hiding (inferForeignModules, makeActions)+import Test.Hspec (Expectation, Spec, context, expectationFailure, it, runIO)+import TestUtils (pushd)  spec :: Spec spec = do

@@ -5,7 +5,7 @@ import TestPsci.CompletionTest (completionTests) import TestPsci.EvalTest (evalTests) -import Test.Hspec+import Test.Hspec (Spec)  spec :: Spec spec = do

@@ -5,11 +5,11 @@ import Control.Monad.IO.Class (liftIO) import Control.Monad.Trans.RWS.Strict (get) import Language.PureScript (moduleNameFromString)-import Language.PureScript.Interactive+import Language.PureScript.Interactive (psciImportedModules, psciInteractivePrint) import System.FilePath ((</>)) import System.Directory (getCurrentDirectory)-import Test.Hspec-import TestPsci.TestEnv+import Test.Hspec (Spec, context, shouldContain, shouldNotContain, specify)+import TestPsci.TestEnv (TestPSCi, equalsTo, execTestPSCi, printed, prints, run, simulateModuleEdit)  specPSCi :: String -> TestPSCi () -> Spec specPSCi label = specify label . execTestPSCi

@@ -2,16 +2,16 @@  import Prelude -import Test.Hspec+import Test.Hspec (Spec, SpecWith, beforeAll, context, shouldBe, specify) -import           Control.Monad.Trans.State.Strict (evalStateT)-import           Data.Functor ((<&>))-import           Data.List (sort)-import qualified Data.Text as T-import qualified Language.PureScript as P-import           Language.PureScript.Interactive-import           TestPsci.TestEnv (initTestPSCiEnv)-import           TestUtils (getSupportModuleNames)+import Control.Monad.Trans.State.Strict (evalStateT)+import Data.Functor ((<&>))+import Data.List (sort)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.Interactive (CompletionM, PSCiState, completion', formatCompletions, liftCompletionM, updateImportedModules)+import TestPsci.TestEnv (initTestPSCiEnv)+import TestUtils (getSupportModuleNames)  completionTests :: Spec completionTests = context "completionTests" $

@@ -2,17 +2,17 @@  import Prelude -import           Control.Monad (forM_, foldM_)-import           Control.Monad.IO.Class (liftIO)-import           Data.List (stripPrefix, intercalate)-import           Data.List.Split (splitOn)-import           System.Directory (getCurrentDirectory)-import           System.Exit (exitFailure)-import           System.FilePath ((</>), takeFileName)-import qualified System.FilePath.Glob as Glob-import           System.IO.UTF8 (readUTF8File)-import           Test.Hspec-import           TestPsci.TestEnv+import Control.Monad (forM_, foldM_)+import Control.Monad.IO.Class (liftIO)+import Data.List (stripPrefix, intercalate)+import Data.List.Split (splitOn)+import System.Directory (getCurrentDirectory)+import System.Exit (exitFailure)+import System.FilePath ((</>), takeFileName)+import System.FilePath.Glob qualified as Glob+import System.IO.UTF8 (readUTF8File)+import Test.Hspec (Spec, context, runIO, specify)+import TestPsci.TestEnv (TestPSCi, evaluatesTo, execTestPSCi, run)  evalTests :: Spec evalTests = context "evalTests" $ do

@@ -2,21 +2,21 @@  import Prelude -import           Control.Exception.Lifted (bracket_)-import           Control.Monad (void, when)-import           Control.Monad.IO.Class (liftIO)-import           Control.Monad.Trans.RWS.Strict (evalRWST, asks, local, RWST)-import           Data.Foldable (traverse_)-import           Data.List (isSuffixOf)-import qualified Data.Text as T-import qualified Language.PureScript as P-import qualified Language.PureScript.CST as CST-import           Language.PureScript.Interactive-import           System.Directory (getCurrentDirectory, doesPathExist, removeFile)-import           System.Exit-import           System.FilePath ((</>), pathSeparator)-import qualified System.FilePath.Glob as Glob-import           Test.Hspec (shouldBe, Expectation)+import Control.Exception.Lifted (bracket_)+import Control.Monad (void, when)+import Control.Monad.IO.Class (liftIO)+import Control.Monad.Trans.RWS.Strict (evalRWST, asks, local, RWST)+import Data.Foldable (traverse_)+import Data.List (isSuffixOf)+import Data.Text qualified as T+import Language.PureScript qualified as P+import Language.PureScript.CST qualified as CST+import Language.PureScript.Interactive (Command(..), PSCiConfig(..), PSCiState, handleCommand, indexFile, initialPSCiState, loadAllModules, make, modulesDir, parseCommand, readNodeProcessWithExitCode, runMake, updateLoadedExterns)+import System.Directory (getCurrentDirectory, doesPathExist, removeFile)+import System.Exit+import System.FilePath ((</>), pathSeparator)+import System.FilePath.Glob qualified as Glob+import Test.Hspec (shouldBe, Expectation)  -- | A monad transformer for handle PSCi actions in tests type TestPSCi a = RWST PSCiConfig () PSCiState IO a