From b26f746514535d58294380d04b1a749915328d6d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Wed, 20 Mar 2019 15:33:28 +0300 Subject: [PATCH] Minor: Rename KotlinEvaluatorBuilder to match the superclass name --- .../kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt | 2 +- .../{KotlinEvaluationBuilder.kt => KotlinEvaluatorBuilder.kt} | 2 +- .../kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/{KotlinEvaluationBuilder.kt => KotlinEvaluatorBuilder.kt} (99%) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt index 7a9eeef095b..37f3e7f3443 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinCodeFragmentFactory.kt @@ -281,7 +281,7 @@ class KotlinCodeFragmentFactory : CodeFragmentFactory() { override fun getFileType(): KotlinFileType = KotlinFileType.INSTANCE - override fun getEvaluatorBuilder() = KotlinEvaluationBuilder + override fun getEvaluatorBuilder() = KotlinEvaluatorBuilder companion object { private val LOG = Logger.getInstance(this::class.java) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt similarity index 99% rename from idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt rename to idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt index 50bcf90ed3d..85a617016b7 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluationBuilder.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinEvaluatorBuilder.kt @@ -83,7 +83,7 @@ internal val LOG = Logger.getInstance("#org.jetbrains.kotlin.idea.debugger.evalu internal const val GENERATED_FUNCTION_NAME = "generated_for_debugger_fun" internal const val GENERATED_CLASS_NAME = "Generated_for_debugger_class" -object KotlinEvaluationBuilder : EvaluatorBuilder { +object KotlinEvaluatorBuilder : EvaluatorBuilder { override fun build(codeFragment: PsiElement, position: SourcePosition?): ExpressionEvaluator { if (codeFragment !is KtCodeFragment || position == null) { return EvaluatorBuilderImpl.getInstance().build(codeFragment, position) diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt index 21832b46291..a84ca771935 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/evaluate/KotlinRuntimeTypeEvaluator.kt @@ -66,7 +66,7 @@ abstract class KotlinRuntimeTypeEvaluator( val codeFragment = KtPsiFactory(myElement.project).createExpressionCodeFragment( myElement.text, myElement.containingFile.context ) - KotlinEvaluationBuilder.build(codeFragment, ContextUtil.getSourcePosition(evaluationContext)) + KotlinEvaluatorBuilder.build(codeFragment, ContextUtil.getSourcePosition(evaluationContext)) } val value = evaluator.evaluate(evaluationContext)