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

[kotlin] Migrate 'KtNonErrorClassType' to 'KaClassType'

Browse Source 
^KT-67996

GitOrigin-RevId: d14505f253c01bd56232f3214471531fb9d25d71
This commit is contained in:
Yan Zhulanow
2024-06-24 01:36:35 +09:00
committed by intellij-monorepo-bot
parent 536c880acd
commit b7e33c948c
55 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/devkit/intellij.kotlin.devkit/src/inspections/CompanionObjectInExtensionInspection.kt
View File

@@ -26,7 +26,7 @@ import org.jetbrains.idea.devkit.kotlin.DevKitKotlinBundle
import org.jetbrains.kotlin.analysis.api.analyze
import org.jetbrains.kotlin.analysis.api.permissions.KaAllowAnalysisOnEdt
import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
import org.jetbrains.kotlin.analysis.api.types.KaClassType
import org.jetbrains.kotlin.analysis.api.types.KaTypeNullability
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester
@@ -110,7 +110,7 @@ private val KtProperty.isLoggerInstance: Boolean
// FIXME: buildClassType(LOGGER_CLASS_ID) should also work, does not work in tests for some reason
val loggerType = getClassOrObjectSymbolByClassId(LOGGER_CLASS_ID)?.let(::buildClassType)
if (propertyReturnType !is KtNonErrorClassType || loggerType !is KtNonErrorClassType) return false
if (propertyReturnType !is KaClassType || loggerType !is KaClassType) return false
propertyReturnType.isSubTypeOf(loggerType)
}

4
plugins/devkit/intellij.kotlin.devkit/src/inspections/KtAppServiceAsStaticFinalFieldOrPropertyProvider.kt
View File

@@ -25,7 +25,7 @@ import org.jetbrains.kotlin.analysis.api.permissions.allowAnalysisOnEdt
import org.jetbrains.kotlin.analysis.api.symbols.KaConstructorSymbol
import org.jetbrains.kotlin.analysis.api.symbols.KaPropertySymbol
import org.jetbrains.kotlin.analysis.api.symbols.KaSamConstructorSymbol
import org.jetbrains.kotlin.analysis.api.types.KtNonErrorClassType
import org.jetbrains.kotlin.analysis.api.types.KaClassType
import org.jetbrains.kotlin.analysis.api.types.KaTypeNullability
import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggester
import org.jetbrains.kotlin.idea.base.codeInsight.KotlinNameSuggestionProvider
@@ -135,7 +135,7 @@ private class KtWrapInSupplierQuickFix(ktProperty: KtProperty) : WrapInSupplierQ
allowAnalysisFromWriteAction {
analyze(element) {
val returnType = element.getReturnKtType().lowerBoundIfFlexible()
(returnType as? KtNonErrorClassType)?.classId
(returnType as? KaClassType)?.classId
}
}
}