From 585a5a02060252c59ea7c112359a9187147c0b0d Mon Sep 17 00:00:00 2001 From: stsypanov Date: Mon, 11 Mar 2019 16:29:53 +0700 Subject: [PATCH] Add missing break statement (see IDEA-208467) PR #1077 --- .../src/com/intellij/analysis/JavaAnalysisScope.java | 1 + .../inline/InlineParameterExpressionProcessor.java | 1 + .../daemon/impl/analysis/HighlightingSettingsPerFile.java | 5 ++++- .../src/com/intellij/ide/impl/PatchProjectUtil.java | 1 + .../intellij/openapi/paths/WebReferencesAnnotatorBase.java | 1 + .../src/com/intellij/testFramework/UsefulTestCase.java | 5 ++--- python/src/com/jetbrains/python/PyParameterInfoHandler.java | 1 + .../python/refactoring/PyReplaceExpressionUtil.java | 1 + 8 files changed, 12 insertions(+), 4 deletions(-) diff --git a/java/java-analysis-impl/src/com/intellij/analysis/JavaAnalysisScope.java b/java/java-analysis-impl/src/com/intellij/analysis/JavaAnalysisScope.java index 6f5abaf14eb7..182a32b01956 100644 --- a/java/java-analysis-impl/src/com/intellij/analysis/JavaAnalysisScope.java +++ b/java/java-analysis-impl/src/com/intellij/analysis/JavaAnalysisScope.java @@ -59,6 +59,7 @@ public class JavaAnalysisScope extends AnalysisScope { for (final PsiClass aClass : classes) { if (aClass.hasModifierProperty(PsiModifier.PUBLIC)) { onlyPackLocalClasses = false; + break; } } if (onlyPackLocalClasses) { 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 1b5fb625491c..6f0379083e3c 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineParameterExpressionProcessor.java @@ -372,6 +372,7 @@ public class InlineParameterExpressionProcessor extends BaseRefactoringProcessor for (PsiParameter parameter : myMethod.getParameterList().getParameters()) { if (parameter.getType().equals(((PsiParameter)element).getType()) && parameter.getName().equals(((PsiParameter)element).getName())) { bound = true; + break; } } if (!bound) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java index 0bc370edfdb0..1ec0ff0464a8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightingSettingsPerFile.java @@ -105,7 +105,10 @@ public class HighlightingSettingsPerFile extends HighlightingLevelManager implem defaults[rootIndex] = setting; boolean toRemove = true; for (FileHighlightingSetting aDefault : defaults) { - if (aDefault != FileHighlightingSetting.NONE) toRemove = false; + if (aDefault != FileHighlightingSetting.NONE) { + toRemove = false; + break; + } } if (toRemove) { myHighlightSettings.remove(virtualFile); diff --git a/platform/lang-impl/src/com/intellij/ide/impl/PatchProjectUtil.java b/platform/lang-impl/src/com/intellij/ide/impl/PatchProjectUtil.java index 545e70dc846a..7c53a2746384 100644 --- a/platform/lang-impl/src/com/intellij/ide/impl/PatchProjectUtil.java +++ b/platform/lang-impl/src/com/intellij/ide/impl/PatchProjectUtil.java @@ -164,6 +164,7 @@ public class PatchProjectUtil { for (VirtualFile includeRoot : included) { if (VfsUtilCore.isAncestor(toExclude, includeRoot, false)) { toExcludeSibling = false; + break; } } if (toExcludeSibling) { diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java b/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java index 41e928857148..f16450b4eb5c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java +++ b/platform/lang-impl/src/com/intellij/openapi/paths/WebReferencesAnnotatorBase.java @@ -84,6 +84,7 @@ public abstract class WebReferencesAnnotatorBase extends ExternalAnnotator void assertOneOf(T value, @NotNull T... values) { - boolean found = false; for (T v : values) { if (Objects.equals(value, v)) { - found = true; + return; } } - Assert.assertTrue(value + " should be equal to one of " + Arrays.toString(values), found); + Assert.fail(value + " should be equal to one of " + Arrays.toString(values)); } public static void printThreadDump() { diff --git a/python/src/com/jetbrains/python/PyParameterInfoHandler.java b/python/src/com/jetbrains/python/PyParameterInfoHandler.java index 86ba55b1da6e..ea7082a2e3d4 100644 --- a/python/src/com/jetbrains/python/PyParameterInfoHandler.java +++ b/python/src/com/jetbrains/python/PyParameterInfoHandler.java @@ -218,6 +218,7 @@ public class PyParameterInfoHandler implements ParameterInfoHandler set : hintFlags.values()) { if (set.contains(ParameterInfoUIContextEx.Flag.HIGHLIGHT)) { canOfferNext = false; + break; } } // highlight the next parameter to be filled diff --git a/python/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java b/python/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java index 9b2853c6ef55..84a8963b9318 100644 --- a/python/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java +++ b/python/src/com/jetbrains/python/refactoring/PyReplaceExpressionUtil.java @@ -166,6 +166,7 @@ public class PyReplaceExpressionUtil implements PyElementTypes { for (PyExpression argument : arguments) { if (argument instanceof PyStarArgument) { hasStarArguments = true; + break; } } if (!hasStarArguments) {