From 210827b1d5bb60f7e9baccd737687876eae373e7 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Wed, 29 Jan 2014 17:33:40 +0400 Subject: [PATCH] ExceptionUtils rewritten in Kotlin --- .../jvm/compiler/CompileEnvironmentUtil.java | 6 +-- .../jet/cli/jvm/repl/ReplFromTerminal.java | 12 ++--- .../jet/cli/jvm/repl/ReplInterpreter.java | 6 +-- .../kotlin/VirtualFileKotlinClass.java | 8 +-- .../descriptors/serialization/ClassData.java | 6 +-- .../serialization/NameSerializationUtil.java | 6 +-- .../serialization/PackageData.java | 6 +-- .../jetbrains/jet/asJava/LightClassUtil.java | 4 +- .../org/jetbrains/jet/MockLibraryUtil.java | 6 +-- .../jet/checkers/BaseDiagnosticsTest.java | 6 +-- .../org/jetbrains/jet/cli/CliBaseTest.java | 4 +- .../jet/codegen/AbstractBytecodeTextTest.java | 4 +- .../jet/codegen/CodegenTestUtil.java | 4 +- .../jetbrains/jet/codegen/LineNumberTest.java | 6 +-- .../jetbrains/jet/codegen/ScriptGenTest.java | 4 +- .../AbstractBlackBoxCodegenTest.java | 4 +- ...ompileKotlinAgainstCustomBinariesTest.java | 4 +- .../tests/org/jetbrains/jet/test/Tmpdir.java | 4 +- .../jet/storage/LockBasedStorageManager.java | 4 +- .../jetbrains/jet/utils/ExceptionUtils.java | 54 ------------------- .../jetbrains/jet/utils/WrappedValues.java | 2 +- .../org/jetbrains/jet/utils/excpetionUtils.kt | 41 ++++++++++++++ .../references/BuiltInsReferenceResolver.java | 4 +- .../jet/editor/TypedHandlerTest.java | 4 +- .../JetLightCodeInsightFixtureTestCase.java | 4 +- .../debugger/PositionManagerTestCase.java | 8 +-- .../filters/JetExceptionFilterTest.java | 4 +- .../jetbrains/k2js/test/rhino/RhinoUtils.java | 2 +- 28 files changed, 107 insertions(+), 120 deletions(-) delete mode 100644 core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java create mode 100644 core/util.runtime/src/org/jetbrains/jet/utils/excpetionUtils.kt diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java index f7a2f1394ef..07e8f121198 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java @@ -42,7 +42,7 @@ import org.jetbrains.jet.config.CommonConfigurationKeys; import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.KotlinPaths; import org.jetbrains.jet.utils.PathUtil; @@ -206,10 +206,10 @@ public class CompileEnvironmentUtil { throw new CompileEnvironmentException("Invalid jar path " + jarPath, e); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } finally { - ExceptionUtils.closeQuietly(outputStream); + UtilsPackage.closeQuietly(outputStream); } } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java index e35082250de..cb733b24e80 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplFromTerminal.java @@ -22,7 +22,7 @@ import jline.console.ConsoleReader; import jline.console.history.FileHistory; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.config.CompilerConfiguration; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.io.PrintWriter; @@ -59,7 +59,7 @@ public class ReplFromTerminal { consoleReader.setHistoryEnabled(true); consoleReader.setHistory(new FileHistory(new File(new File(System.getProperty("user.home")), ".kotlin_history"))); } catch (Exception e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -72,13 +72,13 @@ public class ReplFromTerminal { try { waitRepl.wait(); } catch (Throwable e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } if (replInterpreter != null) { return replInterpreter; } - throw ExceptionUtils.rethrow(replInitializationFailed); + throw UtilsPackage.rethrow(replInitializationFailed); } } @@ -94,7 +94,7 @@ public class ReplFromTerminal { } } } catch (Exception e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } finally { try { ((FileHistory) consoleReader.getHistory()).flush(); @@ -132,7 +132,7 @@ public class ReplFromTerminal { } } catch (Exception e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java index d9d953d3852..0a19fd80dfc 100644 --- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java +++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java @@ -60,7 +60,7 @@ import org.jetbrains.jet.lang.types.lang.InlineUtil; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.plugin.JetLanguage; import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.io.PrintWriter; @@ -119,7 +119,7 @@ public class ReplInterpreter { classpath.add(file.toURI().toURL()); } catch (MalformedURLException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -281,7 +281,7 @@ public class ReplInterpreter { PrintWriter writer = new PrintWriter(System.err); classLoader.dumpClasses(writer); writer.flush(); - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java index b778de368bb..0e555ac49cd 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/kotlin/VirtualFileKotlinClass.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.name.Name; import org.jetbrains.jet.storage.NotNullLazyValue; import org.jetbrains.jet.storage.NullableLazyValue; import org.jetbrains.jet.storage.StorageManager; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.IOException; @@ -81,7 +81,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass { }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } return classNameRef.get(); } @@ -113,7 +113,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass { }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -197,7 +197,7 @@ public class VirtualFileKotlinClass implements KotlinJvmBinaryClass { }, SKIP_CODE | SKIP_DEBUG | SKIP_FRAMES); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java index 5fd442048f9..b0f2f1309c9 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/ClassData.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.descriptors.serialization; import com.google.protobuf.ExtensionRegistryLite; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,7 @@ public final class ClassData { return new ClassData(nameResolver, classProto); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -66,7 +66,7 @@ public final class ClassData { return result.toByteArray(); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java index 901383bec10..5072b70ced5 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/NameSerializationUtil.java @@ -17,7 +17,7 @@ package org.jetbrains.jet.descriptors.serialization; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.IOException; import java.io.InputStream; @@ -35,7 +35,7 @@ public class NameSerializationUtil { return new NameResolver(simpleNames, qualifiedNames); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -57,7 +57,7 @@ public class NameSerializationUtil { qualifiedNameTable.writeDelimitedTo(out); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java index 89b46ab0b08..fe0cddc3118 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/PackageData.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.descriptors.serialization; import com.google.protobuf.ExtensionRegistryLite; import org.jetbrains.annotations.NotNull; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -34,7 +34,7 @@ public final class PackageData { return new PackageData(nameResolver, packageProto); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -66,7 +66,7 @@ public final class PackageData { return result.toByteArray(); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } } diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java index 98a4af5103c..19ddcbce7ec 100644 --- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java +++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/LightClassUtil.java @@ -41,7 +41,7 @@ import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.java.jetAsJava.KotlinLightMethod; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.KotlinVfsUtil; import java.io.File; @@ -97,7 +97,7 @@ public class LightClassUtil { FileUtil.toSystemIndependentName(BUILT_INS_SRC_DIR.getAbsolutePath())); } catch (MalformedURLException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java index b9b412ea969..63e2c291be9 100644 --- a/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java +++ b/compiler/tests/org/jetbrains/jet/MockLibraryUtil.java @@ -20,7 +20,7 @@ import com.intellij.util.io.ZipUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.PathUtil; import java.io.*; @@ -53,7 +53,7 @@ public class MockLibraryUtil { return jarFile; } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } @@ -73,7 +73,7 @@ public class MockLibraryUtil { assertEquals(new String(outStream.toByteArray()), ExitCode.OK.name(), invocationResult.name()); } catch (Throwable e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java index 7919b1dc5a1..ce81f5bea05 100644 --- a/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java +++ b/compiler/tests/org/jetbrains/jet/checkers/BaseDiagnosticsTest.java @@ -39,7 +39,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.lang.diagnostics.*; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.BindingContext; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.junit.Assert; import java.io.File; @@ -85,7 +85,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture { JetTestUtils.mkdirs(javaFilesDir); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } return javaFilesDir; } @@ -97,7 +97,7 @@ public abstract class BaseDiagnosticsTest extends JetLiteFixture { Files.write(content, javaFile, Charset.forName("utf-8")); return true; } catch (Exception e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java index 35e30659118..26a182c86a0 100644 --- a/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java +++ b/compiler/tests/org/jetbrains/jet/cli/CliBaseTest.java @@ -28,7 +28,7 @@ import org.jetbrains.jet.cli.common.ExitCode; import org.jetbrains.jet.cli.js.K2JSCompiler; import org.jetbrains.jet.cli.jvm.K2JVMCompiler; import org.jetbrains.jet.test.Tmpdir; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.junit.Rule; import org.junit.rules.TestName; @@ -54,7 +54,7 @@ public class CliBaseTest { return Pair.create(bytes.toString("utf-8"), exitCode); } catch (Exception e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } finally { System.setOut(origOut); diff --git a/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java b/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java index 5f9a79aba38..14c9a8e3cb5 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/AbstractBytecodeTextTest.java @@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.ConfigurationKind; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.util.ArrayList; @@ -54,7 +54,7 @@ public abstract class AbstractBytecodeTextTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(text); - ExceptionUtils.rethrow(e); + UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java index 1df275dcb70..4f117561650 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java +++ b/compiler/tests/org/jetbrains/jet/codegen/CodegenTestUtil.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.config.CompilerConfiguration; import org.jetbrains.jet.lang.resolve.AnalyzingUtils; import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.lang.types.lang.InlineUtil; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.io.IOException; @@ -115,7 +115,7 @@ public class CodegenTestUtil { return javaClassesTempDirectory; } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java index 9d6460ad0cb..218fe46e491 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/LineNumberTest.java @@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.test.TestCaseWithTmpdir; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.io.IOException; @@ -80,7 +80,7 @@ public class LineNumberTest extends TestCaseWithTmpdir { text = FileUtil.loadFile(file); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } return JetTestUtils.createFile(file.getName(), text, environment.getProject()); @@ -121,7 +121,7 @@ public class LineNumberTest extends TestCaseWithTmpdir { } catch (Throwable e) { System.out.println(factory.createText()); - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java index 6cea1e8fcf4..293dd7ce491 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/ScriptGenTest.java @@ -24,7 +24,7 @@ import org.jetbrains.jet.lang.parsing.JetScriptDefinition; import org.jetbrains.jet.lang.parsing.JetScriptDefinitionProvider; import org.jetbrains.jet.lang.resolve.AnalyzerScriptParameter; import org.jetbrains.jet.lang.resolve.ScriptNameUtil; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.lang.reflect.Constructor; import java.lang.reflect.Field; @@ -81,7 +81,7 @@ public class ScriptGenTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(generateToText()); - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java index f7849796431..8dd73ecff85 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -26,7 +26,7 @@ import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment; import org.jetbrains.jet.codegen.CodegenTestCase; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.psi.JetPsiUtil; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.lang.reflect.Method; @@ -102,7 +102,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { } catch (Throwable e) { System.out.println(generateToText()); - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } } diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java index d9bc5151828..deb567300da 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/CompileKotlinAgainstCustomBinariesTest.java @@ -32,7 +32,7 @@ import org.jetbrains.jet.lang.resolve.java.AnalyzerFacadeForJVM; import org.jetbrains.jet.test.TestCaseWithTmpdir; import org.jetbrains.jet.test.util.DescriptorValidator; import org.jetbrains.jet.test.util.RecursiveDescriptorComparator; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.BufferedOutputStream; import java.io.File; @@ -129,7 +129,7 @@ public class CompileKotlinAgainstCustomBinariesTest extends TestCaseWithTmpdir { return outputFile; } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java b/compiler/tests/org/jetbrains/jet/test/Tmpdir.java index ae80cd164c8..cd8269e5df5 100644 --- a/compiler/tests/org/jetbrains/jet/test/Tmpdir.java +++ b/compiler/tests/org/jetbrains/jet/test/Tmpdir.java @@ -20,7 +20,7 @@ import com.google.common.io.Files; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.JetTestUtils; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -37,7 +37,7 @@ public class Tmpdir extends TestWatcher { tmpDir = Files.createTempDir().getCanonicalFile(); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java index fa20aa183eb..cbdea4b9840 100644 --- a/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java +++ b/core/util.runtime/src/org/jetbrains/jet/storage/LockBasedStorageManager.java @@ -21,7 +21,7 @@ import jet.Function1; import jet.Unit; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import org.jetbrains.jet.utils.WrappedValues; import java.util.concurrent.ConcurrentHashMap; @@ -36,7 +36,7 @@ public class LockBasedStorageManager implements StorageManager { @NotNull @Override public RuntimeException handleException(@NotNull Throwable throwable) { - throw ExceptionUtils.rethrow(throwable); + throw UtilsPackage.rethrow(throwable); } }; diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java b/core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java deleted file mode 100644 index 0bd9ce2f216..00000000000 --- a/core/util.runtime/src/org/jetbrains/jet/utils/ExceptionUtils.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2010-2013 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.jet.utils; - -import java.io.Closeable; - -public class ExceptionUtils { - - private ExceptionUtils() { - } - - /** - * Translate exception to unchecked exception. - * - * Return type is specified to make it possible to use it like this: - * throw ExceptionUtils.rethrow(e); - * In this case compiler knows that code after this rethrowing won't be executed. - */ - public static RuntimeException rethrow(Throwable e) { - if (e instanceof RuntimeException) { - throw (RuntimeException) e; - } - else if (e instanceof Error) { - throw (Error) e; - } - else { - throw new RuntimeException(e); - } - } - - public static void closeQuietly(Closeable closeable) { - if (closeable != null) { - try { - closeable.close(); - } catch (Throwable ignored) { - } - } - } - -} diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java b/core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java index 6cce7e3e5e4..11c05adc016 100644 --- a/core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java +++ b/core/util.runtime/src/org/jetbrains/jet/utils/WrappedValues.java @@ -69,7 +69,7 @@ public class WrappedValues { @Nullable public static V unescapeThrowable(@Nullable Object value) { if (value instanceof ThrowableWrapper) { - throw ExceptionUtils.rethrow(((ThrowableWrapper) value).getThrowable()); + throw UtilsPackage.rethrow(((ThrowableWrapper) value).getThrowable()); } //noinspection unchecked diff --git a/core/util.runtime/src/org/jetbrains/jet/utils/excpetionUtils.kt b/core/util.runtime/src/org/jetbrains/jet/utils/excpetionUtils.kt new file mode 100644 index 00000000000..2a3e9b5ebe4 --- /dev/null +++ b/core/util.runtime/src/org/jetbrains/jet/utils/excpetionUtils.kt @@ -0,0 +1,41 @@ +/* + * Copyright 2010-2014 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.jetbrains.jet.utils + +import java.io.Closeable + +/** + * Translate exception to unchecked exception. + * + * Return type is specified to make it possible to use it like this: + * throw ExceptionUtils.rethrow(e); + * In this case compiler knows that code after this rethrowing won't be executed. + */ +public fun rethrow(e: Throwable): RuntimeException { + throw e +} + +public fun closeQuietly(closeable: Closeable?) { + if (closeable != null) { + try { + closeable.close() + } + catch (ignored: Throwable) { + // Do nothing + } + } +} \ No newline at end of file diff --git a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java index a534ba7a6c1..655bb6b0892 100644 --- a/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java +++ b/idea/src/org/jetbrains/jet/plugin/references/BuiltInsReferenceResolver.java @@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import org.jetbrains.jet.renderer.DescriptorRenderer; import org.jetbrains.jet.storage.LockBasedStorageManager; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.net.MalformedURLException; @@ -128,7 +128,7 @@ public class BuiltInsReferenceResolver extends AbstractProjectComponent { builtIns.addAll(getBuiltInSourceFiles(BUILT_INS_COMPILABLE_SRC_DIR.toURI().toURL())); } catch (MalformedURLException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.java b/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.java index 6b2f591d4ae..9310a3318f1 100644 --- a/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.java +++ b/idea/tests/org/jetbrains/jet/editor/TypedHandlerTest.java @@ -18,7 +18,7 @@ package org.jetbrains.jet.editor; import com.intellij.testFramework.EditorTestUtil; import com.intellij.testFramework.LightCodeInsightTestCase; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.IOException; @@ -315,7 +315,7 @@ public class TypedHandlerTest extends LightCodeInsightTestCase { checkResultByText(afterText); } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java index ba238e9b22f..97b71bcbe49 100644 --- a/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/JetLightCodeInsightFixtureTestCase.java @@ -23,7 +23,7 @@ import com.intellij.testFramework.LightProjectDescriptor; import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.InTextDirectivesUtils; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; import java.io.IOException; @@ -59,7 +59,7 @@ public abstract class JetLightCodeInsightFixtureTestCase extends LightCodeInsigh } } catch (IOException e) { - throw ExceptionUtils.rethrow(e); + throw UtilsPackage.rethrow(e); } } diff --git a/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java b/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java index ae6fcd8d677..34713fc77f6 100644 --- a/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java +++ b/idea/tests/org/jetbrains/jet/plugin/debugger/PositionManagerTestCase.java @@ -40,7 +40,7 @@ import org.jetbrains.jet.codegen.GenerationUtils; import org.jetbrains.jet.codegen.state.GenerationState; import org.jetbrains.jet.lang.psi.JetFile; import org.jetbrains.jet.lang.resolve.java.JetFilesProvider; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.util.*; import java.util.regex.Matcher; @@ -64,7 +64,7 @@ public abstract class PositionManagerTestCase extends MultiFileTestCase { configureByFile(path); } catch (Exception e) { - ExceptionUtils.rethrow(e); + UtilsPackage.rethrow(e); } performTest(); } @@ -77,7 +77,7 @@ public abstract class PositionManagerTestCase extends MultiFileTestCase { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); } catch (Exception e) { - ExceptionUtils.rethrow(e); + UtilsPackage.rethrow(e); } performTest(); } @@ -107,7 +107,7 @@ public abstract class PositionManagerTestCase extends MultiFileTestCase { } } catch (NoDataException e) { - ExceptionUtils.rethrow(e); + UtilsPackage.rethrow(e); } } }); diff --git a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java b/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java index 6aeaec7ca75..d52d65a3b3a 100644 --- a/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java +++ b/idea/tests/org/jetbrains/jet/plugin/filters/JetExceptionFilterTest.java @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.jet.lang.resolve.java.PackageClassUtils; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.plugin.PluginTestCaseBase; -import org.jetbrains.jet.utils.ExceptionUtils; +import org.jetbrains.jet.utils.UtilsPackage; import java.io.File; @@ -61,7 +61,7 @@ public class JetExceptionFilterTest extends MultiFileTestCase { PsiDocumentManager.getInstance(myProject).commitAllDocuments(); } catch (Exception e) { - ExceptionUtils.rethrow(e); + UtilsPackage.rethrow(e); } } diff --git a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java index 9448c167eb1..51a993382b3 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/rhino/RhinoUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.jetbrains.jet.utils.ExceptionUtils.rethrow; +import static org.jetbrains.jet.utils.UtilsPackage.rethrow; import static org.jetbrains.k2js.test.BasicTest.pathToTestFilesRoot; public final class RhinoUtils {