@@ -6,17 +6,17 @@ import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
6
6
import org.jetbrains.kotlin.fir.analysis.checkers.MppCheckerKind
7
7
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
8
8
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirFileChecker
9
- import org.jetbrains.kotlin.fir.scopes.getFunctions
10
9
import org.jetbrains.kotlin.fir.declarations.FirFile
11
10
import org.jetbrains.kotlin.fir.declarations.FirResolvedImport
12
11
import org.jetbrains.kotlin.fir.declarations.fullyExpandedClass
13
- import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
14
12
import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
13
+ import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
14
+ import org.jetbrains.kotlin.fir.scopes.getFunctions
15
+ import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
15
16
import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol
16
17
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
17
18
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
18
19
import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
19
- import org.jetbrains.kotlin.fir.scopes.FirContainingNamesAwareScope
20
20
import org.jetbrains.kotlin.name.ClassId
21
21
22
22
internal class FileChecker (
@@ -61,10 +61,15 @@ private fun FirResolvedImport.resolveToFun(context: CheckerContext): FirCallable
61
61
62
62
val parentClassId = resolvedParentClassId ? : return null
63
63
64
- val classSymbol = context.session.symbolProvider
65
- .getClassLikeSymbolByClassId(parentClassId) as ? FirRegularClassSymbol ? : return null
64
+ val classSymbol =
65
+ context.session.symbolProvider
66
+ .getClassLikeSymbolByClassId(parentClassId) as ? FirRegularClassSymbol ? : return null
66
67
67
- val classMemberScope: FirContainingNamesAwareScope = context.session.declaredMemberScope(classSymbol.fir, memberRequiredPhase = null )
68
+ val classMemberScope: FirContainingNamesAwareScope =
69
+ context.session.declaredMemberScope(
70
+ classSymbol.fir,
71
+ memberRequiredPhase = null ,
72
+ )
68
73
69
74
return classMemberScope?.getFunctions(funName)?.orEmpty()?.firstOrNull()
70
75
}
0 commit comments