Use List.sort instead of Collections.sort

This commit is contained in:
Alexander Udalov
2017-04-01 02:02:11 +03:00
parent a9f35ae898
commit 37f435da93
11 changed files with 23 additions and 35 deletions
@@ -24,7 +24,6 @@ import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
import org.jetbrains.org.objectweb.asm.Type;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -115,7 +114,7 @@ public class FrameMap {
descriptors.add(Trinity.create(descriptor, varIndex, varSize));
}
Collections.sort(descriptors, Comparator.comparingInt(left -> left.second));
descriptors.sort(Comparator.comparingInt(left -> left.second));
sb.append("size=").append(myMaxIndex);
@@ -210,19 +210,12 @@ public class CodegenBinding {
}
List<KtFile> sortedAnswer = new ArrayList<KtFile>(answer);
Collections.sort(sortedAnswer, new Comparator<KtFile>() {
@NotNull
private String path(KtFile file) {
VirtualFile virtualFile = file.getVirtualFile();
assert virtualFile != null : "VirtualFile is null for JetFile: " + file.getName();
return virtualFile.getPath();
}
@Override
public int compare(@NotNull KtFile first, @NotNull KtFile second) {
return path(first).compareTo(path(second));
}
});
sortedAnswer.sort(Comparator.comparing((KtFile file) -> {
VirtualFile virtualFile = file.getVirtualFile();
assert virtualFile != null : "VirtualFile is null for JetFile: " + file.getName();
return virtualFile.getPath();
}));
return sortedAnswer;
}