From e0677dffd4df5a384690e57730d34a6d5b4f857a Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Mon, 29 Dec 2014 14:48:26 +0100 Subject: [PATCH] a bit more cleanup --- .../jet/plugin/coverage/KotlinCoverageExtension.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt index 7b5ab2c0995..d6d381f072a 100644 --- a/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt +++ b/idea/src/org/jetbrains/jet/plugin/coverage/KotlinCoverageExtension.kt @@ -48,6 +48,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils import org.jetbrains.jet.lang.resolve.kotlin.KotlinBinaryClassCache import com.intellij.openapi.vfs.LocalFileSystem import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader +import com.intellij.openapi.util.io.FileUtilRt public class KotlinCoverageExtension(): JavaCoverageEngineExtension() { private val LOG = Logger.getInstance(javaClass()) @@ -91,7 +92,10 @@ public class KotlinCoverageExtension(): JavaCoverageEngineExtension() { val prefixes = collectClassFilePrefixes(file) LOG.debug("Classfile prefixes: [${prefixes.join(", ")}]") return packageOutputDir.getChildren().filter { - file -> prefixes.any { file.getName().startsWith(it + "$") || file.getName().equals(it + ".class") } + file -> prefixes.any { + (file.getName().startsWith(it + "$") && FileUtilRt.getExtension(file.getName()) == "class") || + file.getName() == it + ".class" + } } }