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

Move AttributeArray to compiler.common so frontend extension can share it

Browse Source
This commit is contained in:
Irene Dea
2021-10-05 13:05:51 -07:00
committed by Dmitriy Novozhilov
parent 82455c849d
commit 62bde2d686
14 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/ConeAttributes.kt
+2 -2
View File
@@ -5,8 +5,8 @@
package org.jetbrains.kotlin.fir.types package org.jetbrains.kotlin.fir.types
import org.jetbrains.kotlin.fir.utils.AttributeArrayOwner import org.jetbrains.kotlin.util.AttributeArrayOwner
import org.jetbrains.kotlin.fir.utils.TypeRegistry import org.jetbrains.kotlin.util.TypeRegistry
import org.jetbrains.kotlin.types.model.AnnotationMarker import org.jetbrains.kotlin.types.model.AnnotationMarker
import org.jetbrains.kotlin.utils.addIfNotNull import org.jetbrains.kotlin.utils.addIfNotNull
import kotlin.properties.ReadOnlyProperty import kotlin.properties.ReadOnlyProperty
compiler/fir/cones/src/org/jetbrains/kotlin/fir/types/impl/Impl.kt
+1 -1
View File
@@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.types.ConeAttributes
import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.ConeClassLikeType
import org.jetbrains.kotlin.fir.types.ConeTypeProjection import org.jetbrains.kotlin.fir.types.ConeTypeProjection
import org.jetbrains.kotlin.fir.types.ConeNullability import org.jetbrains.kotlin.fir.types.ConeNullability
import org.jetbrains.kotlin.fir.utils.WeakPair import org.jetbrains.kotlin.util.WeakPair
class ConeClassLikeTypeImpl( class ConeClassLikeTypeImpl(
override val lookupTag: ConeClassLikeLookupTag, override val lookupTag: ConeClassLikeLookupTag,
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/LookupTagUtils.kt
+1 -1
View File
@@ -25,10 +25,10 @@ import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.utils.WeakPair
import org.jetbrains.kotlin.name.SpecialNames import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.types.ConstantValueKind import org.jetbrains.kotlin.types.ConstantValueKind
import org.jetbrains.kotlin.util.WeakPair
fun ConeClassifierLookupTag.toSymbol(useSiteSession: FirSession): FirClassifierSymbol<*>? = fun ConeClassifierLookupTag.toSymbol(useSiteSession: FirSession): FirClassifierSymbol<*>? =
when (this) { when (this) {
compiler/fir/providers/src/org/jetbrains/kotlin/fir/resolve/TypeExpansionUtils.kt
+3 -3
View File
@@ -15,9 +15,9 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol
import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.*
import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeClassLikeTypeImpl
import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
import org.jetbrains.kotlin.fir.utils.WeakPair import org.jetbrains.kotlin.util.WeakPair
import org.jetbrains.kotlin.fir.utils.component1 import org.jetbrains.kotlin.util.component1
import org.jetbrains.kotlin.fir.utils.component2 import org.jetbrains.kotlin.util.component2
fun ConeClassLikeType.fullyExpandedType( fun ConeClassLikeType.fullyExpandedType(
useSiteSession: FirSession, useSiteSession: FirSession,
compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirSession.kt
+4 -4
View File
@@ -6,10 +6,10 @@
package org.jetbrains.kotlin.fir package org.jetbrains.kotlin.fir
import org.jetbrains.kotlin.fir.types.impl.* import org.jetbrains.kotlin.fir.types.impl.*
import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor import org.jetbrains.kotlin.util.ArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner import org.jetbrains.kotlin.util.ComponentArrayOwner
import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor import org.jetbrains.kotlin.util.NullableArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.TypeRegistry import org.jetbrains.kotlin.util.TypeRegistry
import kotlin.reflect.KClass import kotlin.reflect.KClass
interface FirSessionComponent interface FirSessionComponent
compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/FirDeclarationAttributes.kt
+4 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.fir.declarations package org.jetbrains.kotlin.fir.declarations
import org.jetbrains.kotlin.fir.utils.ArrayMap import org.jetbrains.kotlin.util.ArrayMap
import org.jetbrains.kotlin.fir.utils.AttributeArrayOwner import org.jetbrains.kotlin.util.AttributeArrayOwner
import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor import org.jetbrains.kotlin.util.NullableArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.TypeRegistry import org.jetbrains.kotlin.util.TypeRegistry
import kotlin.properties.ReadWriteProperty import kotlin.properties.ReadWriteProperty
import kotlin.reflect.KClass import kotlin.reflect.KClass
import kotlin.reflect.KProperty import kotlin.reflect.KProperty
compiler/fir/tree/src/org/jetbrains/kotlin/fir/extensions/FirExtensionService.kt
+3 -3
View File
@@ -8,9 +8,9 @@ package org.jetbrains.kotlin.fir.extensions
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.FirSessionComponent import org.jetbrains.kotlin.fir.FirSessionComponent
import org.jetbrains.kotlin.fir.NoMutableState import org.jetbrains.kotlin.fir.NoMutableState
import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor import org.jetbrains.kotlin.util.ArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner import org.jetbrains.kotlin.util.ComponentArrayOwner
import org.jetbrains.kotlin.fir.utils.TypeRegistry import org.jetbrains.kotlin.util.TypeRegistry
import kotlin.reflect.KClass import kotlin.reflect.KClass
@RequiresOptIn @RequiresOptIn
compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/ConeClassLikeLookupTagImpl.kt
+1 -1
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.symbols.impl
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag import org.jetbrains.kotlin.fir.symbols.ConeClassLikeLookupTag
import org.jetbrains.kotlin.fir.utils.WeakPair import org.jetbrains.kotlin.util.WeakPair
import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.name.ClassId
@RequiresOptIn @RequiresOptIn
compiler/test-infrastructure/tests/org/jetbrains/kotlin/test/services/TestServices.kt
+4 -4
View File
@@ -5,10 +5,10 @@
package org.jetbrains.kotlin.test.services package org.jetbrains.kotlin.test.services
import org.jetbrains.kotlin.fir.utils.ArrayMapAccessor import org.jetbrains.kotlin.util.ArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.ComponentArrayOwner import org.jetbrains.kotlin.util.ComponentArrayOwner
import org.jetbrains.kotlin.fir.utils.NullableArrayMapAccessor import org.jetbrains.kotlin.util.NullableArrayMapAccessor
import org.jetbrains.kotlin.fir.utils.TypeRegistry import org.jetbrains.kotlin.util.TypeRegistry
import kotlin.reflect.KClass import kotlin.reflect.KClass
interface TestService interface TestService
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMap.kt → core/compiler.common/src/org/jetbrains/kotlin/util/ArrayMap.kt
+2 -2
View File
@@ -1,9 +1,9 @@
/* /*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.util
sealed class ArrayMap<T : Any> : Iterable<T> { sealed class ArrayMap<T : Any> : Iterable<T> {
abstract val size: Int abstract val size: Int
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ArrayMapOwner.kt → core/compiler.common/src/org/jetbrains/kotlin/util/ArrayMapOwner.kt
+2 -2
View File
@@ -1,9 +1,9 @@
/* /*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.util
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/AttributeArrayOwner.kt → core/compiler.common/src/org/jetbrains/kotlin/util/AttributeArrayOwner.kt
+2 -2
View File
@@ -1,9 +1,9 @@
/* /*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.util
import kotlin.reflect.KClass import kotlin.reflect.KClass
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/ComponentArrayOwner.kt → core/compiler.common/src/org/jetbrains/kotlin/util/ComponentArrayOwner.kt
+2 -2
View File
@@ -1,9 +1,9 @@
/* /*
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors. * Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.util
import kotlin.reflect.KClass import kotlin.reflect.KClass
compiler/fir/cones/src/org/jetbrains/kotlin/fir/utils/WeakPair.kt → core/compiler.common/src/org/jetbrains/kotlin/util/WeakPair.kt
+1 -1
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/ */
package org.jetbrains.kotlin.fir.utils package org.jetbrains.kotlin.util
import java.lang.ref.WeakReference import java.lang.ref.WeakReference