From 85450955b620296d65f51cd44431f8a1db794613 Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 29 Dec 2016 22:06:32 +0300 Subject: [PATCH] Allopen, Noarg: Implement old classpath elements filtering correctly (KT-15448) --- .../src/idePluginUtils.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt b/plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt index a2914fc1a16..1e8127b1e84 100644 --- a/plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt +++ b/plugins/annotation-based-compiler-plugins-ide-support/src/idePluginUtils.kt @@ -40,7 +40,7 @@ internal fun modifyCompilerArgumentsForPlugin( val newPluginOptions = oldPluginOptions + annotationOptions val oldPluginClasspaths = (commonArguments.pluginClasspaths ?: emptyArray()).filterTo(mutableListOf()) { - !it.substringAfterLast('/', missingDelimiterValue = "").matches("(kotlin-)?$pluginName-.*\\.jar".toRegex()) + !it.substringAfterLast('/', missingDelimiterValue = "").matches("(kotlin-)?(maven-)?$pluginName-.*\\.jar".toRegex()) } val newPluginClasspaths = oldPluginClasspaths + (setup?.classpath ?: emptyList())