Skip to content

Commit f10c5c2

Browse files
dimonchik0036dimonchik0036
committed
Revert "Revert "[light classes] drop old light classes and backend: iteration #1""
This reverts commit 57de064.
1 parent db3ca79 commit f10c5c2

File tree

61 files changed

+387
-2000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+387
-2000
lines changed

‎analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclaration.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
1+
/*
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
4+
*/
25

36
package org.jetbrains.kotlin.analysis.decompiled.light.classes
47

@@ -23,7 +26,7 @@ import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
2326
import org.jetbrains.kotlin.psi.KtClassOrObject
2427

2528
open class KtLightClassForDecompiledDeclaration(
26-
override val clsDelegate: PsiClass,
29+
clsDelegate: PsiClass,
2730
private val clsParent: PsiElement,
2831
private val file: KtClsFile,
2932
kotlinOrigin: KtClassOrObject?

‎analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightClassForDecompiledDeclarationBase.kt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
1+
/*
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
4+
*/
25

36
package org.jetbrains.kotlin.analysis.decompiled.light.classes
47

@@ -9,7 +12,7 @@ import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
912
import org.jetbrains.kotlin.psi.KtClassOrObject
1013

1114
abstract class KtLightClassForDecompiledDeclarationBase(
12-
override val clsDelegate: PsiClass,
15+
val clsDelegate: PsiClass,
1316
clsParent: PsiElement,
1417
final override val kotlinOrigin: KtClassOrObject?
1518
) : KtLightElementBase(clsParent), PsiClass, KtExtensibleLightClass

‎analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightFieldForDecompiledDeclaration.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
1+
/*
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
4+
*/
25

36
package org.jetbrains.kotlin.analysis.decompiled.light.classes
47

@@ -67,7 +70,5 @@ open class KtLightFieldForDecompiledDeclaration(
6770

6871
override fun toString(): String = "${this.javaClass.simpleName} of $fldParent"
6972

70-
override val clsDelegate: PsiField = fldDelegate
71-
7273
override fun isValid(): Boolean = parent.isValid
7374
}

‎analysis/decompiled/light-classes-for-decompiled/src/org/jetbrains/kotlin/analysis/decompiled/light/classes/KtLightMethodForDecompiledDeclaration.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
1+
/*
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
4+
*/
25

36
package org.jetbrains.kotlin.analysis.decompiled.light.classes
47

@@ -97,8 +100,6 @@ class KtLightMethodForDecompiledDeclaration(
97100

98101
override fun toString(): String = "${this.javaClass.simpleName} of $funParent"
99102

100-
override val clsDelegate: PsiMethod = funDelegate
101-
102103
override fun isValid(): Boolean = parent.isValid
103104
}
104105

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/FirLightMemberImpl.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -21,9 +21,6 @@ internal abstract class FirLightMemberImpl(
2121
private val containingClass: KtLightClass,
2222
) : KtLightElementBase(containingClass), PsiMember, KtLightMember {
2323

24-
override val clsDelegate: T
25-
get() = invalidAccess()
26-
2724
override fun hasModifierProperty(name: String): Boolean = modifierList?.hasModifierProperty(name) ?: false
2825

2926
override fun toString(): String = "${this::class.java.simpleName}:$name"

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/annotations/FirLightAbstractAnnotation.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -15,9 +15,6 @@ import org.jetbrains.kotlin.psi.*
1515
internal abstract class FirLightAbstractAnnotation(parent: PsiElement) :
1616
KtLightElementBase(parent), PsiAnnotation, KtLightElement<KtCallElement, PsiAnnotation> {
1717

18-
override val clsDelegate: PsiAnnotation
19-
get() = invalidAccess()
20-
2118
override fun getOwner() = parent as? PsiAnnotationOwner
2219

2320
private val KtExpression.nameReference: KtNameReferenceExpression?

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassBase.kt

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
2-
* Copyright 2010-2016 JetBrains s.r.o.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
154
*/
165

176
package org.jetbrains.kotlin.light.classes.symbol
@@ -30,19 +19,16 @@ import com.intellij.psi.util.CachedValueProvider
3019
import com.intellij.psi.util.PsiUtil
3120
import org.jetbrains.annotations.NonNls
3221
import org.jetbrains.kotlin.analysis.api.KtAllowAnalysisOnEdt
33-
import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker
34-
import org.jetbrains.kotlin.idea.KotlinLanguage
3522
import org.jetbrains.kotlin.analysis.api.lifetime.allowAnalysisOnEdt
23+
import org.jetbrains.kotlin.analysis.providers.createProjectWideOutOfBlockModificationTracker
3624
import org.jetbrains.kotlin.asJava.classes.*
25+
import org.jetbrains.kotlin.idea.KotlinLanguage
3726
import org.jetbrains.kotlin.light.classes.symbol.classes.checkIsInheritor
3827
import javax.swing.Icon
3928

4029
abstract class FirLightClassBase protected constructor(
4130
manager: PsiManager
4231
) : LightElement(manager, KotlinLanguage.INSTANCE), PsiClass, KtExtensibleLightClass {
43-
override val clsDelegate: PsiClass
44-
get() = invalidAccess()
45-
4632
private class FirLightClassesLazyCreator(private val project: Project) : KotlinClassInnerStuffCache.LazyCreator() {
4733
@OptIn(KtAllowAnalysisOnEdt::class)
4834
override fun <T : Any> get(initializer: () -> T, dependencies: List<Any>): Lazy<T> = object : Lazy<T> {

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForFacade.kt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -10,6 +10,12 @@ import com.intellij.psi.*
1010
import com.intellij.psi.impl.light.LightEmptyImplementsList
1111
import com.intellij.psi.impl.light.LightModifierList
1212
import org.jetbrains.annotations.NonNls
13+
import org.jetbrains.kotlin.analysis.api.scopes.KtScope
14+
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
15+
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
16+
import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
17+
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol
18+
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility
1319
import org.jetbrains.kotlin.asJava.classes.KtLightClassForFacade
1420
import org.jetbrains.kotlin.asJava.classes.lazyPub
1521
import org.jetbrains.kotlin.asJava.elements.FakeFileForLightClass
@@ -18,12 +24,6 @@ import org.jetbrains.kotlin.asJava.elements.KtLightMethod
1824
import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget
1925
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
2026
import org.jetbrains.kotlin.idea.KotlinLanguage
21-
import org.jetbrains.kotlin.analysis.api.scopes.KtScope
22-
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
23-
import org.jetbrains.kotlin.analysis.api.symbols.KtFunctionSymbol
24-
import org.jetbrains.kotlin.analysis.api.symbols.KtKotlinPropertySymbol
25-
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtAnnotatedSymbol
26-
import org.jetbrains.kotlin.analysis.api.symbols.markers.KtSymbolWithVisibility
2727
import org.jetbrains.kotlin.light.classes.symbol.classes.analyseForLightClasses
2828
import org.jetbrains.kotlin.light.classes.symbol.classes.createField
2929
import org.jetbrains.kotlin.light.classes.symbol.classes.createMethods
@@ -50,8 +50,6 @@ class FirLightClassForFacade(
5050

5151
private val firstFileInFacade by lazyPub { files.first() }
5252

53-
override val clsDelegate: PsiClass get() = invalidAccess()
54-
5553
private val fileSymbols by lazyPub {
5654
files.map { ktFile ->
5755
analyseForLightClasses(ktFile) {

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/decompiled/KtLightClassForDecompiledFacade.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -17,7 +17,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
1717
import org.jetbrains.kotlin.psi.KtFile
1818

1919
internal class KtLightClassForDecompiledFacade(
20-
override val clsDelegate: PsiClass,
20+
clsDelegate: PsiClass,
2121
clsParent: PsiElement,
2222
file: KtClsFile,
2323
kotlinOrigin: KtClassOrObject?,

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/fields/FirLightField.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -24,9 +24,6 @@ internal abstract class FirLightField protected constructor(
2424
private val containingClass: KtLightClass,
2525
lightMemberOrigin: LightMemberOrigin?,
2626
) : FirLightMemberImpl(lightMemberOrigin, containingClass), KtLightField {
27-
28-
override val clsDelegate: PsiField get() = invalidAccess()
29-
3027
override fun setInitializer(initializer: PsiExpression?) = cannotModify()
3128

3229
override fun isEquivalentTo(another: PsiElement?): Boolean =

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/modifierLists/FirLightModifierList.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -20,9 +20,6 @@ internal abstract class FirLightModifierList
2020
protected val owner: T
2121
) : KtLightElementBase(owner), PsiModifierList, KtLightElement {
2222

23-
override val clsDelegate: PsiModifierListOwner
24-
get() = invalidAccess()
25-
2623
override val kotlinOrigin: KtModifierList?
2724
get() = owner.kotlinOrigin?.modifierList
2825

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightParameter.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -16,9 +16,6 @@ import org.jetbrains.kotlin.psi.KtParameter
1616
internal abstract class FirLightParameter(containingDeclaration: FirLightMethod) : PsiVariable, NavigationItem,
1717
KtLightElement<KtParameter, PsiParameter>, KtLightParameter, KtLightElementBase(containingDeclaration) {
1818

19-
override val clsDelegate: PsiParameter
20-
get() = invalidAccess()
21-
2219
override val givenAnnotations: List<KtLightAbstractAnnotation>
2320
get() = invalidAccess()
2421

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightParameterList.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -8,10 +8,10 @@ package org.jetbrains.kotlin.light.classes.symbol
88
import com.intellij.psi.PsiParameter
99
import com.intellij.psi.PsiParameterList
1010
import com.intellij.psi.impl.light.LightParameterListBuilder
11+
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
1112
import org.jetbrains.kotlin.asJava.classes.lazyPub
1213
import org.jetbrains.kotlin.asJava.elements.KtLightElement
1314
import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
14-
import org.jetbrains.kotlin.analysis.api.symbols.KtCallableSymbol
1515
import org.jetbrains.kotlin.psi.KtFunction
1616
import org.jetbrains.kotlin.psi.KtParameterList
1717

@@ -28,7 +28,7 @@ internal class FirLightParameterList(
2828
override val kotlinOrigin: KtParameterList?
2929
get() = (parent.kotlinOrigin as? KtFunction)?.valueParameterList
3030

31-
override val clsDelegate: PsiParameterList by lazyPub {
31+
private val clsDelegate: PsiParameterList by lazyPub {
3232
val builder = LightParameterListBuilder(manager, language)
3333

3434
callableSymbol?.let {

‎analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/parameters/FirLightTypeParameter.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -35,8 +35,6 @@ internal class FirLightTypeParameter(
3535
) : LightElement(parent.manager, KotlinLanguage.INSTANCE), PsiTypeParameter,
3636
KtLightDeclaration<KtTypeParameter, PsiTypeParameter> {
3737

38-
override val clsDelegate: PsiTypeParameter get() = invalidAccess()
39-
4038
override val givenAnnotations: List<KtLightAbstractAnnotation>? get() = invalidAccess()
4139

4240
override val kotlinOrigin: KtTypeParameter? = typeParameterSymbol.psi as? KtTypeParameter

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliKotlinAsJavaSupport.kt

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2000-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
33
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
44
*/
55

@@ -13,7 +13,6 @@ import com.intellij.psi.search.PsiSearchScopeUtil
1313
import com.intellij.util.SmartList
1414
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
1515
import org.jetbrains.kotlin.asJava.classes.*
16-
import org.jetbrains.kotlin.config.JvmAnalysisFlags
1716
import org.jetbrains.kotlin.descriptors.PackageViewDescriptor
1817
import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
1918
import org.jetbrains.kotlin.load.java.components.FilesByFacadeFqNameIndexer
@@ -109,11 +108,9 @@ class CliKotlinAsJavaSupport(
109108
).mapNotNull { member -> (member as? PackageViewDescriptor)?.fqName }
110109
}
111110

112-
override fun getLightClass(classOrObject: KtClassOrObject): KtLightClass? =
113-
KtLightClassForSourceDeclaration.create(classOrObject, traceHolder.languageVersionSettings.getFlag(JvmAnalysisFlags.jvmDefaultMode))
111+
override fun getLightClass(classOrObject: KtClassOrObject): KtLightClass? = KtLightClassForSourceDeclaration.create(classOrObject)
114112

115-
override fun getLightClassForScript(script: KtScript): KtLightClassForScript? =
116-
KtLightClassForScript.create(script)
113+
override fun getLightClassForScript(script: KtScript): KtLightClassForScript? = KtLightClassForScript.create(script)
117114

118115
override fun findClassOrObjectDeclarations(fqName: FqName, searchScope: GlobalSearchScope): Collection<KtClassOrObject> {
119116
return ResolveSessionUtils.getClassDescriptorsByFqName(traceHolder.module, fqName).mapNotNull {
@@ -130,6 +127,5 @@ class CliKotlinAsJavaSupport(
130127
}.orEmpty()
131128
}
132129

133-
override fun createFacadeForSyntheticFile(facadeClassFqName: FqName, file: KtFile): PsiClass =
134-
error("Should not be called")
130+
override fun createFacadeForSyntheticFile(facadeClassFqName: FqName, file: KtFile): PsiClass = error("Should not be called")
135131
}

‎compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,6 @@
11
/*
2-
* Copyright 2010-2016 JetBrains s.r.o.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
2+
* Copyright 2010-2022 JetBrains s.r.o. and Kotlin Programming Language contributors.
3+
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
154
*/
165

176
package org.jetbrains.kotlin.cli.jvm.compiler
@@ -30,7 +19,6 @@ import org.jetbrains.kotlin.asJava.classes.tryGetPredefinedName
3019
import org.jetbrains.kotlin.codegen.ClassBuilderMode
3120
import org.jetbrains.kotlin.codegen.JvmCodegenUtil
3221
import org.jetbrains.kotlin.codegen.state.KotlinTypeMapper
33-
import org.jetbrains.kotlin.config.JvmAnalysisFlags
3422
import org.jetbrains.kotlin.config.JvmTarget
3523
import org.jetbrains.kotlin.config.LanguageVersionSettings
3624
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
@@ -105,9 +93,6 @@ class CliLightClassGenerationSupport(
10593
return ultraLightSupport
10694
}
10795

108-
override val useUltraLightClasses: Boolean
109-
get() = !KtUltraLightSupport.forceUsingOldLightClasses && !traceHolder.languageVersionSettings.getFlag(JvmAnalysisFlags.disableUltraLightClasses)
110-
11196
override fun createDataHolderForClass(classOrObject: KtClassOrObject, builder: LightClassBuilder): LightClassDataHolder.ForClass {
11297
//force resolve companion for light class generation
11398
traceHolder.bindingContext.get(BindingContext.CLASS, classOrObject)?.companionObjectDescriptor

0 commit comments

Comments
 (0)