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

Java to Kotlin converter: do not drop exceptions, produce internal error!

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-06-27 18:50:33 +04:00
parent 3c42933f96
commit 806cc1e434
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/actions/JavaToKotlinActionUtil.java
+16 -17
View File
@@ -100,17 +100,19 @@ public class JavaToKotlinActionUtil {
} }
static void deleteFiles(List<PsiJavaFile> allJavaFilesNear) { static void deleteFiles(List<PsiJavaFile> allJavaFilesNear) {
for (final PsiFile f : allJavaFilesNear) { for (final PsiFile psiFile : allJavaFilesNear) {
ApplicationManager.getApplication().runWriteAction(new Runnable() { ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
PsiManager manager = f.getManager(); PsiManager manager = psiFile.getManager();
VirtualFile vFile = f.getVirtualFile(); VirtualFile vFile = psiFile.getVirtualFile();
if (vFile != null) { if (vFile != null) {
vFile.delete(manager); vFile.delete(manager);
} }
} catch (IOException ignored) { }
catch (IOException e) {
MessagesEx.error(psiFile.getProject(), e.getMessage()).showLater();
} }
} }
}); });
@@ -122,38 +124,35 @@ public class JavaToKotlinActionUtil {
try { try {
VirtualFile virtualFile = psiFile.getVirtualFile(); VirtualFile virtualFile = psiFile.getVirtualFile();
if (psiFile instanceof PsiJavaFile && virtualFile != null) { if (psiFile instanceof PsiJavaFile && virtualFile != null) {
String result = ""; String result = converter.elementToKotlin(psiFile);
try {
result = converter.elementToKotlin(psiFile);
} catch (Exception e) {
//noinspection CallToPrintStackTrace
e.printStackTrace();
}
PsiManager manager = psiFile.getManager(); PsiManager manager = psiFile.getManager();
assert manager != null; assert manager != null;
VirtualFile copy = virtualFile.copy(manager, virtualFile.getParent(), virtualFile.getNameWithoutExtension() + ".kt"); VirtualFile copy = virtualFile.copy(manager, virtualFile.getParent(), virtualFile.getNameWithoutExtension() + ".kt");
copy.setBinaryContent(CharsetToolkit.getUtf8Bytes(result)); copy.setBinaryContent(CharsetToolkit.getUtf8Bytes(result));
return copy; return copy;
} }
} catch (Exception ex) { }
MessagesEx.error(psiFile.getProject(), ex.getMessage()).showLater(); catch (IOException e) {
MessagesEx.error(psiFile.getProject(), e.getMessage()).showLater();
} }
return null; return null;
} }
static void renameFiles(@NotNull List<PsiJavaFile> psiFiles) { static void renameFiles(@NotNull List<PsiJavaFile> psiFiles) {
for (final PsiFile f : psiFiles) { for (final PsiFile psiFile : psiFiles) {
ApplicationManager.getApplication().runWriteAction(new Runnable() { ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override @Override
public void run() { public void run() {
try { try {
PsiManager manager = f.getManager(); PsiManager manager = psiFile.getManager();
VirtualFile vFile = f.getVirtualFile(); VirtualFile vFile = psiFile.getVirtualFile();
if (vFile != null) { if (vFile != null) {
vFile.copy(manager, vFile.getParent(), vFile.getNameWithoutExtension() + ".java.old"); vFile.copy(manager, vFile.getParent(), vFile.getNameWithoutExtension() + ".java.old");
vFile.delete(manager); vFile.delete(manager);
} }
} catch (IOException ignored) { }
catch (IOException e) {
MessagesEx.error(psiFile.getProject(), e.getMessage()).showLater();
} }
} }
}); });