azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: Use default Java source roots for JPS projects

Browse Source 
#KT-35710 fixed
This commit is contained in:
Ilya Kirillov
2020-01-14 15:01:06 +03:00
parent 206284d33c
commit 6acf279a34
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/wizard/service/IdeaJpsWizardService.kt
+8 -7
View File
@@ -17,14 +17,15 @@ import com.intellij.openapi.roots.OrderRootType
import com.intellij.openapi.vfs.VfsUtil import com.intellij.openapi.vfs.VfsUtil
import com.intellij.util.PathUtil import com.intellij.util.PathUtil
import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties
import org.jetbrains.kotlin.config.ResourceKotlinRootType import org.jetbrains.jps.model.java.JavaResourceRootType
import org.jetbrains.kotlin.config.SourceKotlinRootType import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.config.TestResourceKotlinRootType
import org.jetbrains.kotlin.config.TestSourceKotlinRootType
import org.jetbrains.kotlin.idea.util.application.runWriteAction import org.jetbrains.kotlin.idea.util.application.runWriteAction
import org.jetbrains.kotlin.tools.projectWizard.core.* import org.jetbrains.kotlin.tools.projectWizard.core.*
import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService import org.jetbrains.kotlin.tools.projectWizard.core.service.ProjectImportingWizardService
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.* import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.DependencyType
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.LibraryDependencyIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.ModuleIR
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.isKotlinStdlib
import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact import org.jetbrains.kotlin.tools.projectWizard.library.MavenArtifact
import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType import org.jetbrains.kotlin.tools.projectWizard.plugins.buildSystem.BuildSystemType
import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType import org.jetbrains.kotlin.tools.projectWizard.settings.buildsystem.SourcesetType
@@ -68,11 +69,11 @@ private class ProjectImporter(
val isTest = sourceset == SourcesetType.test val isTest = sourceset == SourcesetType.test
contentRoot.addSourceFolder( contentRoot.addSourceFolder(
(moduleIr.path / "src" / sourceset.name / "kotlin").url, (moduleIr.path / "src" / sourceset.name / "kotlin").url,
if (isTest) TestSourceKotlinRootType else SourceKotlinRootType if (isTest) JavaSourceRootType.TEST_SOURCE else JavaSourceRootType.SOURCE
) )
contentRoot.addSourceFolder( contentRoot.addSourceFolder(
(moduleIr.path / "src" / sourceset.name / "resources").url, (moduleIr.path / "src" / sourceset.name / "resources").url,
if (isTest) TestResourceKotlinRootType else ResourceKotlinRootType if (isTest) JavaResourceRootType.TEST_RESOURCE else JavaResourceRootType.RESOURCE
) )
} }