ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-08-17 10:40:44 +03:00
Code Issues Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Rik van der Kleij 2019-10-01 13:55:01 +02:00
parent fb5a23515e
commit d722607aea
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/scala/intellij/haskell/external/component/HaskellComponentsManager.scala vendored
View File

@ -36,7 +36,8 @@ import scala.concurrent._
object HaskellComponentsManager {
case class StackComponentInfo(module: Module, modulePath: String, packageName: String, target: String, stanzaType: StanzaType, sourceDirs: Seq[String], mainIs: Option[String], isImplicitPreludeActive: Boolean, buildDepends: Seq[String], exposedModuleNames: Seq[String] = Seq.empty)
case class StackComponentInfo(module: Module, modulePath: String, packageName: String, target: String, stanzaType: StanzaType, sourceDirs: Seq[String],
mainIs: Option[String], isImplicitPreludeActive: Boolean, buildDepends: Seq[String], exposedModuleNames: Seq[String] = Seq.empty)
def findModuleIdentifiersInCache(project: Project): Iterable[ModuleIdentifier] = {
import scala.concurrent.ExecutionContext.Implicits.global
@ -209,14 +210,11 @@ object HaskellComponentsManager {
private def preloadLibraryFiles(project: Project): Unit = {
if (!project.isDisposed) {
if (!project.isDisposed) {
val libraryPackageInfos = LibraryPackageInfoComponent.libraryPackageInfos(project)
HaskellModuleNameIndex.fillCache(project, libraryPackageInfos.flatMap(libraryModuleNames => libraryModuleNames.exposedModuleNames ++ libraryModuleNames.hiddenModuleNames))
}
val libraryPackageInfos = LibraryPackageInfoComponent.libraryPackageInfos(project)
HaskellModuleNameIndex.fillCache(project, libraryPackageInfos.flatMap(libraryModuleNames => libraryModuleNames.exposedModuleNames ++ libraryModuleNames.hiddenModuleNames))
}
}
private def preloadLibraryIdentifiers(project: Project): Unit = {
import scala.concurrent.ExecutionContext.Implicits.global
@ -236,9 +234,9 @@ object HaskellComponentsManager {
} else {
val libraryModuleNames = componentInfos.flatMap(HaskellComponentsManager.findStackComponentGlobalInfo).flatMap(_.packageInfos)
val exposedlibraryModuleNames = libraryModuleNames.flatMap(_.exposedModuleNames).distinct
val exposedLibraryModuleNames = libraryModuleNames.flatMap(_.exposedModuleNames).distinct
val importDeclarations = ApplicationUtil.runInReadActionWithWriteActionPriority(project, HaskellPsiUtil.findImportDeclarations(f), "In preloadLibraryIdentifiers findImportDeclarations").toOption.getOrElse(Iterable())
importDeclarations.flatMap(id => ApplicationUtil.runReadAction(id.getModuleName)).filter(mn => exposedlibraryModuleNames.contains(mn)).filterNot(_ == HaskellProjectUtil.Prelude)
importDeclarations.flatMap(id => ApplicationUtil.runReadAction(id.getModuleName)).filter(mn => exposedLibraryModuleNames.contains(mn)).filterNot(_ == HaskellProjectUtil.Prelude)
}
})