diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java index a7ed8598c7c..1e1bc72eb77 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectClass.java @@ -1 +1 @@ - +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java index c330f2fabf8..1e1bc72eb77 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectObject.java @@ -1 +1 @@ - \ No newline at end of file +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java index a7ed8598c7c..1e1bc72eb77 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClass.java @@ -1 +1 @@ - +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java index c330f2fabf8..1e1bc72eb77 100644 --- a/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java +++ b/compiler/testData/asJava/lightClasses/compilationErrors/ExpectedNestedClassInObject.java @@ -1 +1 @@ - \ No newline at end of file +// NOT_GENERATED diff --git a/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java b/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java index a7ed8598c7c..1e1bc72eb77 100644 --- a/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java +++ b/compiler/testData/asJava/lightClasses/facades/EmptyFile.NoCompile.java @@ -1 +1 @@ - +// NOT_GENERATED diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt index 3fe6bda159f..fa86ce601ab 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/asJava/LightClassTestCommon.kt @@ -16,12 +16,13 @@ import java.util.regex.Pattern object LightClassTestCommon { private val SUBJECT_FQ_NAME_PATTERN = Pattern.compile("^//\\s*(.*)$", Pattern.MULTILINE) + private const val NOT_GENERATED_DIRECTIVE = "// NOT_GENERATED" fun testLightClass( - expectedFile: File, - testDataFile: File, - findLightClass: (String) -> PsiClass?, - normalizeText: (String) -> String + expectedFile: File, + testDataFile: File, + findLightClass: (String) -> PsiClass?, + normalizeText: (String) -> String ) { val text = FileUtil.loadFile(testDataFile, true) val matcher = SUBJECT_FQ_NAME_PATTERN.matcher(text) @@ -36,7 +37,7 @@ object LightClassTestCommon { private fun actualText(fqName: String?, lightClass: PsiClass?, normalizeText: (String) -> String): String { if (lightClass == null) { - return "" + return NOT_GENERATED_DIRECTIVE } TestCase.assertTrue("Not a light class: $lightClass ($fqName)", lightClass is KtLightClass) @@ -52,5 +53,5 @@ object LightClassTestCommon { // Actual text for light class is generated with ClsElementImpl.appendMirrorText() that can find empty DefaultImpl inner class in stubs // for all interfaces. This inner class can't be used in Java as it generally is not seen from light classes built from Kotlin sources. // It is also omitted during classes generation in backend so it also absent in light classes built from compiled code. - fun removeEmptyDefaultImpls(text: String) : String = text.replace("\n static final class DefaultImpls {\n }\n", "") + fun removeEmptyDefaultImpls(text: String): String = text.replace("\n static final class DefaultImpls {\n }\n", "") } \ No newline at end of file