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

Use more abstract class for gradleModuleBuilder

Browse Source 
In IDEA 201.* another class is in super class list
^KT-34463 Fixed
This commit is contained in:
Natalia Selezneva
2019-10-24 11:31:19 +03:00
parent 46d843643d
commit 934cbcbbec
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/gradleModuleBuilderUtils.kt
+3 -2
View File
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.idea.configuration
import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable import com.intellij.framework.addSupport.FrameworkSupportInModuleConfigurable
import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel import com.intellij.ide.util.frameworkSupport.FrameworkSupportModel
import com.intellij.openapi.externalSystem.model.project.ProjectId import com.intellij.openapi.externalSystem.model.project.ProjectId
import com.intellij.openapi.externalSystem.service.project.wizard.AbstractExternalModuleBuilder
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.project.Project import com.intellij.openapi.project.Project
import com.intellij.openapi.project.ProjectCoreUtil import com.intellij.openapi.project.ProjectCoreUtil
@@ -30,7 +31,7 @@ import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory
import java.io.File import java.io.File
internal var Module.gradleModuleBuilder: GradleModuleBuilder? by UserDataProperty(Key.create("GRADLE_MODULE_BUILDER")) internal var Module.gradleModuleBuilder: AbstractExternalModuleBuilder<*>? by UserDataProperty(Key.create("GRADLE_MODULE_BUILDER"))
private var Module.settingsScriptBuilder: SettingsScriptBuilder<out PsiFile>? by UserDataProperty(Key.create("SETTINGS_SCRIPT_BUILDER")) private var Module.settingsScriptBuilder: SettingsScriptBuilder<out PsiFile>? by UserDataProperty(Key.create("SETTINGS_SCRIPT_BUILDER"))
internal fun findSettingsGradleFile(module: Module): VirtualFile? { internal fun findSettingsGradleFile(module: Module): VirtualFile? {
@@ -202,7 +203,7 @@ class KotlinGradleFrameworkSupportInModuleConfigurable(
val builder = model.moduleBuilder val builder = model.moduleBuilder
val projectId = (builder as? GradleModuleBuilder)?.projectId ?: ProjectId(null, module.name, null) val projectId = (builder as? GradleModuleBuilder)?.projectId ?: ProjectId(null, module.name, null)
try { try {
module.gradleModuleBuilder = builder as? GradleModuleBuilder module.gradleModuleBuilder = builder as? AbstractExternalModuleBuilder<*>
supportProvider.addSupport(projectId, module, rootModel, modifiableModelsProvider, buildScriptData) supportProvider.addSupport(projectId, module, rootModel, modifiableModelsProvider, buildScriptData)
} finally { } finally {
flushSettingsGradleCopy(module) flushSettingsGradleCopy(module)