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

KT-11030 Avoid name clash between member fields and fields that store closure of local classes

Browse Source
This commit is contained in:
Alexey Andreev
2016-03-10 11:48:25 +03:00
parent 337078faf3
commit 00292f4125
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/context/UsageTracker.kt
+3 -1
View File
@@ -70,7 +70,9 @@ class UsageTracker(
val suggestedName = when (this) { val suggestedName = when (this) {
is ReceiverParameterDescriptor -> this.getNameForCapturedReceiver() is ReceiverParameterDescriptor -> this.getNameForCapturedReceiver()
is TypeParameterDescriptor -> Namer.isInstanceSuggestedName(this) is TypeParameterDescriptor -> Namer.isInstanceSuggestedName(this)
else -> getSuggestedName(this)
// Append 'closure$' prefix to avoid name clash between closure and member fields in case of local classes
else -> "closure\$${getSuggestedName(this)}"
} }
return scope.declareFreshName(suggestedName) return scope.declareFreshName(suggestedName)