From 45f96f8f320adb69df3f82a9887be7b0841519b3 Mon Sep 17 00:00:00 2001 From: Natalia Ukhorskaya Date: Fri, 29 Jan 2016 13:26:51 +0300 Subject: [PATCH] Evaluate expression shouldn't be applicable for name of named parameter in function call #KT-7266 Fixed --- .../kotlin/idea/debugger/KotlinEditorTextProvider.kt | 2 +- idea/testData/debugger/selectExpression/nameArgument.kt | 5 +++++ .../evaluate/SelectExpressionForDebuggerTestGenerated.java | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 idea/testData/debugger/selectExpression/nameArgument.kt diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt index 6dfaed5d361..9a7ea495c15 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/KotlinEditorTextProvider.kt @@ -116,7 +116,7 @@ class KotlinEditorTextProvider : EditorTextProvider { } private val NOT_ACCEPTED_AS_CONTEXT_TYPES = - arrayOf(KtUserType::class.java, KtImportDirective::class.java, KtPackageDirective::class.java) + arrayOf(KtUserType::class.java, KtImportDirective::class.java, KtPackageDirective::class.java, KtValueArgumentName::class.java) fun isAcceptedAsCodeFragmentContext(element: PsiElement): Boolean { return !NOT_ACCEPTED_AS_CONTEXT_TYPES.contains(element.javaClass as Class<*>) && diff --git a/idea/testData/debugger/selectExpression/nameArgument.kt b/idea/testData/debugger/selectExpression/nameArgument.kt new file mode 100644 index 00000000000..b12212803d4 --- /dev/null +++ b/idea/testData/debugger/selectExpression/nameArgument.kt @@ -0,0 +1,5 @@ +fun foo(i: Int) { + foo(i = 1) +} + +// EXPECTED: null \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java index 2b5c70c283c..f0f10934737 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/evaluate/SelectExpressionForDebuggerTestGenerated.java @@ -121,6 +121,12 @@ public class SelectExpressionForDebuggerTestGenerated extends AbstractSelectExpr doTest(fileName); } + @TestMetadata("nameArgument.kt") + public void testNameArgument() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/nameArgument.kt"); + doTest(fileName); + } + @TestMetadata("package.kt") public void testPackage() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/debugger/selectExpression/package.kt");