start removal of state

Author: roryc89

purescript.cabal

@@ -306,6 +306,7 @@ library
     Language.PureScript.Hierarchy
     Language.PureScript.Ide
     Language.PureScript.Ide.CaseSplit
+    Language.PureScript.Ide.Cache
     Language.PureScript.Ide.Command
     Language.PureScript.Ide.Completion
     Language.PureScript.Ide.Error

src/Language/PureScript/AST/Declarations.hs

@@ -120,7 +120,7 @@ data UnknownsHint
 -- explicitly exported. If the export list is Nothing, everything is exported.
 --
 data Module = Module SourceSpan [Comment] ModuleName [Declaration] (Maybe [DeclarationRef])
-  deriving (Show)
+  deriving (Show, Serialise, Generic)
 
 -- | Return a module's name.
 getModuleName :: Module -> ModuleName
@@ -445,7 +445,7 @@ data Declaration
   -- declaration, while the second @SourceAnn@ serves as the
   -- annotation for the type class and its arguments.
   | TypeInstanceDeclaration SourceAnn SourceAnn ChainId Integer (Either Text Ident) [SourceConstraint] (Qualified (ProperName 'ClassName)) [SourceType] TypeInstanceBody
-  deriving (Show, Generic, NFData)
+  deriving (Show, Generic, Serialise, NFData)
 
 data ValueFixity = ValueFixity Fixity (Qualified (Either Ident (ProperName 'ConstructorName))) (OpName 'ValueOpName)
   deriving (Eq, Ord, Show, Generic, NFData)

src/Language/PureScript/Ide/State.hs

@@ -117,14 +117,7 @@ insertModule module' = do
   liftIO . atomically $ insertModuleSTM stateVar module'
 
 -- | STM version of insertModule
-insertModuleSTM :: TVar IdeState -> (FilePath, P.Module) -> STM ()
-insertModuleSTM ref (fp, module') =
-  modifyTVar ref $ \x ->
-    x { ideFileState = (ideFileState x) {
-          fsModules = Map.insert
-            (P.getModuleName module')
-            (module', fp)
-            (fsModules (ideFileState x))}}
+
 
 -- | Retrieves the FileState from the State. This includes loaded Externfiles
 -- and parsed Modules
@@ -231,13 +224,14 @@ populateVolatileState = do
 
 -- | STM version of populateVolatileState
 populateVolatileStateSTM
-  :: TVar IdeState
+  :: FilePath
   -> STM (ModuleMap (ReexportResult [IdeDeclarationAnn]))
-populateVolatileStateSTM ref = do
-  IdeFileState{fsExterns = externs, fsModules = modules} <- getFileStateSTM ref
+populateVolatileStateSTM outputPath = do
+  -- IdeFileState{fsExterns = externs, fsModules = modules} <- getFileStateSTM outputPath
   -- We're not using the cached rebuild for anything other than preserving it
   -- through the repopulation
-  rebuildCache <- vsCachedRebuild <$> getVolatileStateSTM ref
+  rebuildCache <- vsCachedRebuild <$> getVolatileStateSTM outputPath
+
   let asts = map (extractAstInformation . fst) modules
   let (moduleDeclarations, reexportRefs) = unzip (Map.map convertExterns externs)
       results =