From 9663e724aa5bcca65baf462ebabd68e4d07ec1b8 Mon Sep 17 00:00:00 2001 From: Pavel Punegov Date: Wed, 7 Oct 2020 16:17:22 +0300 Subject: [PATCH] Fix local variable matching pattern. --- .../src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy index 01786c7dde6..6e6bfc091cb 100644 --- a/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy +++ b/build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy @@ -339,7 +339,8 @@ class RunExternalTestGroup extends JavaExec { text.eachLine { line -> packages.each { pkg -> // line contains val or var declaration or function parameter declaration - if ((line =~ ~/va(l|r) *$pkg *(get\(\))? *\=/) || (line =~ ~/fun .*\(\n?\s*$pkg:.*/)) { + if ((line =~ ~/va(l|r) *$pkg*( *: *$fullQualified*)?( *get\(\))? *\=.*/) || + (line =~ ~/fun .*\(\n?\s*$pkg:.*/)) { vars.add(pkg) } if (line.contains("$pkg.") && !(line =~ packagePattern || line =~ importRegex)