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

KT-2752: when simple name of class is a JS keyword or a well-known global name, add '$' to name of constructor function

Browse Source
This commit is contained in:
Alexey Andreev
2016-09-13 17:11:44 +03:00
parent a4bf058be6
commit e7e6a917eb
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/initializer/ClassInitializerTranslator.java
+6
View File
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.js.translate.initializer; package org.jetbrains.kotlin.js.translate.initializer;
import com.google.dart.compiler.backend.js.JsReservedIdentifiers;
import com.google.dart.compiler.backend.js.ast.*; import com.google.dart.compiler.backend.js.ast.*;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.descriptors.*;
@@ -94,6 +95,11 @@ public final class ClassInitializerTranslator extends AbstractTranslator {
} }
if (functionName != null) { if (functionName != null) {
if (JsReservedIdentifiers.reservedGlobalSymbols.contains(functionName) ||
JsFunctionScope.Companion.getRESERVED_WORDS().contains(functionName)
) {
functionName += "$";
}
ctorFunction.setName(ctorFunction.getScope().declareName(functionName)); ctorFunction.setName(ctorFunction.getScope().declareName(functionName));
} }