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

- KT-2353 convert a selection of Java code to Kotlin by copy paste (or context menu) - Apply patch from Sergey Ignatov

Browse Source 
#KT-2353 fixed
This commit is contained in:
Nikolay Krasko
2012-07-18 14:32:27 +04:00
parent 00b0f26339
commit 28b0eefe5d
8 changed files with 410 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/src/org/jetbrains/jet/j2k/Converter.java
+6 -4
View File
@@ -175,7 +175,9 @@ public class Converter {
else if (e instanceof PsiClassInitializer) {
members.add(initializerToInitializer((PsiClassInitializer) e));
}
else if (e instanceof PsiMember) System.out.println(e.getClass() + " " + e.getText());
else if (e instanceof PsiMember) {
// System.out.println(e.getClass() + " " + e.getText());
}
}
return members;
}
@@ -219,7 +221,7 @@ public class Converter {
}
@NotNull
private Class classToClass(@NotNull PsiClass psiClass) {
public Class classToClass(@NotNull PsiClass psiClass) {
final Set<String> modifiers = modifiersListToModifiersSet(psiClass.getModifierList());
final List<Field> fields = fieldsToFieldList(psiClass.getFields(), psiClass);
final List<Element> typeParameters = elementsToElementList(psiClass.getTypeParameters());
@@ -233,7 +235,7 @@ public class Converter {
// we try to find super() call and generate class declaration like that: class A(name: String, i : Int) : Base(name)
final SuperVisitor visitor = new SuperVisitor();
psiClass.accept(visitor);
final HashSet<PsiExpressionList> resolvedSuperCallParameters = visitor.getResolvedSuperCallParameters();
final Collection<PsiExpressionList> resolvedSuperCallParameters = visitor.getResolvedSuperCallParameters();
if (resolvedSuperCallParameters.size() == 1) {
baseClassParams.addAll(
expressionsToExpressionList(
@@ -677,7 +679,7 @@ public class Converter {
@NotNull
public static Set<String> modifiersListToModifiersSet(@Nullable PsiModifierList modifierList) {
HashSet<String> modifiersSet = new HashSet<String>();
Set<String> modifiersSet = new HashSet<String>();
if (modifierList != null) {
if (modifierList.hasExplicitModifier(PsiModifier.ABSTRACT)) modifiersSet.add(Modifier.ABSTRACT);
if (modifierList.hasModifierProperty(PsiModifier.FINAL)) modifiersSet.add(Modifier.FINAL);