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

Kapt3, minor, tests: Weaken regular expression for Metadata shrinking

Browse Source
This commit is contained in:
Yan Zhulanow
2017-06-20 16:52:49 +03:00
committed by Denis Zharkov
parent d88d1d6189
commit e7e0032cc8
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/test/org/jetbrains/kotlin/kapt3/test/AbstractKotlinKapt3Test.kt
+1 -1
View File
@@ -87,7 +87,7 @@ abstract class AbstractKotlinKapt3Test : CodegenTestCase() {
abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test() { abstract class AbstractClassFileToSourceStubConverterTest : AbstractKotlinKapt3Test() {
internal companion object { internal companion object {
private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = \\{.+?\\}" private val KOTLIN_METADATA_GROUP = "[a-z0-9]+ = (\\{.+?\\}|[0-9]+)"
private val KOTLIN_METADATA_REGEX = "@kotlin\\.Metadata\\(($KOTLIN_METADATA_GROUP)(, $KOTLIN_METADATA_GROUP)*\\)".toRegex() private val KOTLIN_METADATA_REGEX = "@kotlin\\.Metadata\\(($KOTLIN_METADATA_GROUP)(, $KOTLIN_METADATA_GROUP)*\\)".toRegex()
fun removeMetadataAnnotationContents(s: String): String = s.replace(KOTLIN_METADATA_REGEX, "@kotlin.Metadata()") fun removeMetadataAnnotationContents(s: String): String = s.replace(KOTLIN_METADATA_REGEX, "@kotlin.Metadata()")
plugins/kapt3/testData/converter/defaultImpls.txt
Vendored
+2 -2
View File
@@ -5,7 +5,7 @@ public abstract interface Intf {
public abstract int getColor(); public abstract int getColor();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3) @kotlin.Metadata()
public static final class DefaultImpls { public static final class DefaultImpls {
public DefaultImpls() { public DefaultImpls() {
@@ -40,7 +40,7 @@ public abstract interface IntfWithDefaultImpls {
public abstract void a(); public abstract void a();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3) @kotlin.Metadata()
public static final class DefaultImpls { public static final class DefaultImpls {
public DefaultImpls() { public DefaultImpls() {
plugins/kapt3/testData/converter/methodParameterNames.txt
Vendored
+1 -1
View File
@@ -26,7 +26,7 @@ public abstract interface Intf {
@org.jetbrains.annotations.NotNull() @org.jetbrains.annotations.NotNull()
public abstract java.lang.String bar(int bcd); public abstract java.lang.String bar(int bcd);
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3) @kotlin.Metadata()
public static final class DefaultImpls { public static final class DefaultImpls {
public DefaultImpls() { public DefaultImpls() {
plugins/kapt3/testData/converter/nestedClasses.txt
Vendored
+1 -1
View File
@@ -25,7 +25,7 @@ public final class A {
@org.jetbrains.annotations.Nullable() @org.jetbrains.annotations.Nullable()
public abstract A.B getY(); public abstract A.B getY();
@kotlin.Metadata(mv = {1, 1, 6}, bv = {1, 0, 1}, k = 3) @kotlin.Metadata()
public static final class DefaultImpls { public static final class DefaultImpls {
public DefaultImpls() { public DefaultImpls() {