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

[AA] Move classIdIfNonLocal to analysis-internal-utils

Browse Source 
- The utility will be needed by a `KtFir*Symbol` class.
This commit is contained in:
Marco Pennekamp
2023-02-27 19:07:19 +01:00
committed by Space Team
parent 9cc6809ec6
commit e70a3a899f
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/analysis-internal-utils/src/psiUtils.kt
+21
View File
@@ -0,0 +1,21 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.analysis.utils
import com.intellij.psi.PsiClass
import com.intellij.psi.PsiClassOwner
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
public val PsiClass.classIdIfNonLocal: ClassId?
get() {
val packageName = (containingFile as? PsiClassOwner)?.packageName ?: return null
val qualifiedName = qualifiedName ?: return null
val relatedClassName = qualifiedName.removePrefix("$packageName.")
if (relatedClassName.isEmpty()) return null
return ClassId(FqName(packageName), FqName(relatedClassName), false)
}
analysis/low-level-api-fir/src/org/jetbrains/kotlin/analysis/low/level/api/fir/providers/LLFirFirClassByPsiClassProvider.kt
+1 -12
View File
@@ -6,7 +6,6 @@
package org.jetbrains.kotlin.analysis.low.level.api.fir.providers package org.jetbrains.kotlin.analysis.low.level.api.fir.providers
import com.intellij.psi.PsiClass import com.intellij.psi.PsiClass
import com.intellij.psi.PsiClassOwner
import com.intellij.psi.PsiTypeParameter import com.intellij.psi.PsiTypeParameter
import com.intellij.psi.impl.compiled.ClsElementImpl import com.intellij.psi.impl.compiled.ClsElementImpl
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
@@ -20,7 +19,7 @@ import org.jetbrains.kotlin.fir.resolve.providers.symbolProvider
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.load.java.JvmAnnotationNames import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.analysis.utils.classIdIfNonLocal
class LLFirFirClassByPsiClassProvider(private val session: LLFirSession) : FirSessionComponent { class LLFirFirClassByPsiClassProvider(private val session: LLFirSession) : FirSessionComponent {
fun getFirClass(psiClass: PsiClass): FirRegularClassSymbol? { fun getFirClass(psiClass: PsiClass): FirRegularClassSymbol? {
@@ -82,13 +81,3 @@ class LLFirFirClassByPsiClassProvider(private val session: LLFirSession) : FirSe
internal val FirSession.nullableJavaSymbolProvider: JavaSymbolProvider? by FirSession.nullableSessionComponentAccessor() internal val FirSession.nullableJavaSymbolProvider: JavaSymbolProvider? by FirSession.nullableSessionComponentAccessor()
val LLFirSession.firClassByPsiClassProvider: LLFirFirClassByPsiClassProvider by FirSession.sessionComponentAccessor() val LLFirSession.firClassByPsiClassProvider: LLFirFirClassByPsiClassProvider by FirSession.sessionComponentAccessor()
private val PsiClass.classIdIfNonLocal: ClassId?
get() {
val packageName = (containingFile as? PsiClassOwner)?.packageName ?: return null
val qualifiedName = qualifiedName ?: return null
val relatedClassName = qualifiedName.removePrefix("$packageName.")
if (relatedClassName.isEmpty()) return null
return ClassId(FqName(packageName), FqName(relatedClassName), false)
}