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

Properly patch package name in case of file annotations on default package

Browse Source
This commit is contained in:
Michael Bogdanov
2016-04-22 18:37:31 +03:00
parent 797465a06b
commit 6228b11048
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+8 -1
View File
@@ -244,7 +244,14 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
return matcher.replaceAll("package " + testName); return matcher.replaceAll("package " + testName);
} }
else { else {
return "package " + testName + ";\n" + text; String packageDirective = "package " + testName + ";\n";
if (text.contains("@file:")) {
int index = text.lastIndexOf("@file:");
int packageDirectiveIndex = text.indexOf("\n", index);
return text.substring(0, packageDirectiveIndex + 1) + packageDirective + text.substring(packageDirectiveIndex + 1);
} else {
return packageDirective + text;
}
} }
} }