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

Fix KonanTest to correctly replace packages when test contains function parameters with the same name as package

Browse Source
This commit is contained in:
Pavel Punegov
2018-09-19 17:23:05 +03:00
committed by Pavel Punegov
parent db15656cbe
commit e8a2c58759
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/plugins/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+2 -1
View File
@@ -791,7 +791,8 @@ class RunExternalTestGroup extends RunStandaloneKonanTest {
def vars = new HashSet<String>() // variables that has the same name as a package def vars = new HashSet<String>() // variables that has the same name as a package
text.eachLine { line -> text.eachLine { line ->
packages.each { pkg -> packages.each { pkg ->
if (line =~ ~/va(l|r) *$pkg *\=/) { // line contains val or var declaration or function parameter declaration
if ((line =~ ~/va(l|r) *$pkg *\=/) || (line =~ ~/fun .*\(\n?\s*$pkg:.*/)) {
vars.add(pkg) vars.add(pkg)
} }
if (line.contains("$pkg.") && ! (line =~ packagePattern || line =~ importRegex) if (line.contains("$pkg.") && ! (line =~ packagePattern || line =~ importRegex)