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

[K/JS] Exclude default from the regular reserved keywords to give ability to export declarations with default export ^KT-54480 Fixed

Browse Source 
fix(KT-54480): exclude default from the regular reserved keywords to give ability to export intities with default export.

Merge-request: KT-MR-7459
Merged-by: Artem Kobzar <Artem.Kobzar@jetbrains.com>
This commit is contained in:
Artem Kobzar
2022-10-24 10:12:30 +00:00
committed by Space Team
parent 57578b569e
commit 14e4febb05
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.ast/src/org/jetbrains/kotlin/js/common/IdentifierPolicy.kt
+4 -2
View File
@@ -51,9 +51,11 @@ fun String.isValidES5Identifier(): Boolean {
return true
}
val RESERVED_KEYWORDS: Set<String> = setOf(
val SPECIAL_KEYWORDS: Set<String> = setOf("default")
val RESERVED_KEYWORDS: Set<String> = SPECIAL_KEYWORDS + setOf(
// keywords
"await", "break", "case", "catch", "continue", "debugger", "default", "delete", "do", "else", "finally", "for", "function", "if",
"await", "break", "case", "catch", "continue", "debugger", "delete", "do", "else", "finally", "for", "function", "if",
"in", "instanceof", "new", "return", "switch", "this", "throw", "try", "typeof", "var", "void", "while", "with",
// future reserved words
js/js.frontend/src/org/jetbrains/kotlin/js/resolve/diagnostics/JsExportDeclarationChecker.kt
+2 -1
View File
@@ -11,6 +11,7 @@ import org.jetbrains.kotlin.builtins.isFunctionType
import org.jetbrains.kotlin.descriptors.*
import org.jetbrains.kotlin.descriptors.ClassKind.*
import org.jetbrains.kotlin.js.common.RESERVED_KEYWORDS
import org.jetbrains.kotlin.js.common.SPECIAL_KEYWORDS
import org.jetbrains.kotlin.js.naming.NameSuggestion
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
import org.jetbrains.kotlin.psi.KtAnnotationEntry
@@ -212,7 +213,7 @@ object JsExportDeclarationChecker : DeclarationChecker {
val name = declarationDescriptor.getKotlinOrJsName()
if (name !in RESERVED_KEYWORDS && NameSuggestion.sanitizeName(name) == name) return
if (name in SPECIAL_KEYWORDS || (name !in RESERVED_KEYWORDS && NameSuggestion.sanitizeName(name) == name)) return
val reportTarget = declarationDescriptor.getJsNameArgument() ?: declaration.getIdentifier()