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

Fix import packages in external tests

Browse Source
This commit is contained in:
Pavel Punegov
2019-06-21 15:59:35 +03:00
committed by Pavel Punegov
parent 3f97d4d6f7
commit ef24aff534
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+6 -3
View File
@@ -443,9 +443,12 @@ class RunExternalTestGroup extends OldKonanTest {
} }
if (line.contains("$pkg.") && ! (line =~ packagePattern || line =~ importRegex) if (line.contains("$pkg.") && ! (line =~ packagePattern || line =~ importRegex)
&& ! vars.contains(pkg)) { && ! vars.contains(pkg)) {
def idx = line.indexOf("$pkg") def idx = 0
if (! (idx > 0 && Character.isJavaIdentifierPart(line.charAt(idx - 1))) ) { while ((idx = line.indexOf(pkg, idx)) >= 0) {
line = line.substring(0, idx) + "$sourceName.$pkg" + line.substring(idx + pkg.length()) if (!Character.isJavaIdentifierPart(line.charAt(idx - 1))) {
line = line.substring(0, idx) + "$sourceName.$pkg" + line.substring(idx + pkg.length())
idx += sourceName.length() + pkg.length() + 1
}
} }
} }
} }