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

Support new convention for local variables name mangling: '$receiver' -> '$this$<label>' (KT-26913)

Browse Source
This commit is contained in:
Yan Zhulanow
2018-12-06 15:38:56 +09:00
parent b5f9149702
commit ea462091c4
23 changed files with 100 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/kapt3/kapt3-compiler/testData/converter/annotations2.txt
Vendored
+2 -2
View File
@@ -26,7 +26,7 @@ public final class AnnotationsTest {
@Anno(value = "top-level-fun")
public static final void topLevelFun(@org.jetbrains.annotations.NotNull()
@Anno(value = "top-level-fun-receiver")
java.lang.String $receiver) {
java.lang.String $this$topLevelFun) {
}
@Anno(value = "top-level-val")
@@ -35,7 +35,7 @@ public final class AnnotationsTest {
@org.jetbrains.annotations.NotNull()
public static final java.lang.String getTopLevelVal(@Anno(value = "top-level-val-receiver")
int $receiver) {
int $this$topLevelVal) {
return null;
}
}
plugins/kapt3/kapt3-compiler/testData/converter/kt25071.txt
Vendored
+1 -1
View File
@@ -68,7 +68,7 @@ public final class LibKt {
}
public static final int func(@org.jetbrains.annotations.NotNull()
java.lang.String $receiver) {
java.lang.String $this$func) {
return 0;
}
}
plugins/kapt3/kapt3-compiler/testData/converter/kt27126.txt
Vendored
+1 -1
View File
@@ -68,7 +68,7 @@ public abstract class NullableBundleProperty<EE extends java.lang.Object> implem
private final java.lang.String key = null;
private final java.lang.String toKey(@org.jetbrains.annotations.NotNull()
kotlin.reflect.KProperty<?> $receiver) {
kotlin.reflect.KProperty<?> $this$toKey) {
return null;
}
plugins/kapt3/kapt3-compiler/testData/converter/nonExistentClassTypesConversion.txt
Vendored
+1 -1
View File
@@ -304,7 +304,7 @@ public final class Test<G extends java.lang.Object> {
@org.jetbrains.annotations.Nullable()
public final <T extends java.lang.Object>java.lang.Class<java.lang.Enum<?>> f5(@org.jetbrains.annotations.NotNull()
MyType<T> $receiver) {
MyType<T> $this$f5) {
return null;
}
plugins/kapt3/kapt3-compiler/testData/converter/topLevel.txt
Vendored
+3 -3
View File
@@ -45,7 +45,7 @@ public final class TopLevelKt {
public static final void extensionFunction(@org.jetbrains.annotations.NotNull()
@Anno(value = "rec")
java.lang.String $receiver, @org.jetbrains.annotations.NotNull()
java.lang.String $this$extensionFunction, @org.jetbrains.annotations.NotNull()
@Anno(value = "1")
java.lang.String a, @org.jetbrains.annotations.NotNull()
@Anno(value = "2")
@@ -59,13 +59,13 @@ public final class TopLevelKt {
@org.jetbrains.annotations.NotNull()
public static final <T extends java.lang.Object>java.lang.String getExtensionProperty(@org.jetbrains.annotations.NotNull()
@Anno(value = "propRec")
T $receiver) {
T $this$extensionProperty) {
return null;
}
public static final <T extends java.lang.Object>void setExtensionProperty(@org.jetbrains.annotations.NotNull()
@Anno(value = "propRec")
T $receiver, @org.jetbrains.annotations.NotNull()
T $this$extensionProperty, @org.jetbrains.annotations.NotNull()
@Anno(value = "setparam")
java.lang.String setParamName) {
}
plugins/uast-kotlin/testData/ParametersDisorder.log.txt
Vendored
+2 -2
View File
@@ -15,7 +15,7 @@ UFile (package = )
ULiteralExpression (value = "aaa")
UBlockExpression
UAnnotationMethod (name = withReceiver)
UParameter (name = $receiver)
UParameter (name = $this$withReceiver)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UParameter (name = a)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
@@ -147,7 +147,7 @@ UFile (package = )
UAnnotationMethod (name = ParametersDisorderKt$objectLiteral$1)
UClass (name = A)
UAnnotationMethod (name = with2Receivers)
UParameter (name = $receiver)
UParameter (name = $this$with2Receivers)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UParameter (name = a)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
plugins/uast-kotlin/testData/ParametersDisorder.render.txt
Vendored
+2 -2
View File
@@ -3,7 +3,7 @@ public final class ParametersDisorderKt {
}
public static final fun withDefault(@org.jetbrains.annotations.NotNull c: int, @org.jetbrains.annotations.NotNull d: java.lang.String) : void {
}
public static final fun withReceiver(@org.jetbrains.annotations.NotNull $receiver: java.lang.String, @org.jetbrains.annotations.NotNull a: int, @org.jetbrains.annotations.NotNull b: float) : void {
public static final fun withReceiver(@org.jetbrains.annotations.NotNull $this$withReceiver: java.lang.String, @org.jetbrains.annotations.NotNull a: int, @org.jetbrains.annotations.NotNull b: float) : void {
}
public static final fun call() : void {
global(2.2, 2)
@@ -26,7 +26,7 @@ public final class ParametersDisorderKt {
}
public final class A {
public final fun with2Receivers(@org.jetbrains.annotations.NotNull $receiver: java.lang.String, @org.jetbrains.annotations.NotNull a: int, @org.jetbrains.annotations.NotNull b: float) : void {
public final fun with2Receivers(@org.jetbrains.annotations.NotNull $this$with2Receivers: java.lang.String, @org.jetbrains.annotations.NotNull a: int, @org.jetbrains.annotations.NotNull b: float) : void {
}
public fun A() = UastEmptyExpression
}
plugins/uast-kotlin/testData/ReceiverFun.log.txt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
UFile (package = )
UClass (name = ReceiverFunKt)
UAnnotationMethod (name = foo)
UParameter (name = $receiver)
UParameter (name = $this$foo)
UAnnotation (fqName = MyReceiverAnnotation)
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
plugins/uast-kotlin/testData/ReceiverFun.render.txt
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
public final class ReceiverFunKt {
public static final fun foo(@MyReceiverAnnotation @org.jetbrains.annotations.NotNull $receiver: java.lang.String) : int {
public static final fun foo(@MyReceiverAnnotation @org.jetbrains.annotations.NotNull $this$foo: java.lang.String) : int {
return this.length
}
}