From 24303c8b39f99885cad3e27c31a89a2c27e577bf Mon Sep 17 00:00:00 2001
From: "Pavel V. Talanov" <talanov.pavel@gmail.com>
Date: Fri, 24 Mar 2017 15:02:23 +0300
Subject: [PATCH] Minor, stubs: isTrait -> isInterface

---
 .../src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt      | 2 +-
 .../jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt    | 4 ++--
 .../kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
index 4f6a0739377..9366a82e488 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
@@ -78,7 +78,7 @@ interface KotlinImportDirectiveStub : StubElement<KtImportDirective> {
     fun isValid(): Boolean
 }
 
-interface KotlinModifierListStub : StubElement<KtModifierList> {
+interface KotlinModifierListStub : StubElement<KtDeclarationModifierList> {
     fun hasModifier(modifierToken: KtModifierKeywordToken): Boolean
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt
index 5cd6f04d4fd..8b080b9e7af 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinClassStubImpl.kt
@@ -31,7 +31,7 @@ class KotlinClassStubImpl(
         private val qualifiedName: StringRef?,
         private val name: StringRef?,
         private val superNames: Array<StringRef>,
-        private val isTrait: Boolean,
+        private val isInterface: Boolean,
         private val isEnumEntry: Boolean,
         private val isLocal: Boolean,
         private val isTopLevel: Boolean
@@ -42,7 +42,7 @@ class KotlinClassStubImpl(
         return FqName(stringRef)
     }
 
-    override fun isInterface() = isTrait
+    override fun isInterface() = isInterface
     override fun isEnumEntry() = isEnumEntry
     override fun isLocal() = isLocal
     override fun getName() = StringRef.toString(name)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
index 09bbfd92dd4..4e8841e15c2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/ClassClsStubBuilder.kt
@@ -145,7 +145,7 @@ private class ClassClsStubBuilder(
                         fqName.ref(),
                         shortName,
                         superTypeRefs,
-                        isTrait = classKind == ProtoBuf.Class.Kind.INTERFACE,
+                        isInterface = classKind == ProtoBuf.Class.Kind.INTERFACE,
                         isEnumEntry = classKind == ProtoBuf.Class.Kind.ENUM_ENTRY,
                         isLocal = false,
                         isTopLevel = !classId.isNestedClass
@@ -206,7 +206,7 @@ private class ClassClsStubBuilder(
                     qualifiedName = c.containerFqName.child(name).ref(),
                     name = name.ref(),
                     superNames = arrayOf(),
-                    isTrait = false,
+                    isInterface = false,
                     isEnumEntry = true,
                     isLocal = false,
                     isTopLevel = false