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

Code clean

Browse Source
This commit is contained in:
Michael Bogdanov
2016-04-27 17:57:20 +03:00
parent 7d77f9171c
commit 309348c9be
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/tests/org/jetbrains/kotlin/android/tests/CodegenTestsOnAndroidGenerator.java
+7 -6
View File
@@ -261,7 +261,8 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
for (String annotation : FILE_NAME_ANNOTATIONS) { for (String annotation : FILE_NAME_ANNOTATIONS) {
if (text.contains(annotation)) { if (text.contains(annotation)) {
int indexOf = text.indexOf(annotation); int indexOf = text.indexOf(annotation);
return packageFqName.child(Name.identifier(text.substring(text.indexOf("(\"", indexOf) + 2, text.indexOf("\")", indexOf)))); String annotationParameter = text.substring(text.indexOf("(\"", indexOf) + 2, text.indexOf("\")", indexOf));
return packageFqName.child(Name.identifier(annotationParameter));
} }
} }
@@ -272,17 +273,17 @@ public class CodegenTestsOnAndroidGenerator extends UsefulTestCase {
return text.contains("fun box()"); return text.contains("fun box()");
} }
private String changePackage(String packageName, String text, Ref<FqName> oldPackage) { private String changePackage(String newPackageName, String text, Ref<FqName> oldPackage) {
if (text.contains("package ")) { if (text.contains("package ")) {
Matcher matcher = packagePattern.matcher(text); Matcher matcher = packagePattern.matcher(text);
assert matcher.find(); assert matcher.find();
String group = matcher.toMatchResult().group(1); String oldPackageName = matcher.toMatchResult().group(1);
oldPackage.set(FqName.fromSegments(Arrays.asList(group.split("\\.")))); oldPackage.set(new FqName(oldPackageName));
return matcher.replaceAll("package " + packageName); return matcher.replaceAll("package " + newPackageName);
} }
else { else {
oldPackage.set(FqName.ROOT); oldPackage.set(FqName.ROOT);
String packageDirective = "package " + packageName + ";\n"; String packageDirective = "package " + newPackageName + ";\n";
if (text.contains("@file:")) { if (text.contains("@file:")) {
int index = text.lastIndexOf("@file:"); int index = text.lastIndexOf("@file:");
int packageDirectiveIndex = text.indexOf("\n", index); int packageDirectiveIndex = text.indexOf("\n", index);