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

Fix incorrect package replacement: should check that current occurrence is not a part of identifier

Browse Source
This commit is contained in:
Pavel Punegov
2019-06-28 16:52:12 +03:00
committed by Pavel Punegov
parent 91868e7200
commit 5579449cdc
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-tools/src/main/groovy/org/jetbrains/kotlin/KonanTest.groovy
+4 -5
View File
@@ -444,11 +444,10 @@ 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 = 0 def idx = 0
while ((idx = line.indexOf(pkg, idx)) >= 0) { while ((idx = line.indexOf(pkg, idx)) >= 0 &&
if (!Character.isJavaIdentifierPart(line.charAt(idx - 1))) { !Character.isJavaIdentifierPart(line.charAt(idx - 1))) {
line = line.substring(0, idx) + "$sourceName.$pkg" + line.substring(idx + pkg.length()) line = line.substring(0, idx) + "$sourceName.$pkg" + line.substring(idx + pkg.length())
idx += sourceName.length() + pkg.length() + 1 idx += sourceName.length() + pkg.length() + 1
}
} }
} }
} }