MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-02-04 23:39:07 +07:00
Code Issues Packages Projects Releases Wiki Activity

RUBY-21465 Ruby Facet is missing

Browse Source 
Implement configurator to import rails project
Disable JDK auto-configuration when modules is not Java modules

IDEA-CR-70101

GitOrigin-RevId: 31a183250c99d37a1f709e30e88181df94743192
This commit is contained in:
Dmitry Pogrebnoy
2020-12-10 11:11:31 +03:00
committed by intellij-monorepo-bot
parent d7f44b5935
commit 5ff284c13d
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
java/idea-ui/src/com/intellij/ide/SetupJavaProjectFromSourcesActivity.kt
View File

@@ -18,10 +18,14 @@ import com.intellij.openapi.application.ApplicationManager
import com.intellij.openapi.application.WriteAction
import com.intellij.openapi.diagnostic.logger
import com.intellij.openapi.fileTypes.FileTypeRegistry
import com.intellij.openapi.module.JavaModuleType
import com.intellij.openapi.module.ModuleManager
import com.intellij.openapi.module.ModuleType
import com.intellij.openapi.progress.ProgressIndicator
import com.intellij.openapi.progress.ProgressManager
import com.intellij.openapi.progress.Task
import com.intellij.openapi.project.Project
import com.intellij.openapi.project.modifyModules
import com.intellij.openapi.projectRoots.JavaSdk
import com.intellij.openapi.projectRoots.Sdk
import com.intellij.openapi.roots.ui.configuration.ModulesProvider
@@ -183,7 +187,10 @@ internal class SetupJavaProjectFromSourcesActivity : StartupActivity {
setCompilerOutputPath(project, compileOutput)
}
findAndSetupJdk(project, indicator)
val modules = ModuleManager.getInstance(project).modules
if (modules.any { it is JavaModuleType }) {
findAndSetupJdk(project, indicator)
}
if (roots.size > MAX_ROOTS_IN_TRIVIAL_PROJECT_STRUCTURE) {
notifyAboutAutomaticProjectStructure(project)