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

FirSourceElement: introduce common 'treeStructure' property

Browse Source
This commit is contained in:
Mikhail Glukhikh
2020-11-16 17:03:49 +03:00
parent 3a2b15521b
commit 1cb2aeaeff
15 changed files with 55 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/FirSourceChildren.kt
+2 -2
View File
@@ -35,7 +35,7 @@ private fun FirPsiSourceElement<*>.getChild(types: Set<IElementType>, index: Int
}
private fun FirLightSourceElement.getChild(types: Set<IElementType>, index: Int, depth: Int): FirSourceElement? {
val visitor = LighterTreeElementFinderByType(tree, types, index, depth)
val visitor = LighterTreeElementFinderByType(treeStructure, types, index, depth)
return visitor.find(lighterASTNode)?.let { it.toFirLightSourceElement(it.startOffset, it.endOffset, tree) }
return visitor.find(lighterASTNode)?.let { it.toFirLightSourceElement(it.startOffset, it.endOffset, treeStructure) }
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirModifierList.kt
+2 -2
View File
@@ -28,9 +28,9 @@ fun FirSourceElement?.getModifierList(): FirModifierList? {
is FirPsiSourceElement<*> -> (psi as? KtModifierListOwner)?.modifierList?.let { FirPsiModifierList(it) }
is FirLightSourceElement -> {
val kidsRef = Ref<Array<LighterASTNode?>>()
tree.getChildren(lighterASTNode, kidsRef)
treeStructure.getChildren(lighterASTNode, kidsRef)
val modifierListNode = kidsRef.get().find { it?.tokenType == KtNodeTypes.MODIFIER_LIST } ?: return null
FirLightModifierList(modifierListNode, tree)
FirLightModifierList(modifierListNode, treeStructure)
}
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationArgumentChecker.kt
+2 -2
View File
@@ -241,9 +241,9 @@ object FirAnnotationArgumentChecker : FirBasicDeclarationChecker() {
is FirPsiSourceElement<*> ->
source.psi.parent.toFirPsiSourceElement()
is FirLightSourceElement -> {
val elementOfParent = source.tree.getParent(source.lighterASTNode) ?: source.lighterASTNode
val elementOfParent = source.treeStructure.getParent(source.lighterASTNode) ?: source.lighterASTNode
elementOfParent.toFirLightSourceElement(elementOfParent.startOffset, elementOfParent.endOffset, source.tree)
elementOfParent.toFirLightSourceElement(elementOfParent.startOffset, elementOfParent.endOffset, source.treeStructure)
}
else ->
source
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationClassDeclarationChecker.kt
+1 -1
View File
@@ -53,7 +53,7 @@ object FirAnnotationClassDeclarationChecker : FirBasicDeclarationChecker() {
}
is FirLightSourceElement -> {
val kidsRef = Ref<Array<LighterASTNode?>>()
parameterSourceElement.tree.getChildren(parameterSourceElement.lighterASTNode, kidsRef)
parameterSourceElement.treeStructure.getChildren(parameterSourceElement.lighterASTNode, kidsRef)
if (kidsRef.get().any { it?.tokenType == VAR_KEYWORD })
reporter.report(parameterSourceElement, FirErrors.VAR_ANNOTATION_PARAMETER)
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirConstructorInInterfaceChecker.kt
+1 -1
View File
@@ -40,7 +40,7 @@ object FirConstructorInInterfaceChecker : FirBasicDeclarationChecker() {
if (localPsi != null && localPsi !is PsiErrorElement) {
return localPsi.hasPrimaryConstructor()
} else if (this is FirLightSourceElement) {
return localLightNode.hasPrimaryConstructor(tree)
return localLightNode.hasPrimaryConstructor(treeStructure)
}
return false
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirDelegationInInterfaceChecker.kt
+1 -1
View File
@@ -40,7 +40,7 @@ object FirDelegationInInterfaceChecker : FirMemberDeclarationChecker() {
if (localPsi != null && localPsi !is PsiErrorElement) {
return localPsi.findSuperTypeDelegation()
} else if (this is FirLightSourceElement) {
return localLightNode.findSuperTypeDelegation(tree)
return localLightNode.findSuperTypeDelegation(treeStructure)
}
return -1
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirExposedVisibilityDeclarationChecker.kt
+2 -2
View File
@@ -234,9 +234,9 @@ object FirExposedVisibilityDeclarationChecker : FirMemberDeclarationChecker() {
is FirPsiSourceElement<*> -> (this.psi as? PsiNameIdentifierOwner)?.nameIdentifier?.toFirPsiSourceElement()
is FirLightSourceElement -> {
val kidsRef = Ref<Array<LighterASTNode?>>()
this.tree.getChildren(lighterASTNode, kidsRef)
this.treeStructure.getChildren(lighterASTNode, kidsRef)
val identifier = kidsRef.get().find { it?.tokenType == KtTokens.IDENTIFIER }
identifier?.toFirLightSourceElement(this.tree.getStartOffset(identifier), this.tree.getEndOffset(identifier), this.tree)
identifier?.toFirLightSourceElement(this.treeStructure.getStartOffset(identifier), this.treeStructure.getEndOffset(identifier), this.treeStructure)
}
}
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypeInitializedInInterfaceChecker.kt
+1 -1
View File
@@ -40,7 +40,7 @@ object FirSupertypeInitializedInInterfaceChecker : FirMemberDeclarationChecker()
if (localPsi != null && localPsi !is PsiErrorElement) {
return localPsi.findSuperTypeCall()
} else if (this is FirLightSourceElement) {
return localLightNode.findSuperTypeCall(tree)
return localLightNode.findSuperTypeCall(treeStructure)
}
return -1
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirSupertypeInitializedWithoutPrimaryConstructor.kt
+1 -1
View File
@@ -44,7 +44,7 @@ object FirSupertypeInitializedWithoutPrimaryConstructor : FirMemberDeclarationCh
if (localPsi != null && localPsi !is PsiErrorElement) {
return localPsi.anySupertypeHasConstructorParentheses()
} else if (this is FirLightSourceElement) {
return localLightNode.anySupertypeHasConstructorParentheses(tree)
return localLightNode.anySupertypeHasConstructorParentheses(treeStructure)
}
return false
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirTypeArgumentsNotAllowedExpressionChecker.kt
+1 -1
View File
@@ -42,7 +42,7 @@ object FirTypeArgumentsNotAllowedExpressionChecker : FirQualifiedAccessChecker()
if (localPsi != null && localPsi !is PsiErrorElement) {
return localPsi.hasAnyArguments()
} else if (this is FirLightSourceElement) {
return localLight.hasAnyArguments(this.tree)
return localLight.hasAnyArguments(this.treeStructure)
}
return false
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeReplacedWithOperatorAssignmentChecker.kt
+1 -1
View File
@@ -71,7 +71,7 @@ object CanBeReplacedWithOperatorAssignmentChecker : FirExpressionChecker<FirVari
source: FirLightSourceElement,
prevOperator: LighterASTNode? = null
): Boolean {
val tree = source.tree
val tree = source.treeStructure
val childrenNullable = Ref<Array<LighterASTNode?>>()
tree.getChildren(expression, childrenNullable)
val children = childrenNullable.get().filterNotNull()
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/CanBeValChecker.kt
+1 -1
View File
@@ -102,7 +102,7 @@ object CanBeValChecker : AbstractFirPropertyInitializationChecker() {
is FirPsiSourceElement<*> -> fir.psi?.children?.size?.minus(1) // -1 cuz we don't need expression node after equals operator
is FirLightSourceElement -> {
val source = fir.source as FirLightSourceElement
val tree = (fir.source as FirLightSourceElement).tree
val tree = (fir.source as FirLightSourceElement).treeStructure
val children = Ref<Array<LighterASTNode?>>()
tree.getChildren(source.lighterASTNode, children)
children.get().filterNotNull().filter { it.tokenType == KtNodeTypes.DESTRUCTURING_DECLARATION_ENTRY }.size
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/RedundantSingleExpressionStringTemplateChecker.kt
+2 -2
View File
@@ -54,10 +54,10 @@ object RedundantSingleExpressionStringTemplateChecker : FirBasicExpressionChecke
}
private fun LighterASTNode.stringParentChildrenCount(source: FirLightSourceElement): Int? {
val parent = source.tree.getParent(this)
val parent = source.treeStructure.getParent(this)
return if (parent?.tokenType == KtNodeTypes.STRING_TEMPLATE) {
val childrenOfParent = Ref<Array<LighterASTNode>>()
source.tree.getChildren(parent!!, childrenOfParent)
source.treeStructure.getChildren(parent!!, childrenOfParent)
childrenOfParent.get().filter { it is PsiBuilder.Marker }.size
} else {
parent?.stringParentChildrenCount(source)