[AA] Update usages of declared member scopes

- Now that non-static declared member scopes don't contain static
  callables anymore, we have to update some usages in the Analysis API.
- In symbol light classes, many usages of `getDeclaredMemberScope` can
  be kept as-is because Kotlin classes/objects generally cannot declare
  static callables (and we do not need to create symbol light classes
  for Java classes). The only exception are enum classes, which
  implicitly declare some static callables.

^KT-61800
This commit is contained in:
Marco Pennekamp
2023-09-13 21:40:33 +02:00
committed by Space Team
parent 21efd6aff3
commit df54540a81
6 changed files with 13 additions and 12 deletions
@@ -9,8 +9,8 @@ import com.intellij.openapi.util.io.FileUtil
import org.jetbrains.kotlin.analysis.api.KtAnalysisSession
import org.jetbrains.kotlin.analysis.api.symbols.KtClassKind
import org.jetbrains.kotlin.analysis.api.symbols.KtNamedClassOrObjectSymbol
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.analysis.api.symbols.KtSymbol
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
@@ -75,7 +75,7 @@ sealed class SymbolData {
val classSymbol =
getClassOrObjectSymbolByClassId(classId)
?: error("Class $classId is not found")
classSymbol.getDeclaredMemberScope().getCallableSymbols(callableId.callableName)
classSymbol.getCombinedDeclaredMemberScope().getCallableSymbols(callableId.callableName)
.toList()
}
if (symbols.isEmpty()) {