From b20cee57a132d57ffe6557e4b480ea8283b67811 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 30 Sep 2016 16:38:20 +0700 Subject: [PATCH] ExceptionUtil.getThrownCheckedExceptions: accepts varargs now --- .../intellij/codeInspection/OptionalIsPresentInspection.java | 2 +- .../java18api/Java8CollectionsApiInspection.java | 2 +- .../streamMigration/StreamApiMigrationInspection.java | 2 +- .../intellij/codeInspection/util/LambdaGenerationUtil.java | 2 +- .../inline/InlineParameterExpressionProcessor.java | 4 ++-- .../refactoring/introduceField/IntroduceConstantHandler.java | 3 +-- .../src/com/intellij/codeInsight/ExceptionUtil.java | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java index 5f9e509785f0..73d43330d3b8 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/OptionalIsPresentInspection.java @@ -140,7 +140,7 @@ public class OptionalIsPresentInspection extends BaseJavaBatchLocalInspectionToo @Contract("null, _ -> false") static boolean isOptionalLambdaCandidate(PsiExpression lambdaCandidate, PsiVariable optionalVariable) { if(lambdaCandidate == null) return false; - if(!ExceptionUtil.getThrownCheckedExceptions(new PsiElement[] {lambdaCandidate}).isEmpty()) return false; + if(!ExceptionUtil.getThrownCheckedExceptions(lambdaCandidate).isEmpty()) return false; return PsiTreeUtil.processElements(lambdaCandidate, e -> { if (!(e instanceof PsiReferenceExpression)) return true; PsiElement element = ((PsiReferenceExpression)e).resolve(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java index c200adb7bd91..74720065ea1e 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java18api/Java8CollectionsApiInspection.java @@ -242,7 +242,7 @@ public class Java8CollectionsApiInspection extends BaseJavaBatchLocalInspectionT !equivalence.expressionsAreEquivalent(value, putArguments[1])) { return; } - if(!ExceptionUtil.getThrownCheckedExceptions(new PsiElement[] {lambdaCandidate}).isEmpty()) return; + if(!ExceptionUtil.getThrownCheckedExceptions(lambdaCandidate).isEmpty()) return; if(!PsiTreeUtil.processElements(lambdaCandidate, e -> { if(!(e instanceof PsiReferenceExpression)) return true; PsiElement element = ((PsiReferenceExpression)e).resolve(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java index 50a64b359ceb..d95117834659 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/streamMigration/StreamApiMigrationInspection.java @@ -492,7 +492,7 @@ public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTo isArray = false; } else return; } - if (!ExceptionUtil.getThrownCheckedExceptions(new PsiElement[]{body}).isEmpty()) return; + if (!ExceptionUtil.getThrownCheckedExceptions(body).isEmpty()) return; TerminalBlock tb = TerminalBlock.from(statement.getIterationParameter(), body); List operations = tb.extractOperations(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/util/LambdaGenerationUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/util/LambdaGenerationUtil.java index 2456ef3b0f80..58987b76475b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/util/LambdaGenerationUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/util/LambdaGenerationUtil.java @@ -44,7 +44,7 @@ public class LambdaGenerationUtil { @Contract("null -> false") public static boolean canBeUncheckedLambda(PsiExpression lambdaCandidate) { if(lambdaCandidate == null) return false; - if(!ExceptionUtil.getThrownCheckedExceptions(new PsiElement[] {lambdaCandidate}).isEmpty()) return false; + if(!ExceptionUtil.getThrownCheckedExceptions(lambdaCandidate).isEmpty()) return false; return PsiTreeUtil.processElements(lambdaCandidate, e -> { if (!(e instanceof PsiReferenceExpression)) return true; PsiElement element = ((PsiReferenceExpression)e).resolve(); diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java index aae71344bdda..2b878a92ff76 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 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. @@ -246,7 +246,7 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor @Override protected void performRefactoring(@NotNull UsageInfo[] usages) { - final List thrownExceptions = ExceptionUtil.getThrownCheckedExceptions(new PsiElement[]{myInitializer}); + final List thrownExceptions = ExceptionUtil.getThrownCheckedExceptions(myInitializer); final Set varsUsedInInitializer = new HashSet<>(); final Set paramRefsToInline = new HashSet<>(); final Map replacements = new HashMap<>(); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java index a6712418ca17..4b5f5e63fc5d 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java @@ -21,7 +21,6 @@ import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.colors.EditorColors; import com.intellij.openapi.editor.colors.EditorColorsManager; -import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; @@ -254,7 +253,7 @@ public class IntroduceConstantHandler extends BaseExpressionToFieldHandler { public void visitCallExpression(PsiCallExpression callExpression) { super.visitCallExpression(callExpression); if (!myCheckThrowables) return; - final List checkedExceptions = ExceptionUtil.getThrownCheckedExceptions(new PsiElement[]{callExpression}); + final List checkedExceptions = ExceptionUtil.getThrownCheckedExceptions(callExpression); if (!checkedExceptions.isEmpty()) { myElementReference = callExpression; } diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java index fc9083936d24..9e49fa9455b4 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java @@ -58,7 +58,7 @@ public class ExceptionUtil { } @NotNull - public static List getThrownCheckedExceptions(@NotNull PsiElement[] elements) { + public static List getThrownCheckedExceptions(@NotNull PsiElement... elements) { List exceptions = getThrownExceptions(elements); if (exceptions.isEmpty()) return exceptions; exceptions = filterOutUncheckedExceptions(exceptions);