From be9255f311c3b021494397d83959a36326040a1f Mon Sep 17 00:00:00 2001 From: Sergey Loktev Date: Tue, 14 Mar 2023 16:00:56 +0300 Subject: [PATCH 1/2] Fixed false escaping --- .../codegen/model/constructor/visitor/CgJsRenderer.kt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt index 428c55b833..452415898b 100644 --- a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt +++ b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt @@ -50,7 +50,6 @@ import org.utbot.framework.codegen.renderer.CgAbstractRenderer import org.utbot.framework.codegen.renderer.CgPrinter import org.utbot.framework.codegen.renderer.CgPrinterImpl import org.utbot.framework.codegen.renderer.CgRendererContext -import org.utbot.framework.codegen.services.language.isLanguageKeyword import org.utbot.framework.plugin.api.BuiltinMethodId import org.utbot.framework.plugin.api.ClassId import org.utbot.framework.plugin.api.TypeParameters @@ -409,8 +408,7 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP print("${exception.name.escapeNamePossibleKeyword()}: ${exception.type}") } - override fun escapeNamePossibleKeywordImpl(s: String): String = - if (isLanguageKeyword(s, context.cgLanguageAssistant)) "`$s`" else s + override fun escapeNamePossibleKeywordImpl(s: String): String = "" override fun renderClassVisibility(classId: ClassId) { TODO("Not yet implemented") From 3929b32913f5b553d1e5f94004ea6014f9839d23 Mon Sep 17 00:00:00 2001 From: Sergey Loktev Date: Wed, 15 Mar 2023 15:28:18 +0300 Subject: [PATCH 2/2] Hotfix --- .../framework/codegen/model/constructor/visitor/CgJsRenderer.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt index 452415898b..2eaad9149d 100644 --- a/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt +++ b/utbot-js/src/main/kotlin/framework/codegen/model/constructor/visitor/CgJsRenderer.kt @@ -408,7 +408,7 @@ internal class CgJsRenderer(context: CgRendererContext, printer: CgPrinter = CgP print("${exception.name.escapeNamePossibleKeyword()}: ${exception.type}") } - override fun escapeNamePossibleKeywordImpl(s: String): String = "" + override fun escapeNamePossibleKeywordImpl(s: String): String = s override fun renderClassVisibility(classId: ClassId) { TODO("Not yet implemented")