de550a1 · rowtype-yoga/purescript-native

src/Language/PureScript/Ide.hs+6−6

compare with golang

unifiedsplit

@@ -43,7 +43,7 @@ import System.FilePath.Glob (glob)

43

44-- | Accepts a Commmand and runs it against psc-ide's State. This is the main

45-- entry point for the server.

46−handleCommand :: (Ide m, MonadLogger m, MonadError PscIdeError m) =>

46+handleCommand :: (Ide m, MonadLogger m, MonadError IdeError m) =>

47 Command -> m Success

48handleCommand c = case c of

49 Load [] ->

@@ -131,7 +131,7 @@ listAvailableModules = do

131 let cleaned = filter (`notElem` [".", ".."]) contents

132 return (ModuleList (map toS cleaned))

133

134−caseSplit :: (Ide m, MonadError PscIdeError m) =>

134+caseSplit :: (Ide m, MonadError IdeError m) =>

135 Text -> Int -> Int -> CS.WildcardAnnotations -> Text -> m Success

136caseSplit l b e csa t = do

137 patterns <- CS.makePattern l b e csa <$> CS.caseSplit t

@@ -139,7 +139,7 @@ caseSplit l b e csa t = do

139

140-- | Finds all the externs.json files inside the output folder and returns the

141-- corresponding Modulenames

142−findAvailableExterns :: (Ide m, MonadError PscIdeError m) => m [P.ModuleName]

142+findAvailableExterns :: (Ide m, MonadError IdeError m) => m [P.ModuleName]

143findAvailableExterns = do

144 oDir <- outputDirectory

145 unlessM (liftIO (doesDirectoryExist oDir))

@@ -169,7 +169,7 @@ findAllSourceFiles = do

169-- inserts their ASTs into the state. Finally kicks off an async worker, which

170-- populates Stage 2 and 3 of the state.

171loadModulesAsync

172− :: (Ide m, MonadError PscIdeError m, MonadLogger m)

172+ :: (Ide m, MonadError IdeError m, MonadLogger m)

173 => [P.ModuleName]

174 -> m Success

175loadModulesAsync moduleNames = do

@@ -185,7 +185,7 @@ loadModulesAsync moduleNames = do

185 pure tr

186

187loadModulesSync

188− :: (Ide m, MonadError PscIdeError m, MonadLogger m)

188+ :: (Ide m, MonadError IdeError m, MonadLogger m)

189 => [P.ModuleName]

190 -> m Success

191loadModulesSync moduleNames = do

@@ -194,7 +194,7 @@ loadModulesSync moduleNames = do

194 pure tr

195

196loadModules

197− :: (Ide m, MonadError PscIdeError m, MonadLogger m)

197+ :: (Ide m, MonadError IdeError m, MonadLogger m)

198 => [P.ModuleName]

199 -> m Success

200loadModules moduleNames = do

src/Language/PureScript/Ide/CaseSplit.hs+6−6

@@ -45,7 +45,7 @@ explicitAnnotations = WildcardAnnotations True

45noAnnotations :: WildcardAnnotations

46noAnnotations = WildcardAnnotations False

47

48−caseSplit :: (Ide m, MonadError PscIdeError m) =>

48+caseSplit :: (Ide m, MonadError IdeError m) =>

49 Text -> m [Constructor]

50caseSplit q = do

51 type' <- parseType' q

@@ -55,7 +55,7 @@ caseSplit q = do

55 let appliedCtors = map (second (map applyTypeVars)) ctors

56 pure appliedCtors

57

58−findTypeDeclaration :: (Ide m, MonadError PscIdeError m) =>

58+findTypeDeclaration :: (Ide m, MonadError IdeError m) =>

59 P.ProperName 'P.TypeName -> m ExternsDeclaration

60findTypeDeclaration q = do

61 efs <- getExternFiles

@@ -73,7 +73,7 @@ findTypeDeclaration' t ExternsFile{..} =

73 EDType tn _ _ -> tn == t

74 _ -> False) efDeclarations

75

76−splitTypeConstructor :: (MonadError PscIdeError m) =>

76+splitTypeConstructor :: (MonadError IdeError m) =>

77 P.Type -> m (P.ProperName 'P.TypeName, [P.Type])

78splitTypeConstructor = go []

79 where

@@ -105,7 +105,7 @@ makePattern t x y wsa = makePattern' (T.take x t) (T.drop y t)

105 where

106 makePattern' lhs rhs = map (\ctor -> lhs <> prettyCtor wsa ctor <> rhs)

107

108−addClause :: (MonadError PscIdeError m) => Text -> WildcardAnnotations -> m [Text]

108+addClause :: (MonadError IdeError m) => Text -> WildcardAnnotations -> m [Text]

109addClause s wca = do

110 (fName, fType) <- parseTypeDeclaration' s

111 let args = splitFunctionType fType

@@ -114,7 +114,7 @@ addClause s wca = do

114 " = ?" <> (T.strip . P.runIdent $ fName)

115 pure [s, template]

116

117−parseType' :: (MonadError PscIdeError m) =>

117+parseType' :: (MonadError IdeError m) =>

118 Text -> m P.Type

119parseType' s =

120 case P.lex "<psc-ide>" (toS s) >>= P.runTokenParser "<psc-ide>" (P.parseType <* Parsec.eof) of

@@ -123,7 +123,7 @@ parseType' s =

123 throwError (GeneralError ("Parsing the splittype failed with:"

124 <> show err))

125

126−parseTypeDeclaration' :: (MonadError PscIdeError m) => Text -> m (P.Ident, P.Type)

126+parseTypeDeclaration' :: (MonadError IdeError m) => Text -> m (P.Ident, P.Type)

127parseTypeDeclaration' s =

128 let x = do

129 ts <- P.lex "" (toS s)

src/Language/PureScript/Ide/Error.hs+4−4

@@ -13,7 +13,7 @@

13-----------------------------------------------------------------------------

14

15module Language.PureScript.Ide.Error

16− ( PscIdeError(..)

16+ ( IdeError(..)

17 ) where

18

19import Data.Aeson

@@ -22,7 +22,7 @@ import Language.PureScript.Ide.Types (ModuleIdent)

22import Protolude

23import qualified Text.Parsec.Error as P

24

25−data PscIdeError

25+data IdeError

26 = GeneralError Text

27 | NotFound Text

28 | ModuleNotFound ModuleIdent

@@ -31,7 +31,7 @@ data PscIdeError

31 | RebuildError [JSONError]

32 deriving (Show, Eq)

33

34−instance ToJSON PscIdeError where

34+instance ToJSON IdeError where

35 toJSON (RebuildError errs) = object

36 [ "resultType" .= ("error" :: Text)

37 , "result" .= errs

@@ -41,7 +41,7 @@ instance ToJSON PscIdeError where

41 , "result" .= textError err

42 ]

43

44−textError :: PscIdeError -> Text

44+textError :: IdeError -> Text

45textError (GeneralError msg) = msg

46textError (NotFound ident) = "Symbol '" <> ident <> "' not found."

47textError (ModuleNotFound ident) = "Module '" <> ident <> "' not found."

src/Language/PureScript/Ide/Externs.hs+2−2

@@ -28,13 +28,13 @@ import Data.Aeson (decodeStrict)

28import qualified Data.ByteString as BS

29import qualified Data.Map as Map

30import Data.Version (showVersion)

31−import Language.PureScript.Ide.Error (PscIdeError (..))

31+import Language.PureScript.Ide.Error (IdeError (..))

32import Language.PureScript.Ide.Types

33import Language.PureScript.Ide.Util

34

35import qualified Language.PureScript as P

36

37−readExternFile :: (MonadIO m, MonadError PscIdeError m, MonadLogger m) =>

37+readExternFile :: (MonadIO m, MonadError IdeError m, MonadLogger m) =>

38 FilePath -> m P.ExternsFile

39readExternFile fp = do

40 parseResult <- liftIO (decodeStrict <$> BS.readFile fp)

src/Language/PureScript/Ide/Imports.hs+6−6

@@ -39,7 +39,7 @@ import Language.PureScript.Ide.Filter

39import Language.PureScript.Ide.State

40import Language.PureScript.Ide.Types

41import Language.PureScript.Ide.Util

42−import System.IO.UTF8 (readUTF8FileT, writeUTF8FileT)

42+import System.IO.UTF8 (writeUTF8FileT)

43

44data Import = Import P.ModuleName P.ImportDeclarationType (Maybe P.ModuleName)

45 deriving (Eq, Show)

@@ -67,10 +67,10 @@ compImport (Import n i q) (Import n' i' q')

67

68-- | Reads a file and returns the (lines before the imports, the imports, the

69-- lines after the imports)

70−parseImportsFromFile :: (MonadIO m, MonadError PscIdeError m) =>

70+parseImportsFromFile :: (MonadIO m, MonadError IdeError m) =>

71 FilePath -> m (P.ModuleName, [Text], [Import], [Text])

72parseImportsFromFile fp = do

73− file <- liftIO (readUTF8FileT fp)

73+ file <- ideReadFile fp

74 case sliceImportSection (T.lines file) of

75 Right res -> pure res

76 Left err -> throwError (GeneralError err)

@@ -147,7 +147,7 @@ moduleParse t = first show $ do

147 P.runTokenParser "<psc-ide>" P.parseModule tokens

148

149-- | Adds an implicit import like @import Prelude@ to a Sourcefile.

150−addImplicitImport :: (MonadIO m, MonadError PscIdeError m)

150+addImplicitImport :: (MonadIO m, MonadError IdeError m)

151 => FilePath -- ^ The Sourcefile read from

152 -> P.ModuleName -- ^ The module to import

153 -> m [Text]

@@ -170,7 +170,7 @@ addImplicitImport' imports mn =

170-- So @addExplicitImport "/File.purs" "bind" "Prelude"@ with an already existing

171-- @import Prelude (bind)@ in the file File.purs returns @["import Prelude

172-- (bind, unit)"]@

173−addExplicitImport :: (MonadIO m, MonadError PscIdeError m) =>

173+addExplicitImport :: (MonadIO m, MonadError IdeError m) =>

174 FilePath -> IdeDeclaration -> P.ModuleName -> m [Text]

175addExplicitImport fp decl moduleName = do

176 (mn, pre, imports, post) <- parseImportsFromFile fp

@@ -249,7 +249,7 @@ updateAtFirstOrPrepend p t d l =

249--

250-- * If more than one possible imports are found, reports the possibilities as a

251-- list of completions.

252−addImportForIdentifier :: (Ide m, MonadError PscIdeError m)

252+addImportForIdentifier :: (Ide m, MonadError IdeError m)

253 => FilePath -- ^ The Sourcefile to read from

254 -> Text -- ^ The identifier to import

255 -> [Filter] -- ^ Filters to apply before searching for

src/Language/PureScript/Ide/Rebuild.hs+6−6

@@ -20,7 +20,7 @@ import Language.PureScript.Ide.Error

20import Language.PureScript.Ide.Logging

21import Language.PureScript.Ide.State

22import Language.PureScript.Ide.Types

23−import System.IO.UTF8 (readUTF8FileT)

23+import Language.PureScript.Ide.Util

24

25-- | Given a filepath performs the following steps:

26--

@@ -38,7 +38,7 @@ import System.IO.UTF8 (readUTF8FileT)

38-- warnings, and if rebuilding fails, returns a @RebuildError@ with the

39-- generated errors.

40rebuildFile

41− :: (Ide m, MonadLogger m, MonadError PscIdeError m)

41+ :: (Ide m, MonadLogger m, MonadError IdeError m)

42 => FilePath

43 -- ^ The file to rebuild

44 -> (ReaderT IdeEnvironment (LoggingT IO) () -> m ())

@@ -46,7 +46,7 @@ rebuildFile

46 -> m Success

47rebuildFile path runOpenBuild = do

48

49− input <- liftIO (readUTF8FileT path)

49+ input <- ideReadFile path

50

51 m <- case snd <$> P.parseModuleFromFile identity (path, input) of

52 Left parseError -> throwError

@@ -80,7 +80,7 @@ rebuildFile path runOpenBuild = do

80 pure (RebuildSuccess (toJSONErrors False P.Warning warnings))

81

82rebuildFileAsync

83− :: forall m. (Ide m, MonadLogger m, MonadError PscIdeError m)

83+ :: forall m. (Ide m, MonadLogger m, MonadError IdeError m)

84 => FilePath -> m Success

85rebuildFileAsync fp = rebuildFile fp asyncRun

86 where

@@ -91,7 +91,7 @@ rebuildFileAsync fp = rebuildFile fp asyncRun

91 void (liftIO (async (runLogger ll (runReaderT action env))))

92

93rebuildFileSync

94− :: forall m. (Ide m, MonadLogger m, MonadError PscIdeError m)

94+ :: forall m. (Ide m, MonadLogger m, MonadError IdeError m)

95 => FilePath -> m Success

96rebuildFileSync fp = rebuildFile fp syncRun

97 where

@@ -158,7 +158,7 @@ shushCodegen ma MakeActionsEnv{..} =

158-- module. Throws an error if there is a cyclic dependency within the

159-- ExternsFiles

160sortExterns

161− :: (Ide m, MonadError PscIdeError m)

161+ :: (Ide m, MonadError IdeError m)

162 => P.Module

163 -> ModuleMap P.ExternsFile

164 -> m [P.ExternsFile]

src/Language/PureScript/Ide/SourceFile.hs+3−4

@@ -28,14 +28,13 @@ import qualified Language.PureScript as P

28import Language.PureScript.Ide.Error

29import Language.PureScript.Ide.Types

30import Language.PureScript.Ide.Util

31−import System.IO.UTF8 (readUTF8FileT)

32

31

33parseModule

32parseModule

34− :: (MonadIO m)

33+ :: (MonadIO m, MonadError IdeError m)

35 => FilePath

34 => FilePath

36 -> m (Either FilePath (FilePath, P.Module))

35 -> m (Either FilePath (FilePath, P.Module))

37parseModule path = do

36parseModule path = do

38− contents <- liftIO (readUTF8FileT path)

37+ contents <- ideReadFile path

39 case P.parseModuleFromFile identity (path, contents) of

38 case P.parseModuleFromFile identity (path, contents) of

40 Left _ -> pure (Left path)

39 Left _ -> pure (Left path)

41 Right m -> pure (Right m)

40 Right m -> pure (Right m)

@@ -47,7 +46,7 @@ getImports (P.Module _ _ _ declarations _) =

47 isImport (P.PositionedDeclaration _ _ (P.ImportDeclaration a b c)) = Just (a, b, c)

46 isImport (P.PositionedDeclaration _ _ (P.ImportDeclaration a b c)) = Just (a, b, c)

48 isImport _ = Nothing

47 isImport _ = Nothing

49

48

50−getImportsForFile :: (MonadIO m, MonadError PscIdeError m) =>

49+getImportsForFile :: (MonadIO m, MonadError IdeError m) =>

51 FilePath -> m [ModuleImport]

50 FilePath -> m [ModuleImport]

52getImportsForFile fp = do

51getImportsForFile fp = do

53 moduleE <- parseModule fp

52 moduleE <- parseModule fp

src/Language/PureScript/Ide/Util.hs+11

@@ -28,6 +28,7 @@ module Language.PureScript.Ide.Util

28 , properNameT

29 , identT

30 , opNameT

31+ , ideReadFile

31 , module Language.PureScript.Ide.Logging

32 , module Language.PureScript.Ide.Logging

32 ) where

33 ) where

33

34

@@ -40,8 +41,10 @@ import qualified Data.Text as T

40import qualified Data.Text.Lazy as TL

41import qualified Data.Text.Lazy as TL

41import Data.Text.Lazy.Encoding (decodeUtf8, encodeUtf8)

42import Data.Text.Lazy.Encoding (decodeUtf8, encodeUtf8)

42import qualified Language.PureScript as P

43import qualified Language.PureScript as P

44+import Language.PureScript.Ide.Error

43import Language.PureScript.Ide.Logging

45import Language.PureScript.Ide.Logging

44import Language.PureScript.Ide.Types

46import Language.PureScript.Ide.Types

47+import System.IO.UTF8 (readUTF8FileT)

45

48

46identifierFromIdeDeclaration :: IdeDeclaration -> Text

49identifierFromIdeDeclaration :: IdeDeclaration -> Text

47identifierFromIdeDeclaration d = case d of

50identifierFromIdeDeclaration d = case d of

@@ -127,6 +130,14 @@ identT = iso P.runIdent P.Ident

127opNameT :: Iso' (P.OpName a) Text

130opNameT :: Iso' (P.OpName a) Text

128opNameT = iso P.runOpName P.OpName

131opNameT = iso P.runOpName P.OpName

129

132

133+ideReadFile :: (MonadIO m, MonadError IdeError m) => FilePath -> m Text

134+ideReadFile fp = do

135+ contents :: Either IOException Text <- liftIO (try (readUTF8FileT fp))

136+ either

137+ (\_ -> throwError (GeneralError ("Couldn't find file at: " <> T.pack fp)))

138+ pure

139+ contents

140+

130prettyTypeT :: P.Type -> Text

141prettyTypeT :: P.Type -> Text

131prettyTypeT =

142prettyTypeT =

132 T.unwords

143 T.unwords

tests/Language/PureScript/Ide/ImportsSpec.hs+1−1

@@ -190,7 +190,7 @@ importShouldBe :: [Text] -> [Text] -> Expectation

190importShouldBe res importSection =

191 res `shouldBe` [ "module ImportsSpec where" , ""] ++ importSection ++ [ "" , "myId x = x"]

192

193−runIdeLoaded :: Command -> IO (Either PscIdeError Success)

193+runIdeLoaded :: Command -> IO (Either IdeError Success)

194runIdeLoaded c = do

195 ([_, result], _) <- Test.inProject $ Test.runIde [Command.LoadSync [] , c]

196 pure result

tests/Language/PureScript/Ide/Test.hs+2−2

@@ -24,7 +24,7 @@ defConfig =

24 , confGlobs = ["src/*.purs"]

25 }

26

27−runIde' :: Configuration -> IdeState -> [Command] -> IO ([Either PscIdeError Success], IdeState)

27+runIde' :: Configuration -> IdeState -> [Command] -> IO ([Either IdeError Success], IdeState)

28runIde' conf s cs = do

29 stateVar <- newTVarIO s

30 let env' = IdeEnvironment {ideStateVar = stateVar, ideConfiguration = conf}

@@ -32,7 +32,7 @@ runIde' conf s cs = do

32 newState <- readTVarIO stateVar

33 pure (r, newState)

34

35−runIde :: [Command] -> IO ([Either PscIdeError Success], IdeState)

35+runIde :: [Command] -> IO ([Either IdeError Success], IdeState)

36runIde = runIde' defConfig emptyIdeState

37

38s3 :: IdeState -> [(Text, [IdeDeclarationAnn])] -> IdeState