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

Minor, stubs: isTrait -> isInterface

Browse Source
This commit is contained in:
Pavel V. Talanov
2017-03-24 15:02:23 +03:00
parent 1c7ac2da5a
commit 24303c8b39
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+1 -1
View File
@@ -78,7 +78,7 @@ interface KotlinImportDirectiveStub : StubElement<KtImportDirective> {
fun isValid(): Boolean fun isValid(): Boolean
} }
interface KotlinModifierListStub : StubElement<KtModifierList> { interface KotlinModifierListStub : StubElement<KtDeclarationModifierList> {
fun hasModifier(modifierToken: KtModifierKeywordToken): Boolean fun hasModifier(modifierToken: KtModifierKeywordToken): Boolean
} }
compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt
+2 -2
View File
@@ -31,7 +31,7 @@ class KotlinClassStubImpl(
private val qualifiedName: StringRef?, private val qualifiedName: StringRef?,
private val name: StringRef?, private val name: StringRef?,
private val superNames: Array<StringRef>, private val superNames: Array<StringRef>,
private val isTrait: Boolean, private val isInterface: Boolean,
private val isEnumEntry: Boolean, private val isEnumEntry: Boolean,
private val isLocal: Boolean, private val isLocal: Boolean,
private val isTopLevel: Boolean private val isTopLevel: Boolean
@@ -42,7 +42,7 @@ class KotlinClassStubImpl(
return FqName(stringRef) return FqName(stringRef)
} }
override fun isInterface() = isTrait override fun isInterface() = isInterface
override fun isEnumEntry() = isEnumEntry override fun isEnumEntry() = isEnumEntry
override fun isLocal() = isLocal override fun isLocal() = isLocal
override fun getName() = StringRef.toString(name) override fun getName() = StringRef.toString(name)
idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+2 -2
View File
@@ -145,7 +145,7 @@ private class ClassClsStubBuilder(
fqName.ref(), fqName.ref(),
shortName, shortName,
superTypeRefs, superTypeRefs,
isTrait = classKind == ProtoBuf.Class.Kind.INTERFACE, isInterface = classKind == ProtoBuf.Class.Kind.INTERFACE,
isEnumEntry = classKind == ProtoBuf.Class.Kind.ENUM_ENTRY, isEnumEntry = classKind == ProtoBuf.Class.Kind.ENUM_ENTRY,
isLocal = false, isLocal = false,
isTopLevel = !classId.isNestedClass isTopLevel = !classId.isNestedClass
@@ -206,7 +206,7 @@ private class ClassClsStubBuilder(
qualifiedName = c.containerFqName.child(name).ref(), qualifiedName = c.containerFqName.child(name).ref(),
name = name.ref(), name = name.ref(),
superNames = arrayOf(), superNames = arrayOf(),
isTrait = false, isInterface = false,
isEnumEntry = true, isEnumEntry = true,
isLocal = false, isLocal = false,
isTopLevel = false isTopLevel = false