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

Rename jet -> kotlin and regroup files in serialization

Browse Source 
org.jetbrains.jet.descriptors.serialization ->
org.jetbrains.kotlin.serialization

Deserialization goes to subpackage deserialization, built-ins-related stuff
goes to subpackage builtins
This commit is contained in:
Alexander Udalov
2015-01-09 14:13:26 +03:00
parent 00878cc31a
commit 05eaf81ba6
79 changed files with 4007 additions and 4012 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/CallableClsStubBuilder.kt
+7 -7
View File
@@ -18,16 +18,16 @@ package org.jetbrains.jet.plugin.decompiler.stubBuilder
import com.intellij.psi.stubs.StubElement
import com.intellij.psi.PsiElement
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.jet.descriptors.serialization.Flags
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Modality
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf.Modality
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFunctionStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPropertyStubImpl
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.MemberKind
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.MemberKind
import org.jetbrains.jet.lang.resolve.dataClassUtils.isComponentLike
import org.jetbrains.jet.descriptors.serialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
fun createCallableStub(
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClassClsStubBuilder.kt
+5 -5
View File
@@ -17,8 +17,8 @@
package org.jetbrains.jet.plugin.decompiler.stubBuilder
import com.intellij.psi.stubs.StubElement
import org.jetbrains.jet.descriptors.serialization.Flags
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.jet.lang.psi.stubs.elements.JetClassElementType
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinClassStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinObjectStubImpl
@@ -33,10 +33,10 @@ import org.jetbrains.jet.lang.psi.JetDelegatorToSuperClass
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lang.resolve.name.SpecialNames.getClassObjectName
import org.jetbrains.jet.lang.psi.JetClassObject
import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.jet.plugin.decompiler.stubBuilder.FlagsToModifiers.*
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
@@ -230,4 +230,4 @@ private class ClassClsStubBuilder(
val classData = c.components.classDataFinder.findClassData(nestedClassId)!!
createClassStub(classBody, classData.getClassProto(), nestedClassId, c.child(classData.getNameResolver()))
}
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/ClsStubBuilderContext.kt
+3 -3
View File
@@ -16,11 +16,11 @@
package org.jetbrains.jet.plugin.decompiler.stubBuilder
import org.jetbrains.jet.descriptors.serialization.NameResolver
import org.jetbrains.kotlin.serialization.deserialization.NameResolver
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.jet.lang.resolve.kotlin.KotlinClassFinder
import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
import org.jetbrains.jet.lang.resolve.kotlin.AbstractBinaryClassAnnotationAndConstantLoader
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/TypeClsStubBuilder.kt
+7 -7
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.decompiler.stubBuilder
import com.intellij.psi.stubs.StubElement
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf
import org.jetbrains.jet.lang.resolve.name.FqName
import com.intellij.psi.PsiElement
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -37,20 +37,20 @@ import org.jetbrains.jet.lang.psi.JetFunctionType
import org.jetbrains.jet.lang.psi.JetFunctionTypeReceiver
import org.jetbrains.kotlin.utils.addToStdlib.singletonOrEmptyList
import org.jetbrains.jet.lang.psi.JetTypeParameterList
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type
import org.jetbrains.kotlin.serialization.ProtoBuf.Type
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeParameterStubImpl
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.TypeParameter.Variance
import org.jetbrains.kotlin.serialization.ProtoBuf.TypeParameter.Variance
import org.jetbrains.jet.lang.psi.JetTypeConstraintList
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinTypeConstraintStubImpl
import org.jetbrains.jet.lang.resolve.name.ClassId
import java.util.ArrayList
import org.jetbrains.jet.descriptors.serialization.Flags
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Type.Argument.Projection
import org.jetbrains.kotlin.serialization.ProtoBuf.Type.Argument.Projection
import org.jetbrains.jet.lang.psi.JetProjectionKind
class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/stubBuilder/clsStubBuilding.kt
+6 -7
View File
@@ -16,7 +16,6 @@
package org.jetbrains.jet.plugin.decompiler.stubBuilder
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinFileStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinPlaceHolderStubImpl
@@ -31,19 +30,19 @@ import org.jetbrains.jet.lang.psi.stubs.KotlinUserTypeStub
import org.jetbrains.jet.lang.resolve.name.SpecialNames
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinUserTypeStubImpl
import org.jetbrains.jet.lexer.JetModifierKeywordToken
import org.jetbrains.jet.descriptors.serialization.Flags
import org.jetbrains.kotlin.serialization.Flags
import org.jetbrains.jet.lexer.JetTokens
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinModifierListStubImpl
import org.jetbrains.jet.lang.psi.stubs.impl.ModifierMaskUtils
import org.jetbrains.jet.descriptors.serialization.ProtoBuf
import org.jetbrains.kotlin.serialization.ProtoBuf
import com.intellij.util.io.StringRef
import org.jetbrains.jet.descriptors.serialization.descriptors.ProtoContainer
import org.jetbrains.kotlin.serialization.deserialization.ProtoContainer
import org.jetbrains.jet.lang.psi.stubs.impl.KotlinAnnotationEntryStubImpl
import org.jetbrains.jet.lang.psi.JetConstructorCalleeExpression
import org.jetbrains.jet.lang.psi.JetTypeReference
import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.jet.descriptors.serialization.descriptors.AnnotatedCallableKind
import org.jetbrains.jet.descriptors.serialization.ProtoBuf.Callable.CallableKind
import org.jetbrains.kotlin.serialization.deserialization.AnnotatedCallableKind
import org.jetbrains.kotlin.serialization.ProtoBuf.Callable.CallableKind
import java.util.ArrayList
fun createTopLevelClassStub(classId: ClassId, classProto: ProtoBuf.Class, context: ClsStubBuilderContext): KotlinFileStubImpl {
@@ -231,4 +230,4 @@ fun sortCallableStubs(unordered: List<ProtoBuf.Callable>): List<ProtoBuf.Callabl
result.addAll(nonExtensionFunctions)
result.addAll(extensionFunctions)
return result
}
}
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+2 -3
View File
@@ -26,11 +26,10 @@ import org.jetbrains.jet.lang.resolve.name.Name
import org.jetbrains.kotlin.storage.LockBasedStorageManager
import java.util.Collections
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedPackageMemberScope
import org.jetbrains.jet.lang.resolve.java.resolver.ErrorReporter
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedPackageMemberScope
import org.jetbrains.jet.lang.resolve.java.PackageClassUtils
import com.intellij.openapi.diagnostic.Logger
import org.jetbrains.jet.descriptors.serialization.context.DeserializationComponents
import org.jetbrains.kotlin.serialization.deserialization.DeserializationComponents
import org.jetbrains.jet.lang.PlatformToKotlinClassMap
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns
import org.jetbrains.jet.lang.descriptors.impl.ModuleDescriptorImpl
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/LocalClassFinder.kt
+2 -2
View File
@@ -25,8 +25,8 @@ import org.jetbrains.jet.plugin.decompiler.isKotlinWithCompatibleAbiVersion
import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache
import com.intellij.openapi.vfs.VirtualFile
import org.jetbrains.jet.lang.resolve.name.FqName
import org.jetbrains.jet.descriptors.serialization.ClassDataFinder
import org.jetbrains.jet.descriptors.serialization.ClassData
import org.jetbrains.kotlin.serialization.deserialization.ClassDataFinder
import org.jetbrains.kotlin.serialization.ClassData
import org.jetbrains.kotlin.serialization.jvm.JvmProtoBufUtil
import com.intellij.openapi.diagnostic.Logger
idea/src/org/jetbrains/jet/plugin/debugger/PositionManagerLibraryClassFileSearcher.kt
+1 -1
View File
@@ -29,7 +29,7 @@ import com.intellij.openapi.roots.LibraryOrderEntry
import org.jetbrains.jet.lang.psi.JetDeclaration
import org.jetbrains.jet.lang.descriptors.CallableDescriptor
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor
import org.jetbrains.jet.descriptors.serialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.kotlin.serialization.deserialization.descriptors.DeserializedCallableMemberDescriptor
import org.jetbrains.jet.lang.descriptors.PropertyDescriptor
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.openapi.module.impl.scopes.JdkScope