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

Revert "[light classes] drop old light classes and backend: iteration #2"

Browse Source 
This reverts commit 97ce502cbe.
This commit is contained in:
Dmitry Gridin
2022-06-28 13:52:10 +02:00
parent 074dd1c19d
commit 43b4df74bc
42 changed files with 103 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/FirFakeFileImpl.kt
+2 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2010-2022 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.
*/
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.psi.KtClassOrObject
class FirFakeFileImpl(private val classOrObject: KtClassOrObject, ktClass: KtLightClass) : FakeFileForLightClass(
classOrObject.containingKtFile,
{ if (classOrObject.isTopLevel()) ktClass else getOrCreateFirLightClass(getOutermostClassOrObject(classOrObject))!! },
{ null }
) {
override fun findReferenceAt(offset: Int) = ktFile.findReferenceAt(offset)
analysis/symbol-light-classes/src/org/jetbrains/kotlin/light/classes/symbol/classes/FirLightClassForFacade.kt
+1
View File
@@ -172,6 +172,7 @@ class FirLightClassForFacade(
private val packageClsFile = FakeFileForLightClass(
firstFileInFacade,
lightClass = { this },
stub = { null },
packageFqName = packageFqName
)
compiler/cli/src/org/jetbrains/kotlin/cli/jvm/compiler/CliLightClassGenerationSupport.kt
+6 -6
View File
@@ -97,21 +97,21 @@ class CliLightClassGenerationSupport(
//force resolve companion for light class generation
traceHolder.bindingContext.get(BindingContext.CLASS, classOrObject)?.companionObjectDescriptor
val (_, bindingContext, diagnostics) = builder(getContext())
val (stub, bindingContext, diagnostics) = builder(getContext())
bindingContext.get(BindingContext.CLASS, classOrObject) ?: return InvalidLightClassDataHolder
return LightClassDataHolderImpl(diagnostics)
return LightClassDataHolderImpl(stub, diagnostics)
}
override fun createDataHolderForFacade(files: Collection<KtFile>, builder: LightClassBuilder): LightClassDataHolder.ForFacade {
val (_, _, diagnostics) = builder(getContext())
return LightClassDataHolderImpl(diagnostics)
val (stub, _, diagnostics) = builder(getContext())
return LightClassDataHolderImpl(stub, diagnostics)
}
override fun createDataHolderForScript(script: KtScript, builder: LightClassBuilder): LightClassDataHolder.ForScript {
val (_, _, diagnostics) = builder(getContext())
return LightClassDataHolderImpl(diagnostics)
val (stub, _, diagnostics) = builder(getContext())
return LightClassDataHolderImpl(stub, diagnostics)
}
private fun getContext(): LightClassConstructionContext =
compiler/light-classes/src/org/jetbrains/kotlin/asJava/builder/LightClassDataHolder.kt
+8 -1
View File
@@ -5,9 +5,11 @@
package org.jetbrains.kotlin.asJava.builder
import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import org.jetbrains.kotlin.resolve.diagnostics.Diagnostics
interface LightClassDataHolder {
val javaFileStub: PsiJavaFileStub
val extraDiagnostics: Diagnostics
interface ForClass : LightClassDataHolder
@@ -16,11 +18,16 @@ interface LightClassDataHolder {
}
object InvalidLightClassDataHolder : LightClassDataHolder.ForClass {
override val extraDiagnostics: Diagnostics get() = shouldNotBeCalled()
override val javaFileStub: PsiJavaFileStub
get() = shouldNotBeCalled()
override val extraDiagnostics: Diagnostics
get() = shouldNotBeCalled()
private fun shouldNotBeCalled(): Nothing = throw UnsupportedOperationException("Should not be called")
}
class LightClassDataHolderImpl(
override val javaFileStub: PsiJavaFileStub,
override val extraDiagnostics: Diagnostics
) : LightClassDataHolder.ForClass, LightClassDataHolder.ForFacade, LightClassDataHolder.ForScript
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForFacadeImpl.kt
+1
View File
@@ -47,6 +47,7 @@ abstract class KtLightClassForFacadeImpl constructor(
FakeFileForLightClass(
firstFileInFacade,
lightClass = { this },
stub = { null },
packageFqName = facadeClassFqName.parent()
)
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForScript.kt
+1
View File
@@ -43,6 +43,7 @@ abstract class KtLightClassForScript(val script: KtScript) : KtLazyLightClass(sc
FakeFileForLightClass(
script.containingKtFile,
lightClass = { this },
stub = { null },
packageFqName = fqName.parent(),
)
}
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/KtLightClassForSourceDeclaration.kt
+13
View File
@@ -12,6 +12,7 @@ import com.intellij.openapi.util.Key
import com.intellij.openapi.util.TextRange
import com.intellij.psi.*
import com.intellij.psi.impl.InheritanceImplUtil
import com.intellij.psi.impl.java.stubs.PsiJavaFileStub
import com.intellij.psi.impl.source.PsiImmediateClassType
import com.intellij.psi.impl.source.tree.TreeUtil
import com.intellij.psi.scope.PsiScopeProcessor
@@ -43,6 +44,7 @@ import org.jetbrains.kotlin.load.java.structure.LightClassOriginKind
import org.jetbrains.kotlin.name.FqNameUnsafe
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.debugText.getDebugText
import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext
import org.jetbrains.kotlin.psi.psiUtil.hasExpectModifier
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub
@@ -97,13 +99,24 @@ abstract class KtLightClassForSourceDeclaration(
abstract override fun getParent(): PsiElement?
abstract override fun getQualifiedName(): String?
private fun getJavaFileStub(): PsiJavaFileStub = getLightClassDataHolder().javaFileStub
fun getDescriptor() =
LightClassGenerationSupport.getInstance(project).resolveToDescriptor(classOrObject) as? ClassDescriptor
protected fun getLightClassDataHolder(): LightClassDataHolder.ForClass {
val lightClassData = getLightClassDataHolder(classOrObject)
if (lightClassData is InvalidLightClassDataHolder) {
LOG.error("Invalid light class data for existing light class:\n$lightClassData\n${classOrObject.getElementTextWithContext()}")
}
return lightClassData
}
private val _containingFile: PsiFile by lazyPub {
object : FakeFileForLightClass(
classOrObject.containingKtFile,
{ if (classOrObject.isTopLevel()) this else create(getOutermostClassOrObject(classOrObject))!! },
{ getJavaFileStub() }
) {
override fun findReferenceAt(offset: Int) = ktFile.findReferenceAt(offset)
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightAnnotations.kt
+1 -6
View File
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.asJava.classes
import com.intellij.psi.*
import com.intellij.psi.impl.PsiImplUtil
import com.intellij.psi.impl.compiled.ClsJavaCodeReferenceElementImpl
import com.intellij.psi.impl.light.LightIdentifier
import org.jetbrains.kotlin.asJava.elements.KtLightAbstractAnnotation
import org.jetbrains.kotlin.asJava.elements.KtLightElementBase
@@ -48,11 +47,7 @@ class KtUltraLightSimpleAnnotation(
parent: PsiElement,
private val nameReferenceElementProvider: (() -> PsiJavaCodeReferenceElement?)? = null,
) : KtLightAbstractAnnotation(parent) {
private val _nameReferenceElement: PsiJavaCodeReferenceElement? by lazyPub {
nameReferenceElementProvider?.invoke() ?: annotationFqName?.let { ClsJavaCodeReferenceElementImpl(parent, it) }
}
override fun getNameReferenceElement(): PsiJavaCodeReferenceElement? = _nameReferenceElement
override fun getNameReferenceElement(): PsiJavaCodeReferenceElement? = nameReferenceElementProvider?.invoke()
private val parameterList = ParameterListImpl()
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightField.kt
+3 -8
View File
@@ -69,6 +69,9 @@ internal class KtUltraLightFieldForSourceDeclaration(
private val lightIdentifier = KtLightIdentifier(this, declaration)
override fun getNameIdentifier(): PsiIdentifier = lightIdentifier
override fun getText(): String? = kotlinOrigin.text
override fun getTextRange(): TextRange = kotlinOrigin.textRange
override fun getTextOffset(): Int = kotlinOrigin.textOffset
override fun getStartOffsetInParent(): Int = kotlinOrigin.startOffsetInParent
override fun isWritable(): Boolean = kotlinOrigin.isWritable
override fun getNavigationElement(): PsiElement = kotlinOrigin.navigationElement ?: this
@@ -103,10 +106,6 @@ internal open class KtUltraLightFieldImpl protected constructor(
override fun getLanguage(): Language = KotlinLanguage.INSTANCE
override fun getText(): String? = kotlinOrigin.text
override fun getTextRange(): TextRange? = kotlinOrigin.textRange
override fun getTextOffset(): Int = kotlinOrigin.textOffset
private val variableDescriptor: VariableDescriptor?
get() = declaration.resolve()
?.let { it as? PropertyDescriptor ?: it as? ValueParameterDescriptor }
@@ -117,14 +116,11 @@ internal open class KtUltraLightFieldImpl protected constructor(
declaration.delegateExpression?.let {
LightClassGenerationSupport.getInstance(project).analyze(it).getType(it)
}
declaration is KtObjectDeclaration ->
(declaration.resolve() as? ClassDescriptor)?.defaultType
declaration is KtEnumEntry -> {
(containingClass.kotlinOrigin?.resolve() as? ClassDescriptor)?.defaultType
}
else -> {
declaration.getKotlinType()
}
@@ -149,7 +145,6 @@ internal open class KtUltraLightFieldImpl protected constructor(
kotlinType?.asPsiType(support, TypeMappingMode.DEFAULT, this)
?.let(TypeConversionUtil::erasure)
?: nonExistent()
else -> {
val kotlinType = declaration.getKotlinType() ?: return@lazyPub PsiType.NULL
val descriptor = variableDescriptor ?: return@lazyPub PsiType.NULL
compiler/light-classes/src/org/jetbrains/kotlin/asJava/classes/ultraLightParameters.kt
+5 -7
View File
@@ -90,9 +90,8 @@ internal abstract class KtUltraLightParameter(
ultraLightMethod,
ultraLightMethod.language
), KtUltraLightElementWithNullabilityAnnotation<KtParameter, PsiParameter>, KtLightParameter {
override fun isEquivalentTo(another: PsiElement?): Boolean {
return another is KtParameter && kotlinOrigin?.isEquivalentTo(another) == true || this == another
}
override fun isEquivalentTo(another: PsiElement?): Boolean = kotlinOrigin == another
private val lightModifierList by lazyPub { KtLightSimpleModifierList(this, emptySet()) }
@@ -101,10 +100,6 @@ internal abstract class KtUltraLightParameter(
override fun getNavigationElement(): PsiElement = kotlinOrigin ?: method.navigationElement
override fun getUseScope(): SearchScope = kotlinOrigin?.useScope ?: LocalSearchScope(this)
override fun getText(): String? = kotlinOrigin?.text.orEmpty()
override fun getTextRange(): TextRange? = kotlinOrigin?.textRange
override fun getTextOffset(): Int = kotlinOrigin?.textOffset ?: super.getTextOffset()
override fun isValid() = parent.isValid
override fun computeQualifiedNameForNullabilityAnnotation(kotlinType: KotlinType?): String? {
@@ -203,6 +198,9 @@ internal class KtUltraLightParameterForSource(
}
}
override fun getText(): String? = kotlinOrigin.text
override fun getTextRange(): TextRange = kotlinOrigin.textRange
override fun getTextOffset(): Int = kotlinOrigin.textOffset
override fun getStartOffsetInParent(): Int = kotlinOrigin.startOffsetInParent
override fun isWritable(): Boolean = kotlinOrigin.isWritable
override fun getNavigationElement(): PsiElement = kotlinOrigin.navigationElement
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/FakeFileForLightClass.kt
+4 -2
View File
@@ -19,6 +19,7 @@ import com.intellij.psi.impl.java.stubs.impl.PsiJavaFileStubImpl
import com.intellij.psi.impl.source.PsiFileImpl
import com.intellij.psi.impl.source.SourceTreeToPsiMap
import com.intellij.psi.impl.source.tree.TreeElement
import com.intellij.psi.stubs.PsiClassHolderFileStub
import com.intellij.psi.util.PsiUtil
import com.intellij.reference.SoftReference
import com.intellij.util.AstLoadingFilter
@@ -32,7 +33,8 @@ import java.lang.ref.Reference
open class FakeFileForLightClass(
val ktFile: KtFile,
private val lightClass: () -> KtLightClass,
private val packageFqName: FqName = ktFile.packageFqName,
private val stub: () -> PsiClassHolderFileStub<*>?,
private val packageFqName: FqName = ktFile.packageFqName
) : ClsFileImpl(ktFile.viewProvider) {
override fun getVirtualFile(): VirtualFile =
@@ -47,7 +49,7 @@ open class FakeFileForLightClass(
return javaFileStub
}
override fun getStub() = createFakeJavaFileStub()
override fun getStub() = stub() ?: createFakeJavaFileStub()
override fun getClasses() = arrayOf(lightClass())
compiler/light-classes/src/org/jetbrains/kotlin/asJava/elements/KtToJvmAnnotationsConverter.kt
+6 -17
View File
@@ -20,7 +20,6 @@ import org.jetbrains.kotlin.psi.KtAnnotationEntry
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtModifierListOwner
import org.jetbrains.kotlin.resolve.constants.ArrayValue
import org.jetbrains.kotlin.resolve.constants.ConstantValue
import org.jetbrains.kotlin.resolve.constants.EnumValue
import org.jetbrains.kotlin.resolve.constants.KClassValue
import org.jetbrains.kotlin.utils.addToStdlib.safeAs
@@ -92,10 +91,11 @@ internal fun PsiAnnotation.tryConvertAsTarget(support: KtUltraLightSupport): KtL
val targetAttributes = "value" to ArrayValue(convertedValues) { module -> module.builtIns.array.defaultType }
return asUltraLightSimpleAnnotation(
return KtUltraLightSimpleAnnotation(
JAVA_LANG_ANNOTATION_TARGET,
listOf(targetAttributes),
support,
parent
)
}
@@ -111,28 +111,17 @@ internal fun createRetentionRuntimeAnnotation(support: KtUltraLightSupport, pare
JAVA_LANG_ANNOTATION_RETENTION,
listOf("value" to retentionMapping["kotlin.annotation.AnnotationRetention.RUNTIME"]!!),
support,
parent,
)
internal fun PsiAnnotation.asUltraLightSimpleAnnotation(
qualifier: String,
argumentsList: List<Pair<String, ConstantValue<*>>>,
ultraLightSupport: KtUltraLightSupport,
): KtLightAbstractAnnotation = KtUltraLightSimpleAnnotation(
annotationFqName = qualifier,
argumentsList = argumentsList,
ultraLightSupport = ultraLightSupport,
parent = parent,
nameReferenceElementProvider = { nameReferenceElement }
parent
)
internal fun PsiAnnotation.tryConvertAsRetention(support: KtUltraLightSupport): KtLightAbstractAnnotation? {
if (FqNames.retention.asString() != qualifiedName) return null
val convertedValue = extractAnnotationFqName("value")?.let { retentionMapping[it] } ?: return null
return asUltraLightSimpleAnnotation(
return KtUltraLightSimpleAnnotation(
JAVA_LANG_ANNOTATION_RETENTION,
listOf("value" to convertedValue),
support,
parent
)
}
@@ -182,5 +171,5 @@ private fun PsiAnnotation.tryConvertAs(
from: FqName,
to: String,
): KtLightAbstractAnnotation? = takeIf { from.asString() == qualifiedName }?.let {
asUltraLightSimpleAnnotation(to, emptyList(), support)
KtUltraLightSimpleAnnotation(to, emptyList(), support, parent)
}
compiler/testData/asJava/lightClasses/AnnotatedPropertyWithSites.kt
Vendored
+3
View File
@@ -15,3 +15,6 @@ class Test(@get:MyAnnotation @set:MyAnnotation2 @setparam:MyAnnotation3 @propert
get() = Unit
set(value) {}
}
// SKIP_SANITY_TEST
// SKIP_IDE_TEST
compiler/testData/asJava/lightClasses/AnnotationRepeatable.kt
Vendored
+3 -1
View File
@@ -4,4 +4,6 @@
package simple
@Repeatable
annotation class One(val value: String)
annotation class One(val value: String)
// SKIP_SANITY_TEST
// SKIP_IDE_TEST
compiler/testData/asJava/lightClasses/Constructors.kt
Vendored
+1
View File
@@ -5,4 +5,5 @@ class Constructors(val valInPrimary: Int) {
private constructor(): this(2)
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/DataClassWithCustomImplementedMembers.kt
Vendored
+2
View File
@@ -16,3 +16,5 @@ class Wrapper {
}
class G
// LAZINESS:NoLaziness
compiler/testData/asJava/lightClasses/DelegatedNested.kt
Vendored
+2
View File
@@ -11,3 +11,5 @@ interface I {
fun f()
}
// LAZINESS:NoLaziness
compiler/testData/asJava/lightClasses/Delegation.kt
Vendored
+2
View File
@@ -9,3 +9,5 @@ interface I {
fun f()
}
// LAZINESS:NoLaziness
compiler/testData/asJava/lightClasses/ExtendingInterfaceWithDefaultImpls.kt
Vendored
+4
View File
@@ -12,3 +12,7 @@ interface B: A {
interface C : B {
fun c() = "c"
}
// TODO: could be lazy
// see KT-22819
// LAZINESS:NoLaziness
compiler/testData/asJava/lightClasses/HiddenDeprecated.kt
Vendored
+1
View File
@@ -5,4 +5,5 @@ package a
fun f() {
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/HiddenDeprecatedInClass.kt
Vendored
+1
View File
@@ -8,4 +8,5 @@ class A {
}
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/OnlySecondaryConstructors.kt
Vendored
+1
View File
@@ -5,4 +5,5 @@ class OnlySecondaryConstructors {
constructor(p: Int): this()
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/SpecialAnnotationsOnAnnotationClass.kt
Vendored
+2
View File
@@ -1,5 +1,7 @@
// Anno
// FULL_JDK
// SKIP_SANITY_TEST
// SKIP_IDE_TEST
@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.TYPE)
compiler/testData/asJava/lightClasses/compilationErrors/ActualTypeAliasCustomJvmPackageName.kt
Vendored
+2
View File
@@ -4,3 +4,5 @@
package p
actual typealias B = List<Int>
// SKIP_IDE_TEST
compiler/testData/asJava/lightClasses/compilationErrors/JvmPackageName.kt
Vendored
+2
View File
@@ -6,3 +6,5 @@ package p
fun f() {
}
// SKIP_IDE_TEST
compiler/testData/asJava/lightClasses/compilationErrors/RepetableAnnotations.kt
Vendored
+1
View File
@@ -1,4 +1,5 @@
// p.Annotations
// SKIP_SANITY_TEST
package p
compiler/testData/asJava/lightClasses/compilationErrors/WrongAnnotations.kt
Vendored
+2
View File
@@ -32,3 +32,5 @@ class A {
}
}
}
// LAZINESS:NoConsistency
compiler/testData/asJava/lightClasses/facades/SingleJvmClassName.kt
Vendored
+2
View File
@@ -5,3 +5,5 @@
fun foo() {
}
// SKIP_IDE_TEST
compiler/testData/asJava/lightClasses/ideRegression/AllOpenAnnotatedClasses.kt
Vendored
+2
View File
@@ -23,4 +23,6 @@ class C {
}
}
// LAZINESS:NoLaziness
// SKIP_SANITY_TEST
// COMPILATION_ERRORS
compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.java
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
public final class C /* p.C*/ extends p.A {
public C();// .ctor()
public int af$light_idea_test_case();// af$light_idea_test_case()
public int af();// af$light_idea_test_case()
public int getAp$light_idea_test_case();// getAp$light_idea_test_case()
public int getAp();// getAp$light_idea_test_case()
}
compiler/testData/asJava/lightClasses/ideRegression/OverridingFinalInternal.kt
Vendored
+1
View File
@@ -10,4 +10,5 @@ class C : A() {
}
}
// LAZINESS:NoConsistency
// COMPILATION_ERRORS
compiler/testData/asJava/lightClasses/ideRegression/OverridingInternal.kt
Vendored
+1
View File
@@ -13,4 +13,5 @@ class C : A(), I {
override fun if() = 5
}
// LAZINESS:NoLaziness
// COMPILATION_ERRORS
compiler/testData/asJava/lightClasses/ideRegression/OverridingProtected.kt
Vendored
+1
View File
@@ -10,4 +10,5 @@ class C : A() {
}
}
// LAZINESS:NoLaziness
// COMPILATION_ERRORS
compiler/testData/asJava/lightClasses/nullabilityAnnotations/OverrideAnyWithUnit.kt
Vendored
+1
View File
@@ -8,4 +8,5 @@ class C : Base {
override fun foo(): Unit {}
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/nullabilityAnnotations/UnitAsGenericArgument.kt
Vendored
+1
View File
@@ -7,4 +7,5 @@ interface Base<T> {
class C : Base<Unit> {
override fun foo(t: Unit) {}
}
// LAZINESS:NoLaziness
// FIR_COMPARISON
compiler/testData/asJava/lightClasses/script/HelloWorld.kts
Vendored
+2
View File
@@ -1,3 +1,5 @@
// HelloWorld
println("Hello world!")
// LAZINESS:NoLaziness
compiler/testData/asJava/lightClasses/script/InnerClasses.kts
Vendored
+2
View File
@@ -11,3 +11,5 @@ class Bar(val a: Int) {
}
}
}
// LAZINESS:NoLaziness
compiler/testData/asJava/script/ide/HelloWorld.java
Vendored
+2 -2
View File
@@ -1,6 +1,6 @@
public class HelloWorld /* HelloWorld*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public HelloWorld(java.lang.String[]);// .ctor(java.lang.String[])
public HelloWorld();// .ctor()
public static final void main(java.lang.String[]);// main(java.lang.String[])
}
}
compiler/testData/asJava/script/ide/HelloWorld.kts
Vendored
+2
View File
@@ -1,3 +1,5 @@
// HelloWorld
println("Hello world!")
// LAZINESS:NoLaziness
compiler/testData/asJava/script/ide/InnerClasses.java
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
public class InnerClasses /* InnerClasses*/ extends kotlin.script.templates.standard.ScriptTemplateWithArgs {
public InnerClasses(java.lang.String[]);// .ctor(java.lang.String[])
public InnerClasses();// .ctor()
public static final void main(java.lang.String[]);// main(java.lang.String[])
@@ -23,4 +23,4 @@ public static final class Baz /* InnerClasses.Bar.Baz*/ {
public final void doSomething();// doSomething()
}}}
}}}
compiler/testData/asJava/script/ide/InnerClasses.kts
Vendored
+2
View File
@@ -11,3 +11,5 @@ class Bar(val a: Int) {
}
}
}
// LAZINESS:NoLaziness
compiler/testData/asJava/ultraLightClasses/enums.java
Vendored
-24
View File
@@ -4,12 +4,6 @@ public enum Direction /* Direction*/ {
WEST,
EAST;
@org.jetbrains.annotations.NotNull()
public static Direction valueOf(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.lang.IllegalArgumentException;// valueOf(java.lang.String)
@org.jetbrains.annotations.NotNull()
public static Direction[] values();// values()
private Direction();// .ctor()
}
@@ -21,12 +15,6 @@ public enum Color /* Color*/ {
private final int rgb;
@org.jetbrains.annotations.NotNull()
public static Color valueOf(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.lang.IllegalArgumentException;// valueOf(java.lang.String)
@org.jetbrains.annotations.NotNull()
public static Color[] values();// values()
private Color(@org.jetbrains.annotations.NotNull() java.lang.String);// .ctor(java.lang.String)
private Color(int);// .ctor(int)
@@ -54,12 +42,6 @@ public enum ProtocolState /* ProtocolState*/ {
@org.jetbrains.annotations.NotNull()
public abstract ProtocolState signal();// signal()
@org.jetbrains.annotations.NotNull()
public static ProtocolState valueOf(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.lang.IllegalArgumentException;// valueOf(java.lang.String)
@org.jetbrains.annotations.NotNull()
public static ProtocolState[] values();// values()
private ProtocolState();// .ctor()
@@ -102,12 +84,6 @@ public enum IntArithmetics /* IntArithmetics*/ implements java.util.function.Bin
};
@org.jetbrains.annotations.NotNull()
public static IntArithmetics valueOf(@org.jetbrains.annotations.NotNull() java.lang.String) throws java.lang.IllegalArgumentException;// valueOf(java.lang.String)
@org.jetbrains.annotations.NotNull()
public static IntArithmetics[] values();// values()
private IntArithmetics();// .ctor()
public int applyAsInt(int, int);// applyAsInt(int, int)