Skip to content

Commit 6aa3c26

Browse files
committed
Disable facet detection; force detection of API/language level from dependencies on project opening
1 parent 5871327 commit 6aa3c26

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

idea/src/org/jetbrains/kotlin/idea/configuration/ui/KotlinConfigurationCheckerComponent.kt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ import com.intellij.openapi.components.AbstractProjectComponent
2222
import com.intellij.openapi.project.DumbService
2323
import com.intellij.openapi.project.Project
2424
import com.intellij.openapi.startup.StartupManager
25-
import org.jetbrains.kotlin.idea.configuration.*
26-
import org.jetbrains.kotlin.idea.versions.*
25+
import org.jetbrains.kotlin.idea.configuration.getModulesWithKotlinFiles
26+
import org.jetbrains.kotlin.idea.configuration.showConfigureKotlinNotificationIfNeeded
27+
import org.jetbrains.kotlin.idea.project.getAndCacheLanguageLevelByDependencies
28+
import org.jetbrains.kotlin.idea.versions.collectModulesWithOutdatedRuntime
29+
import org.jetbrains.kotlin.idea.versions.findOutdatedKotlinLibraries
30+
import org.jetbrains.kotlin.idea.versions.notifyOutdatedKotlinRuntime
2731
import java.util.concurrent.atomic.AtomicInteger
2832

2933
class KotlinConfigurationCheckerComponent protected constructor(project: Project) : AbstractProjectComponent(project) {
@@ -38,6 +42,10 @@ class KotlinConfigurationCheckerComponent protected constructor(project: Project
3842

3943
StartupManager.getInstance(myProject).registerPostStartupActivity {
4044
DumbService.getInstance(myProject).smartInvokeLater {
45+
for (module in getModulesWithKotlinFiles(myProject)) {
46+
module.getAndCacheLanguageLevelByDependencies()
47+
}
48+
4149
val libraries = findOutdatedKotlinLibraries(myProject)
4250
if (!libraries.isEmpty()) {
4351
notifyOutdatedKotlinRuntime(myProject, libraries)

idea/src/org/jetbrains/kotlin/idea/facet/FacetConfigurator.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,13 @@ import com.intellij.openapi.editor.Editor
2929
import com.intellij.openapi.progress.ProgressIndicator
3030
import com.intellij.openapi.project.DumbService
3131
import com.intellij.openapi.project.Project
32-
import com.intellij.openapi.roots.PlatformModifiableModelsProvider
33-
import com.intellij.openapi.roots.ui.configuration.DefaultModulesProvider
3432
import com.intellij.openapi.startup.StartupManager
3533
import com.intellij.openapi.vfs.VirtualFile
3634
import com.intellij.psi.PsiFile
3735
import com.intellij.psi.search.GlobalSearchScope
3836
import com.intellij.util.indexing.FileBasedIndex
3937
import com.intellij.util.ui.update.MergingUpdateQueue
4038
import com.intellij.util.ui.update.Update
41-
import org.jetbrains.kotlin.utils.ifEmpty
4239
import java.util.*
4340

4441
// Based on com.intellij.framework.detection.impl.FrameworkDetectionManager
@@ -124,6 +121,7 @@ class FacetConfigurator(
124121
if (!shouldDetect) return
125122
shouldDetect = false
126123

124+
/*
127125
val index = FileBasedIndex.getInstance()
128126
val newDescriptions = ArrayList<DetectedFrameworkDescription>()
129127
val oldDescriptions = ArrayList<DetectedFrameworkDescription>()
@@ -139,10 +137,17 @@ class FacetConfigurator(
139137
if (FrameworkDetectionUtil.removeDisabled(newDescriptions, oldDescriptions).isEmpty()) return
140138
141139
val validFrameworks = getValidDetectedFrameworks().ifEmpty { return }
140+
for (validFramework in validFrameworks) {
141+
if (validFramework is FacetBasedDetectedFrameworkDescription<*, *>) {
142+
val module = ModuleManager.getInstance(myProject).findModuleByName(validFramework.get)
143+
}
144+
145+
}
142146
FrameworkDetectionUtil.setupFrameworks(frameworks, PlatformModifiableModelsProvider(), DefaultModulesProvider(myProject))
143147
for (framework in validFrameworks) {
144148
myDetectedFrameworksData!!.putExistentFrameworkFiles(id, framework.relatedFiles)
145149
}
150+
*/
146151
}
147152

148153
private fun runDetector(detectorId: Int?,

0 commit comments

Comments
 (0)