Fix a number of compiler/IDE warnings in IDE and kapt modules
This commit is contained in:
+6
-2
@@ -180,7 +180,10 @@ fun getConfiguratorByName(name: String): KotlinProjectConfigurator? {
|
||||
return allConfigurators().firstOrNull { it.name == name }
|
||||
}
|
||||
|
||||
fun allConfigurators() = Extensions.getExtensions(KotlinProjectConfigurator.EP_NAME)
|
||||
fun allConfigurators(): Array<KotlinProjectConfigurator> {
|
||||
@Suppress("DEPRECATION")
|
||||
return Extensions.getExtensions(KotlinProjectConfigurator.EP_NAME)
|
||||
}
|
||||
|
||||
fun getCanBeConfiguredModules(project: Project, configurator: KotlinProjectConfigurator): List<Module> {
|
||||
return ModuleSourceRootMap(project).groupByBaseModules(project.allModules())
|
||||
@@ -224,6 +227,7 @@ fun getConfigurationPossibilitiesForConfigureNotification(
|
||||
runnableConfigurators.add(configurator)
|
||||
}
|
||||
ConfigureKotlinStatus.CONFIGURED -> moduleAlreadyConfigured = true
|
||||
else -> {}
|
||||
}
|
||||
}
|
||||
if (moduleCanBeConfigured && !moduleAlreadyConfigured && !SuppressNotificationState.isKotlinNotConfiguredSuppressed(
|
||||
@@ -271,7 +275,7 @@ fun hasKotlinCommonRuntimeInScope(scope: GlobalSearchScope): Boolean {
|
||||
|
||||
class LibraryKindSearchScope(
|
||||
val module: Module,
|
||||
val baseScope: GlobalSearchScope,
|
||||
baseScope: GlobalSearchScope,
|
||||
val libraryKind: PersistentLibraryKind<*>
|
||||
) : DelegatingGlobalSearchScope(baseScope) {
|
||||
override fun contains(file: VirtualFile): Boolean {
|
||||
|
||||
+6
-5
@@ -28,7 +28,6 @@ import com.intellij.openapi.roots.OrderRootType
|
||||
import com.intellij.openapi.roots.impl.libraries.LibraryEx
|
||||
import com.intellij.openapi.roots.libraries.Library
|
||||
import org.jetbrains.kotlin.cli.common.arguments.K2JVMCompilerArguments
|
||||
import org.jetbrains.kotlin.config.JvmTarget
|
||||
import org.jetbrains.kotlin.idea.compiler.configuration.Kotlin2JvmCompilerArgumentsHolder
|
||||
import org.jetbrains.kotlin.idea.facet.getOrCreateFacet
|
||||
import org.jetbrains.kotlin.idea.facet.initializeIfNeeded
|
||||
@@ -39,7 +38,6 @@ import org.jetbrains.kotlin.idea.util.projectStructure.allModules
|
||||
import org.jetbrains.kotlin.idea.util.projectStructure.sdk
|
||||
import org.jetbrains.kotlin.idea.util.projectStructure.version
|
||||
import org.jetbrains.kotlin.idea.versions.LibraryJarDescriptor
|
||||
import org.jetbrains.kotlin.platform.impl.JvmIdePlatformKind
|
||||
import org.jetbrains.kotlin.platform.TargetPlatform
|
||||
import org.jetbrains.kotlin.platform.jvm.JvmPlatforms
|
||||
|
||||
@@ -73,11 +71,11 @@ open class KotlinJavaModuleConfigurator protected constructor() : KotlinWithLibr
|
||||
override val targetPlatform: TargetPlatform
|
||||
get() = JvmPlatforms.unspecifiedJvmPlatform
|
||||
|
||||
@Suppress("DEPRECATION_ERROR")
|
||||
@Suppress("DEPRECATION_ERROR", "OverridingDeprecatedMember")
|
||||
override fun getTargetPlatform() = JvmPlatforms.CompatJvmPlatform
|
||||
|
||||
override fun getLibraryJarDescriptors(sdk: Sdk?): List<LibraryJarDescriptor> {
|
||||
var result = listOf(
|
||||
val result = mutableListOf(
|
||||
LibraryJarDescriptor.RUNTIME_JAR,
|
||||
LibraryJarDescriptor.RUNTIME_SRC_JAR,
|
||||
LibraryJarDescriptor.REFLECT_JAR,
|
||||
@@ -142,7 +140,10 @@ open class KotlinJavaModuleConfigurator protected constructor() : KotlinWithLibr
|
||||
const val NAME = "java"
|
||||
|
||||
val instance: KotlinJavaModuleConfigurator
|
||||
get() = Extensions.findExtension(KotlinProjectConfigurator.EP_NAME, KotlinJavaModuleConfigurator::class.java)
|
||||
get() {
|
||||
@Suppress("DEPRECATION")
|
||||
return Extensions.findExtension(KotlinProjectConfigurator.EP_NAME, KotlinJavaModuleConfigurator::class.java)
|
||||
}
|
||||
}
|
||||
|
||||
private fun hasBrokenJsRuntime(module: Module): Boolean {
|
||||
|
||||
@@ -50,6 +50,7 @@ class JSLibraryType : LibraryType<DummyLibraryProperties>(JSLibraryKind) {
|
||||
override fun getIcon(properties: DummyLibraryProperties?) = KotlinIcons.JS
|
||||
|
||||
companion object {
|
||||
@Suppress("DEPRECATION")
|
||||
fun getInstance() = Extensions.findExtension(EP_NAME, JSLibraryType::class.java)
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,8 @@ class KotlinTemplatesFactory : ProjectTemplatesFactory() {
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
@Suppress("DEPRECATION")
|
||||
result.addAll(Extensions.getExtensions(EP_NAME).map { BuilderBasedTemplate(it) })
|
||||
return result.toTypedArray()
|
||||
}
|
||||
|
||||
+4
-1
@@ -190,7 +190,10 @@ internal fun findProblem(
|
||||
internal fun getQualifiedNameFromProviders(element: PsiElement): String? {
|
||||
DumbService.getInstance(element.project).isAlternativeResolveEnabled = true
|
||||
try {
|
||||
for (provider in Extensions.getExtensions(QualifiedNameProvider.EP_NAME)) {
|
||||
@Suppress("DEPRECATION")
|
||||
val extensions = Extensions.getExtensions(QualifiedNameProvider.EP_NAME)
|
||||
|
||||
for (provider in extensions) {
|
||||
val result = provider.getQualifiedName(element)
|
||||
if (result != null) return result
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user