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

Move getColon from KtClass to KtClassOrObject

Browse Source 
Makes it possible to retrieve the colon from a KtObjectDeclaration.
This commit is contained in:
Bart van Helvert
2020-09-08 01:12:12 +02:00
committed by Petukhov Victor
parent 4d5b32b140
commit 485ada7b90
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/psi/src/org/jetbrains/kotlin/psi/KtClass.kt
-2
View File
@@ -23,8 +23,6 @@ open class KtClass : KtClassOrObject {
private val _stub: KotlinClassStub? private val _stub: KotlinClassStub?
get() = stub as? KotlinClassStub get() = stub as? KotlinClassStub
fun getColon(): PsiElement? = findChildByType(KtTokens.COLON)
fun getProperties(): List<KtProperty> = body?.properties.orEmpty() fun getProperties(): List<KtProperty> = body?.properties.orEmpty()
fun isInterface(): Boolean = fun isInterface(): Boolean =
compiler/psi/src/org/jetbrains/kotlin/psi/KtClassOrObject.kt
+3 -1
View File
@@ -35,6 +35,8 @@ abstract class KtClassOrObject :
constructor(node: ASTNode) : super(node) constructor(node: ASTNode) : super(node)
constructor(stub: KotlinClassOrObjectStub<out KtClassOrObject>, nodeType: IStubElementType<*, *>) : super(stub, nodeType) constructor(stub: KotlinClassOrObjectStub<out KtClassOrObject>, nodeType: IStubElementType<*, *>) : super(stub, nodeType)
fun getColon(): PsiElement? = findChildByType(KtTokens.COLON)
fun getSuperTypeList(): KtSuperTypeList? = getStubOrPsiChild(KtStubElementTypes.SUPER_TYPE_LIST) fun getSuperTypeList(): KtSuperTypeList? = getStubOrPsiChild(KtStubElementTypes.SUPER_TYPE_LIST)
override fun getSuperTypeListEntries(): List<KtSuperTypeListEntry> = getSuperTypeList()?.entries.orEmpty() override fun getSuperTypeListEntries(): List<KtSuperTypeListEntry> = getSuperTypeList()?.entries.orEmpty()
@@ -61,7 +63,7 @@ abstract class KtClassOrObject :
if (specifierList.entries.size > 1) { if (specifierList.entries.size > 1) {
EditCommaSeparatedListHelper.removeItem<KtElement>(superTypeListEntry) EditCommaSeparatedListHelper.removeItem<KtElement>(superTypeListEntry)
} else { } else {
deleteChildRange(findChildByType<PsiElement>(KtTokens.COLON) ?: specifierList, specifierList) deleteChildRange(getColon() ?: specifierList, specifierList)
} }
} }