Remove multi-catch

Author: nicolasstucki

src/com/google/javascript/jscomp/CheckRegExp.java

@@ -93,7 +93,9 @@ public void visit(NodeTraversal t, Node n, Node parent) {
           ? n.getLastChild().getString() : "";
       try {
         RegExpTree.parseRegExp(pattern, flags);
-      } catch (IllegalArgumentException | IndexOutOfBoundsException ex) {
+      } catch (IllegalArgumentException ex) {
+        t.report(n, MALFORMED_REGEXP, ex.getMessage());
+      } catch (IndexOutOfBoundsException ex) {
         t.report(n, MALFORMED_REGEXP, ex.getMessage());
       }
     }

src/com/google/javascript/jscomp/CompilerExecutor.java

@@ -110,7 +110,11 @@ public T call() {
         } else {
           result = future.get();
         }
-      } catch (InterruptedException | TimeoutException | ExecutionException e) {
+      } catch (InterruptedException e) {
+        throw new RuntimeException(e);
+      } catch (TimeoutException e) {
+        throw new RuntimeException(e);
+      } catch (ExecutionException e) {
         throw new RuntimeException(e);
       }
     } else {

src/com/google/javascript/jscomp/ProcessClosurePrimitives.java

@@ -1089,8 +1089,17 @@ private void processForwardDeclare(NodeTraversal t, Node n, Node parent) {
     try {
       typeDeclaration = Iterables.getOnlyElement(
           convention.identifyTypeDeclarationCall(n));
-    } catch (NullPointerException | NoSuchElementException |
-          IllegalArgumentException e) {
+    } catch (NullPointerException e) {
+      compiler.report(
+          t.makeError(n, INVALID_FORWARD_DECLARE,
+              "A single type could not identified for the goog.forwardDeclare " +
+              "statement"));
+    } catch (NoSuchElementException e) {
+      compiler.report(
+          t.makeError(n, INVALID_FORWARD_DECLARE,
+              "A single type could not identified for the goog.forwardDeclare " +
+              "statement"));
+    } catch (IllegalArgumentException e) {
       compiler.report(
           t.makeError(n, INVALID_FORWARD_DECLARE,
               "A single type could not identified for the goog.forwardDeclare " +

src/com/google/javascript/jscomp/SourceMapInput.java

@@ -48,7 +48,10 @@ public SourceMapConsumerV3 getSourceMap() {
           parsedSourceMap = new SourceMapConsumerV3();
           try {
             parsedSourceMap.parse(sourceFile.getCode());
-          } catch (IOException | SourceMapParseException parseFailure) {
+          } catch (IOException parseFailure) {
+            logger.log(
+                Level.WARNING, "Failed to parse sourcemap", parseFailure);
+          } catch (SourceMapParseException parseFailure) {
             logger.log(
                 Level.WARNING, "Failed to parse sourcemap", parseFailure);
           }

src/com/google/javascript/jscomp/XtbMessageBundle.java

@@ -80,7 +80,11 @@ public XtbMessageBundle(InputStream xtb, @Nullable String projectId) {
       Handler contentHandler = new Handler();
       reader.setContentHandler(contentHandler);
       reader.parse(new InputSource(xtb));
-    } catch (ParserConfigurationException | IOException | SAXException e) {
+    } catch (ParserConfigurationException e) {
+      throw new RuntimeException(e);
+    } catch (IOException e) {
+      throw new RuntimeException(e);
+    } catch (SAXException e) {
       throw new RuntimeException(e);
     }
   }

src/com/google/javascript/jscomp/deps/TranspilingClosureBundler.java

@@ -132,7 +132,16 @@ public String call() {
               return compiler.toSource();
             }
           });
-    } catch (ExecutionException | UncheckedExecutionException e) {
+    } catch (ExecutionException e) {
+      // IllegalStateExceptions thrown from the callable above will end up here as
+      // UncheckedExecutionExceptions, per the contract of Cache#get. Throw the underlying
+      // IllegalStateException so that the compiler error message is at the top of the stack trace.
+      if (e.getCause() instanceof IllegalStateException) {
+        throw (IllegalStateException) e.getCause();
+      } else {
+        throw Throwables.propagate(e);
+      }
+    } catch (UncheckedExecutionException e) {
       // IllegalStateExceptions thrown from the callable above will end up here as
       // UncheckedExecutionExceptions, per the contract of Cache#get. Throw the underlying
       // IllegalStateException so that the compiler error message is at the top of the stack trace.

src/com/google/javascript/jscomp/parsing/parser/Scanner.java

@@ -754,7 +754,9 @@ private String processUnicodeEscapes(String value) {
         }
         value = value.substring(0, escapeStart) + ch +
             value.substring(escapeEnd);
-      } catch (NumberFormatException|StringIndexOutOfBoundsException e) {
+      } catch (NumberFormatException e) {
+        return null;
+      } catch (StringIndexOutOfBoundsException e) {
         return null;
       }
     }