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

Do not use inline-only in java

Browse Source
This commit is contained in:
Ilya Gorbunov
2016-01-29 00:26:57 +03:00
parent 8a00db5661
commit a12fe2c18a
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
+4 -2
View File
@@ -16,7 +16,7 @@
package org.jetbrains.kotlin.load.java;
import kotlin.text.StringsKt;
import kotlin.text.Regex;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor;
import org.jetbrains.kotlin.descriptors.ClassDescriptor;
@@ -53,6 +53,8 @@ public final class JvmAbi {
public static final String LOCAL_VARIABLE_NAME_PREFIX_INLINE_ARGUMENT = "$i$a$";
public static final String LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION = "$i$f$";
private static final Regex SANITIZE_AS_JAVA_INVALID_CHARACTERS = new Regex("[^\\p{L}\\p{Digit}]");
@NotNull
public static String getSyntheticMethodNameForAnnotatedProperty(@NotNull Name propertyName) {
return propertyName.asString() + ANNOTATED_PROPERTY_METHOD_NAME_SUFFIX;
@@ -90,7 +92,7 @@ public final class JvmAbi {
@NotNull
public static String sanitizeAsJavaIdentifier(@NotNull String str) {
return StringsKt.replace(str, StringsKt.toRegex("[^\\p{L}\\p{Digit}]"), "_");
return SANITIZE_AS_JAVA_INVALID_CHARACTERS.replace(str, "_");
}
public static boolean isPropertyWithBackingFieldInOuterClass(@NotNull PropertyDescriptor propertyDescriptor) {