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

Use multi-catch when possible

Browse Source
This commit is contained in:
Alexander Udalov
2017-04-01 00:33:19 +03:00
parent 34f0576135
commit 6aa0f7bb65
14 changed files with 16 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/android-tests/src/org/jetbrains/kotlin/android/tests/run/RunUtils.java
+1 -4
View File
@@ -111,10 +111,7 @@ public class RunUtils {
}
close(handler.getProcessInput());
}
catch (ExecutionException e) {
return new RunResult(false, getStackTrace(e));
}
catch (IOException e) {
catch (ExecutionException | IOException e) {
return new RunResult(false, getStackTrace(e));
}
compiler/backend/src/org/jetbrains/kotlin/codegen/ExpressionCodegen.java
+1 -4
View File
@@ -313,10 +313,7 @@ public class ExpressionCodegen extends KtVisitor<StackValue, StackValue> impleme
return genNotNullAssertions(state, stackValue, runtimeAssertionInfo);
}
catch (ProcessCanceledException e) {
throw e;
}
catch (CompilationException e) {
catch (ProcessCanceledException | CompilationException e) {
throw e;
}
catch (Throwable error) {
compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+1 -4
View File
@@ -381,10 +381,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
generateSecondaryConstructor(secondaryConstructor);
}
}
catch (CompilationException e) {
throw e;
}
catch (ProcessCanceledException e) {
catch (CompilationException | ProcessCanceledException e) {
throw e;
}
catch (RuntimeException e) {
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
+2 -8
View File
@@ -193,10 +193,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
try {
functionCodegen.gen((KtNamedFunction) declaration);
}
catch (ProcessCanceledException e) {
throw e;
}
catch (CompilationException e) {
catch (ProcessCanceledException | CompilationException e) {
throw e;
}
catch (Exception e) {
@@ -207,10 +204,7 @@ public abstract class MemberCodegen<T extends KtPureElement/* TODO: & KtDeclarat
try {
propertyCodegen.gen((KtProperty) declaration);
}
catch (ProcessCanceledException e) {
throw e;
}
catch (CompilationException e) {
catch (ProcessCanceledException | CompilationException e) {
throw e;
}
catch (Exception e) {
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java
+1 -4
View File
@@ -99,15 +99,12 @@ public class ModuleXmlParser {
});
return new ModuleScriptData(modules);
}
catch (ParserConfigurationException e) {
catch (ParserConfigurationException | IOException e) {
MessageCollectorUtil.reportException(messageCollector, e);
}
catch (SAXException e) {
messageCollector.report(ERROR, OutputMessageUtil.renderException(e), NO_LOCATION);
}
catch (IOException e) {
MessageCollectorUtil.reportException(messageCollector, e);
}
return ModuleScriptData.EMPTY;
}
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/inference/ConstraintsUtil.java
+1 -4
View File
@@ -145,10 +145,7 @@ public class ConstraintsUtil {
sb.append("\n");
}
}
catch (IllegalAccessException e) {
sb.append(e.getMessage());
}
catch (InvocationTargetException e) {
catch (IllegalAccessException | InvocationTargetException e) {
sb.append(e.getMessage());
}
}
compiler/frontend/src/org/jetbrains/kotlin/types/expressions/ExpressionTypingVisitorDispatcher.java
+1 -4
View File
@@ -216,10 +216,7 @@ public abstract class ExpressionTypingVisitorDispatcher extends KtVisitor<Kotlin
}
return result;
}
catch (ProcessCanceledException e) {
throw e;
}
catch (KotlinFrontEndException e) {
catch (ProcessCanceledException | KotlinFrontEndException e) {
throw e;
}
catch (Throwable e) {
compiler/preloader/instrumentation/src/org/jetbrains/kotlin/preloading/instrumentation/InterceptionInstrumenter.java
+1 -4
View File
@@ -227,10 +227,7 @@ public class InterceptionInstrumenter {
method.invoke(interceptor, out);
}
}
catch (IllegalAccessException e) {
throw new IllegalStateException(e);
}
catch (InvocationTargetException e) {
catch (IllegalAccessException | InvocationTargetException e) {
throw new IllegalStateException(e);
}
out.println(">>>");
compiler/tests-common/org/jetbrains/kotlin/codegen/flags/AbstractWriteFlagsTest.java
+1 -4
View File
@@ -184,10 +184,7 @@ public abstract class AbstractWriteFlagsTest extends CodegenTestCase {
Field field = klass.getDeclaredField(flag);
expectedAccess |= field.getInt(klass);
}
catch (NoSuchFieldException e) {
throw new IllegalArgumentException("Cannot find " + flag + " field in Opcodes class", e);
}
catch (IllegalAccessException e) {
catch (NoSuchFieldException | IllegalAccessException e) {
throw new IllegalArgumentException("Cannot find " + flag + " field in Opcodes class", e);
}
}
compiler/tests/org/jetbrains/kotlin/asJava/KotlinLightClassCoherenceTest.java
+2 -9
View File
@@ -87,20 +87,13 @@ public class KotlinLightClassCoherenceTest extends KotlinAsJavaTestBase {
}
public void assertPropertyCoherent(KtLightClass lightClass, String methodName) {
Class<?> reflect = PsiClass.class;
try {
Method method = reflect.getMethod(methodName);
Method method = PsiClass.class.getMethod(methodName);
Object lightResult = method.invoke(lightClass);
Object delegateResult = method.invoke(lightClass.getClsDelegate());
assertEquals("Result of method " + methodName + "() differs in light class and its delegate", delegateResult, lightResult);
}
catch (NoSuchMethodException e) {
throw new AssertionError(e);
}
catch (InvocationTargetException e) {
throw new AssertionError(e);
}
catch (IllegalAccessException e) {
catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
throw new AssertionError(e);
}
}
compiler/tests/org/jetbrains/kotlin/codegen/StdlibTest.java
+1 -4
View File
@@ -142,12 +142,9 @@ public class StdlibTest extends KotlinTestWithEnvironment {
return TestCase.class.isAssignableFrom(aClass) ? new TestSuite(aClass) :
TestRunnerUtil.isJUnit4TestClass(aClass) ? new JUnit4TestAdapter(aClass) : null;
}
catch (NoSuchMethodException e) {
catch (NoSuchMethodException | ClassNotFoundException e) {
// Ignore test classes we can't instantiate
return null;
}
catch (ClassNotFoundException e) {
return null;
}
}
}
idea/tests/org/jetbrains/kotlin/idea/debugger/KotlinDebuggerTestCase.java
+1 -7
View File
@@ -165,13 +165,7 @@ public abstract class KotlinDebuggerTestCase extends DescriptorTestCase {
ourOutputRootField.set(null, LOCAL_CACHE_APP_DIR);
}
catch (NoSuchFieldException e) {
throw ExceptionUtilsKt.rethrow(e);
}
catch (IllegalAccessException e) {
throw ExceptionUtilsKt.rethrow(e);
}
catch (IOException e) {
catch (NoSuchFieldException | IOException | IllegalAccessException e) {
throw ExceptionUtilsKt.rethrow(e);
}
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/PackageDeclarationTranslator.java
+1 -4
View File
@@ -54,10 +54,7 @@ public final class PackageDeclarationTranslator extends AbstractTranslator {
catch (TranslationRuntimeException e) {
throw e;
}
catch (RuntimeException e) {
throw new TranslationRuntimeException(file, e);
}
catch (AssertionError e) {
catch (RuntimeException | AssertionError e) {
throw new TranslationRuntimeException(file, e);
}
}
js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java
+1 -4
View File
@@ -168,10 +168,7 @@ public final class Translation {
catch (TranslationRuntimeException e) {
throw e;
}
catch (RuntimeException e) {
throw new TranslationRuntimeException(expression, e);
}
catch (AssertionError e) {
catch (RuntimeException | AssertionError e) {
throw new TranslationRuntimeException(expression, e);
}
}