ilyakooo0/intellij-haskell
1
0
Fork 0
mirror of https://github.com/ilyakooo0/intellij-haskell.git synced 2024-09-11 14:56:19 +03:00
Code Issues Projects Releases Wiki Activity

Also check in importer that package path exists. Issue #379.

Browse Source
This commit is contained in:
Rik van der Kleij 2019-02-11 20:52:22 +01:00
parent ad9cec05cf
commit 7a39d41717
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/scala/intellij/haskell/module/StackProjectImportBuilder.scala
View File

@ -25,6 +25,7 @@ import com.intellij.openapi.module.{ModifiableModuleModel, Module, ModuleType}
import com.intellij.openapi.project.Project
import com.intellij.openapi.roots.ModifiableRootModel
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
import com.intellij.openapi.ui.Messages
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.packaging.artifacts.ModifiableArtifactModel
import com.intellij.projectImport.ProjectImportBuilder
@ -79,17 +80,21 @@ object StackProjectImportBuilder {
def addHaskellModule(project: Project, packageRelativePath: String, projectRoot: String): Unit = {
val moduleBuilder = HaskellModuleType.getInstance.createModuleBuilder()
val moduleDirectory = HaskellModuleBuilder.getModuleRootDirectory(packageRelativePath, projectRoot)
ApplicationUtil.runReadAction(HaskellModuleBuilder.createCabalInfo(project, projectRoot, packageRelativePath)) match {
case Some(cabalInfo) =>
val packageName = cabalInfo.packageName
moduleBuilder.setCabalInfo(cabalInfo)
moduleBuilder.setName(packageName)
moduleBuilder.setModuleFilePath(getModuleImlFilePath(moduleDirectory, packageName))
ApplicationManager.getApplication.invokeAndWait(ScalaUtil.runnable(moduleBuilder.commit(project)))
moduleBuilder.addModuleConfigurationUpdater((_: Module, rootModel: ModifiableRootModel) => {
moduleBuilder.setupRootModel(rootModel)
})
case None => ()
if (moduleDirectory.exists()) {
ApplicationUtil.runReadAction(HaskellModuleBuilder.createCabalInfo(project, projectRoot, packageRelativePath)) match {
case Some(cabalInfo) =>
val packageName = cabalInfo.packageName
moduleBuilder.setCabalInfo(cabalInfo)
moduleBuilder.setName(packageName)
moduleBuilder.setModuleFilePath(getModuleImlFilePath(moduleDirectory, packageName))
ApplicationManager.getApplication.invokeAndWait(ScalaUtil.runnable(moduleBuilder.commit(project)))
moduleBuilder.addModuleConfigurationUpdater((_: Module, rootModel: ModifiableRootModel) => {
moduleBuilder.setupRootModel(rootModel)
})
case None => ()
}
} else {
Messages.showErrorDialog(s"Can not add package $packageRelativePath as module because it's absolute file path ${moduleDirectory.getAbsolutePath} does not exist.", "Module can not be created")
}
}