Drop "extra visibility" from binary format

Descriptors of Kotlin symbols should always have a visibility known to Kotlin
This commit is contained in:
Alexander Udalov
2015-02-12 12:11:46 +03:00
parent 1609bbcd10
commit ce26ce0458
7 changed files with 373 additions and 1239 deletions
@@ -17,27 +17,21 @@
package org.jetbrains.kotlin.idea.decompiler.stubBuilder
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl
import org.jetbrains.kotlin.psi.stubs.impl.KotlinPlaceHolderStubImpl
import org.jetbrains.kotlin.psi.stubs.impl.*
import org.jetbrains.kotlin.psi.JetPackageDirective
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes
import com.intellij.psi.stubs.StubElement
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.psi.stubs.impl.KotlinNameReferenceExpressionStubImpl
import org.jetbrains.kotlin.psi.JetDotQualifiedExpression
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.psi.stubs.KotlinUserTypeStub
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.psi.stubs.impl.KotlinUserTypeStubImpl
import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.lexer.JetTokens
import org.jetbrains.kotlin.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.kotlin.psi.stubs.impl.ModifierMaskUtils
import org.jetbrains.kotlin.serialization.ProtoBuf
import com.intellij.util.io.StringRef
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.psi.stubs.impl.KotlinAnnotationEntryStubImpl
import org.jetbrains.kotlin.psi.JetConstructorCalleeExpression
import org.jetbrains.kotlin.psi.JetTypeReference
import org.jetbrains.kotlin.name.Name
@@ -134,7 +128,6 @@ enum class FlagsToModifiers {
ProtoBuf.Visibility.INTERNAL -> JetTokens.INTERNAL_KEYWORD
ProtoBuf.Visibility.PROTECTED -> JetTokens.PROTECTED_KEYWORD
ProtoBuf.Visibility.PUBLIC -> JetTokens.PUBLIC_KEYWORD
//TODO: support extra visibility
else -> throw IllegalStateException("Unexpected visibility: $visibility")
}
}