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

Minor: additional logging when failing to read file in VirtualFileKotlinClass

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-03-04 18:15:19 +04:00
parent 0cfac5f9c7
commit bc79855cf5
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java
+18 -5
View File
@@ -16,6 +16,7 @@
package org.jetbrains.jet.lang.resolve.kotlin; package org.jetbrains.jet.lang.resolve.kotlin;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.Ref;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import kotlin.Function0; import kotlin.Function0;
@@ -34,12 +35,12 @@ import org.jetbrains.jet.storage.NullableLazyValue;
import org.jetbrains.jet.storage.StorageManager; import org.jetbrains.jet.storage.StorageManager;
import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.UtilsPackage;
import java.io.IOException;
import static org.jetbrains.asm4.ClassReader.*; import static org.jetbrains.asm4.ClassReader.*;
import static org.jetbrains.asm4.Opcodes.ASM4; import static org.jetbrains.asm4.Opcodes.ASM4;
public class VirtualFileKotlinClass implements KotlinJvmBinaryClass { public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
private final static Logger LOG = Logger.getInstance(VirtualFileKotlinClass.class);
private final VirtualFile file; private final VirtualFile file;
private final NotNullLazyValue<JvmClassName> className; private final NotNullLazyValue<JvmClassName> className;
private final NullableLazyValue<KotlinClassHeader> classHeader; private final NullableLazyValue<KotlinClassHeader> classHeader;
@@ -80,7 +81,8 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
} }
}, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
} }
catch (IOException e) { catch (Throwable e) {
logFileReadingError(e);
throw UtilsPackage.rethrow(e); throw UtilsPackage.rethrow(e);
} }
return classNameRef.get(); return classNameRef.get();
@@ -112,7 +114,8 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
} }
}, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
} }
catch (IOException e) { catch (Throwable e) {
logFileReadingError(e);
throw UtilsPackage.rethrow(e); throw UtilsPackage.rethrow(e);
} }
} }
@@ -196,7 +199,8 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
} }
}, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES);
} }
catch (IOException e) { catch (Throwable e) {
logFileReadingError(e);
throw UtilsPackage.rethrow(e); throw UtilsPackage.rethrow(e);
} }
} }
@@ -221,4 +225,13 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass {
public String toString() { public String toString() {
return getClass().getSimpleName() + ": " + file.toString(); return getClass().getSimpleName() + ": " + file.toString();
} }
private void logFileReadingError(@NotNull Throwable e) {
LOG.error(
"Could not read file: " + file.getPath() + "\n"
+ "Size in bytes: " + file.getLength() + "\n"
+ "File type: " + file.getFileType().getName(),
e
);
}
} }