From 425deb42ecb8621dcd1512fd1c5bbdd6299efb8d Mon Sep 17 00:00:00 2001 From: Ilya Chernikov Date: Mon, 15 Jul 2019 12:47:31 +0200 Subject: [PATCH] Convert paths to unix format before matching with filePathPattern should also fix testPathPattern5_kts test --- .../jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt index 090112abb43..1816d56aeb2 100644 --- a/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt +++ b/plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.scripting.definitions import com.intellij.openapi.util.UserDataHolderBase +import com.intellij.openapi.util.io.FileUtilRt import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate import java.io.File import kotlin.reflect.KClass @@ -127,7 +128,7 @@ abstract class ScriptDefinition : UserDataHolderBase() { override fun isScript(file: File): Boolean = file.name.endsWith(".$fileExtension") && (filePathPattern?.let { - Regex(it).matches(file.path) + Regex(it).matches(FileUtilRt.toSystemIndependentName(file.path)) } ?: true) override val fileExtension: String get() = compilationConfiguration[ScriptCompilationConfiguration.fileExtension]!!