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

[Analysis API] Treat inapplicable declarations safely (KTIJ-23458)

Browse Source 
Make 'getClassOrObjectSymbol()' and 'getNamedClassOrObjectSymbol()'
return 'null' for inapplicable PSI declarations.
This commit is contained in:
Yan Zhulanow
2022-11-01 19:23:56 +09:00
committed by teamcity
parent 0a8b9c821c
commit 4d41ac09df
7 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/containingDeclarationProvider/AbstractContainingDeclarationProviderByDelegatedMemberScopeTest.kt
+1 -1
View File
@@ -19,7 +19,7 @@ abstract class AbstractContainingDeclarationProviderByDelegatedMemberScopeTest :
val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtClassOrObject>(ktFile)
val memberToContainingClass = analyseForTest(declaration) {
val symbol = declaration.getClassOrObjectSymbol()
val symbol = declaration.getClassOrObjectSymbol()!!
renderScopeWithParentDeclarations(symbol.getDelegatedMemberScope())
}
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/containingDeclarationProvider/AbstractContainingDeclarationProviderByMemberScopeTest.kt
+1 -1
View File
@@ -24,7 +24,7 @@ abstract class AbstractContainingDeclarationProviderByMemberScopeTest : Abstract
val declaration = testServices.expressionMarkerProvider.getElementOfTypeAtCaret<KtClassOrObject>(ktFile)
val memberToContainingClass = analyseForTest(declaration) {
val symbol = declaration.getClassOrObjectSymbol()
val symbol = declaration.getClassOrObjectSymbol()!!
renderScopeWithParentDeclarations(symbol.getMemberScope())
}
analysis/analysis-api-impl-base/tests/org/jetbrains/kotlin/analysis/api/impl/base/test/cases/components/symbolDeclarationOverridesProvider/AbstractIsSubclassOfTest.kt
+2 -2
View File
@@ -21,8 +21,8 @@ abstract class AbstractIsSubclassOfTest : AbstractAnalysisApiBasedSingleModuleTe
val actual = executeOnPooledThreadInReadAction {
analyseForTest(subClass) {
val subClassSymbol = subClass.getClassOrObjectSymbol()
val superClassSymbol = superClass.getClassOrObjectSymbol()
val subClassSymbol = subClass.getClassOrObjectSymbol()!!
val superClassSymbol = superClass.getClassOrObjectSymbol()!!
val isSubClass = subClassSymbol.isSubClassOf(superClassSymbol)
val isDirectSubClass = subClassSymbol.isDirectSubClassOf(superClassSymbol)