azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert paths to unix format before matching with filePathPattern

Browse Source 
should also fix testPathPattern5_kts test
This commit is contained in:
Ilya Chernikov
2019-07-15 12:47:31 +02:00
parent 7d6bb023a8
commit 425deb42ec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/scripting/scripting-compiler-impl/src/org/jetbrains/kotlin/scripting/definitions/ScriptDefinition.kt
+2 -1
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.scripting.definitions package org.jetbrains.kotlin.scripting.definitions
import com.intellij.openapi.util.UserDataHolderBase import com.intellij.openapi.util.UserDataHolderBase
import com.intellij.openapi.util.io.FileUtilRt
import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate import org.jetbrains.kotlin.scripting.resolve.KotlinScriptDefinitionFromAnnotatedTemplate
import java.io.File import java.io.File
import kotlin.reflect.KClass import kotlin.reflect.KClass
@@ -127,7 +128,7 @@ abstract class ScriptDefinition : UserDataHolderBase() {
override fun isScript(file: File): Boolean = override fun isScript(file: File): Boolean =
file.name.endsWith(".$fileExtension") && file.name.endsWith(".$fileExtension") &&
(filePathPattern?.let { (filePathPattern?.let {
Regex(it).matches(file.path) Regex(it).matches(FileUtilRt.toSystemIndependentName(file.path))
} ?: true) } ?: true)
override val fileExtension: String get() = compilationConfiguration[ScriptCompilationConfiguration.fileExtension]!! override val fileExtension: String get() = compilationConfiguration[ScriptCompilationConfiguration.fileExtension]!!