From a2d6bd09f31501182e46ee0dc8eaca3e5e5c6f7a Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 8 Dec 2015 19:07:32 +0300 Subject: [PATCH] Minor: allow to use ${file} directive in action text to reference file name --- .../kotlin/idea/quickfix/AbstractQuickFixTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java index 1f48725d411..5c58cce97de 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java +++ b/idea/tests/org/jetbrains/kotlin/idea/quickfix/AbstractQuickFixTest.java @@ -39,6 +39,7 @@ import kotlin.CollectionsKt; import kotlin.StringsKt; import kotlin.jvm.functions.Function1; import org.apache.commons.lang.SystemUtils; +import org.codehaus.plexus.util.FileUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.KotlinLightQuickFixTestCase; @@ -131,7 +132,10 @@ public abstract class AbstractQuickFixTest extends KotlinLightQuickFixTestCase { private static void applyAction(String contents, QuickFixTestCase quickFixTestCase, String testName, String testFullPath) throws Exception { Pair pair = quickFixTestCase.parseActionHintImpl(quickFixTestCase.getFile(), contents); - String text = pair.getFirst(); + + String fileName = StringsKt.substringAfterLast(testFullPath, "/", ""); + String text = pair.getFirst().replace("${file}", fileName); + boolean actionShouldBeAvailable = pair.getSecond().booleanValue(); quickFixTestCase.beforeActionStarted(testName, contents);