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

FIR: optimize checking if placeholder projection for raw FIR builder

Browse Source
This commit is contained in:
Ilya Kirillov
2020-09-24 23:28:48 +03:00
parent bbc641b390
commit 5937ffae4d
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt
+9 -4
View File
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.fir.builder
import com.intellij.psi.PsiElement import com.intellij.psi.PsiElement
import com.intellij.psi.tree.IElementType import com.intellij.psi.tree.IElementType
import org.jetbrains.kotlin.KtNodeTypes
import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Modality
import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibilities
@@ -558,7 +559,7 @@ class RawFirBuilder(
} }
) )
container.declarations.add(delegateField) container.declarations.add(delegateField)
delegateNumber ++ delegateNumber++
} }
} }
} }
@@ -816,7 +817,7 @@ class RawFirBuilder(
) )
val primaryConstructor = classOrObject.primaryConstructor val primaryConstructor = classOrObject.primaryConstructor
val firPrimaryConstructor = declarations.firstOrNull {it is FirConstructor} as? FirConstructor val firPrimaryConstructor = declarations.firstOrNull { it is FirConstructor } as? FirConstructor
if (primaryConstructor != null && firPrimaryConstructor != null) { if (primaryConstructor != null && firPrimaryConstructor != null) {
primaryConstructor.valueParameters.zip( primaryConstructor.valueParameters.zip(
firPrimaryConstructor.valueParameters firPrimaryConstructor.valueParameters
@@ -1006,7 +1007,7 @@ class RawFirBuilder(
} }
private fun KtDeclarationWithBody.obtainContractDescription(): FirContractDescription? { private fun KtDeclarationWithBody.obtainContractDescription(): FirContractDescription? {
return when(val description = contractDescription) { return when (val description = contractDescription) {
null -> null null -> null
else -> buildRawContractDescription { else -> buildRawContractDescription {
source = description.toFirSourceElement() source = description.toFirSourceElement()
@@ -1386,6 +1387,10 @@ class RawFirBuilder(
} }
} }
// TODO introduce placeholder projection type
private fun KtTypeProjection.isPlaceholderProjection() =
projectionKind == KtProjectionKind.NONE && (typeReference?.typeElement as? KtUserType)?.referencedName == "_"
override fun visitTypeProjection(typeProjection: KtTypeProjection, data: Unit): FirElement { override fun visitTypeProjection(typeProjection: KtTypeProjection, data: Unit): FirElement {
val projectionKind = typeProjection.projectionKind val projectionKind = typeProjection.projectionKind
val projectionSource = typeProjection.toFirSourceElement() val projectionSource = typeProjection.toFirSourceElement()
@@ -1394,7 +1399,7 @@ class RawFirBuilder(
source = projectionSource source = projectionSource
} }
} }
if (projectionKind == KtProjectionKind.NONE && !stubMode && typeProjection.text == "_") { if (typeProjection.isPlaceholderProjection()) {
return FirTypePlaceholderProjection return FirTypePlaceholderProjection
} }
val typeReference = typeProjection.typeReference val typeReference = typeProjection.typeReference