diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java index acb1b2001bf0..976fa04f9a37 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/WindowsJavaFinder.java @@ -38,7 +38,7 @@ class WindowsJavaFinder extends JavaHomeFinder { File parentFile = javasFolder.getParentFile(); File root = parentFile != null ? parentFile.getParentFile() : null; String name = parentFile != null ? parentFile.getName() : ""; - if (name.contains("Program Files") && root != null) { + if (root != null && name.contains("Program Files")) { String x86Suffix = " (x86)"; boolean x86 = name.endsWith(x86Suffix) && name.length() > x86Suffix.length(); File anotherJavasFolder; diff --git a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java index d3e846df1b57..030750dfbf35 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantDialog.java @@ -415,7 +415,7 @@ class IntroduceConstantDialog extends DialogWrapper { } } } - if (!visible.contains(initialVisibility) && !visible.isEmpty()) { + if (!visible.isEmpty() && !visible.contains(initialVisibility)) { return visible.get(0); } return null; diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java index bf378b12cd9b..ac6c2029ca5f 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java @@ -69,7 +69,7 @@ public class ExpressionParser { if (left == null) return null; final IElementType tokenType = getGtTokenType(builder); - if (ASSIGNMENT_OPS.contains(tokenType) && tokenType != null) { + if (tokenType != null && ASSIGNMENT_OPS.contains(tokenType)) { final PsiBuilder.Marker assignment = left.precede(); advanceGtToken(builder, tokenType); diff --git a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java index bf72bac12290..7da299cb45a2 100644 --- a/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/controlFlow/ControlFlowUtil.java @@ -417,7 +417,7 @@ public class ControlFlowUtil { // process chain of goto's gotoOffset = promoteThroughGotoChain(flow, gotoOffset); - if (!exitPoints.contains(gotoOffset) && (gotoOffset >= end || gotoOffset < start) && gotoOffset > 0) { + if (gotoOffset > 0 && (gotoOffset >= end || gotoOffset < start) && !exitPoints.contains(gotoOffset)) { exitPoints.add(gotoOffset); } if (gotoOffset >= end || gotoOffset < start) { diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java index cf0bcd34e4ab..9d2ed801e38b 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompileScopeImpl.java @@ -77,7 +77,7 @@ public class CompileScopeImpl extends CompileScope { @Override public boolean isBuildForced(@NotNull BuildTarget target) { - return myTypesToForceBuild.contains(target.getTargetType()) && myFiles.isEmpty() && isWholeTargetAffected(target); + return myFiles.isEmpty() && myTypesToForceBuild.contains(target.getTargetType()) && isWholeTargetAffected(target); } @Override diff --git a/platform/core-impl/src/com/intellij/psi/css/MinifiedFilesUtil.java b/platform/core-impl/src/com/intellij/psi/css/MinifiedFilesUtil.java index 08414ac9c853..e5959edcc092 100644 --- a/platform/core-impl/src/com/intellij/psi/css/MinifiedFilesUtil.java +++ b/platform/core-impl/src/com/intellij/psi/css/MinifiedFilesUtil.java @@ -122,7 +122,7 @@ public class MinifiedFilesUtil { if (whitespaceTokens.contains(tokenType)) { lastWhiteSpaceWasHandled = false; - if (!commentTokens.contains(lastTokenType) && tokenLength > 1) { + if (tokenLength > 1 && !commentTokens.contains(lastTokenType)) { lexer.advance(); if (lexer.getTokenType() == null) { // it was last token diff --git a/platform/lang-impl/src/com/intellij/webcore/packaging/ManageRepoDialog.java b/platform/lang-impl/src/com/intellij/webcore/packaging/ManageRepoDialog.java index f759796941ba..84ebaf751fdc 100644 --- a/platform/lang-impl/src/com/intellij/webcore/packaging/ManageRepoDialog.java +++ b/platform/lang-impl/src/com/intellij/webcore/packaging/ManageRepoDialog.java @@ -66,7 +66,7 @@ public class ManageRepoDialog extends DialogWrapper { @Override public void run(AnActionButton button) { String url = Messages.showInputDialog("Please input repository URL", "Repository URL", null); - if (!repoModel.contains(url) && !StringUtil.isEmptyOrSpaces(url)) { + if (!StringUtil.isEmptyOrSpaces(url) && !repoModel.contains(url)) { repoModel.addElement(url); controller.addRepository(url); } diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 16b4c54ed264..7ac140addb88 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -2867,7 +2867,7 @@ public class AbstractTreeUi { if (!canInitiateNewActivity()) return false; if (!getBuilder().isSmartExpand()) return false; - boolean smartExpand = !myNotForSmartExpand.contains(node) && canSmartExpand; + boolean smartExpand = canSmartExpand && !myNotForSmartExpand.contains(node); return smartExpand && validateAutoExpand(true, getElementFor(node)); } diff --git a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java index 08f1bc8321a3..38d2c2a5ea48 100644 --- a/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java +++ b/platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java @@ -221,7 +221,7 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI { if (scrollpane != null) { Point loc = ((MouseEvent)event).getLocationOnScreen(); SwingUtilities.convertPointFromScreen(loc, scrollpane); - if (scrollpane.contains(loc) && !myMacScrollbarHidden && myMacScrollbarFadeLevel == 0) { + if (!myMacScrollbarHidden && myMacScrollbarFadeLevel == 0 && scrollpane.contains(loc)) { startMacScrollbarFadeout(); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java index 23567ef998a6..65f7da4e1eb4 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java @@ -180,7 +180,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark myLastVisualLine = visualLine; Rectangle area = myEditor.getScrollingModel().getVisibleArea(); int visualY = myEditor.getLineHeight() * visualLine; - boolean isVisible = area.contains(area.x, visualY) && myWheelAccumulator == 0; + boolean isVisible = myWheelAccumulator == 0 && area.contains(area.x, visualY); if (UIUtil.uiParents(myEditor.getComponent(), false).filter(EditorWindowHolder.class).isEmpty() || isVisible || !UISettings.getInstance().getShowEditorToolTip()) { final Set highlighters = new THashSet<>(); diff --git a/platform/util/src/com/intellij/util/ExceptionUtil.java b/platform/util/src/com/intellij/util/ExceptionUtil.java index 5b18a2a4bf4c..9a21d4a08fc4 100644 --- a/platform/util/src/com/intellij/util/ExceptionUtil.java +++ b/platform/util/src/com/intellij/util/ExceptionUtil.java @@ -120,7 +120,7 @@ public class ExceptionUtil { String exceptionPattern = "Exception: "; String errorPattern = "Error: "; - while ((result == null || result.contains(exceptionPattern) || result.contains(errorPattern)) && e.getCause() != null) { + while (e.getCause() != null && (result == null || result.contains(exceptionPattern) || result.contains(errorPattern))) { e = e.getCause(); result = e.getMessage(); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java index b125c172e6c3..d66ee14605c8 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java @@ -57,7 +57,7 @@ public class VcsRootErrorsFinder { continue; } String vcsPath = virtualFileFromRoot.getPath(); - if (!mappedPaths.contains(vcsPath) && root.getVcs() != null) { + if (root.getVcs() != null && !mappedPaths.contains(vcsPath)) { errors.add(new VcsRootErrorImpl(VcsRootError.Type.UNREGISTERED_ROOT, vcsPath, root.getVcs().getName())); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/IndexSpeedSearch.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/IndexSpeedSearch.java index 5a334a4cf6a8..66ecf5eb1276 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/IndexSpeedSearch.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/table/IndexSpeedSearch.java @@ -55,7 +55,7 @@ public class IndexSpeedSearch extends VcsLogSpeedSearch { if (newValue != null && dataGetter != null) { String oldValue = (String)evt.getOldValue(); Collection usersToExamine = myUserRegistry.getUsers(); - if (oldValue != null && newValue.contains(oldValue) && myMatchedUsers != null) { + if (oldValue != null && myMatchedUsers != null && newValue.contains(oldValue)) { if (myMatchedUsers.isEmpty()) return; usersToExamine = myMatchedUsers; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java index 6bd5ae4513b4..63d1cc83614f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/inline/GroovyInlineMethodUtil.java @@ -525,7 +525,7 @@ public class GroovyInlineMethodUtil { GrParameter[] parameters = method.getParameters(); for (GrParameter parameter : parameters) { GrExpression initializer = parameter.getInitializerGroovy(); - if (nameFilter.contains(parameter.getName()) && initializer != null) { + if (initializer != null && nameFilter.contains(parameter.getName())) { replaceAllOccurrencesWithExpression(method, call, initializer, parameter); } } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java index 6f50c6163545..143dbca780b3 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java @@ -216,14 +216,14 @@ public class DeadCodeHelper { for (int i = 0; i < node.getPreds().size(); i++) { BasicBlock pred = node.getPreds().get(i); - if (!marked.contains(pred) && pred != dom) { + if (pred != dom && !marked.contains(pred)) { lstNodes.add(pred); } } for (int i = 0; i < node.getPredExceptions().size(); i++) { BasicBlock pred = node.getPredExceptions().get(i); - if (!marked.contains(pred) && pred != dom) { + if (pred != dom && !marked.contains(pred)) { lstNodes.add(pred); } } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java index 50b76a768b7e..8cfcdf722b3f 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java @@ -4,7 +4,10 @@ package org.jetbrains.java.decompiler.modules.decompiler; import org.jetbrains.java.decompiler.modules.decompiler.exps.Exprent; import org.jetbrains.java.decompiler.modules.decompiler.stats.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; public class DecHelper { @@ -145,7 +148,7 @@ public class DecHelper { if (head == statd) { return false; } - if (!setDest.contains(statd) && post != statd) { + if (post != statd && !setDest.contains(statd)) { if (post != null) { return false; } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java index 3e213da801cb..d0877834632f 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java @@ -1,7 +1,10 @@ // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package org.jetbrains.java.decompiler.modules.decompiler; -import org.jetbrains.java.decompiler.code.*; +import org.jetbrains.java.decompiler.code.CodeConstants; +import org.jetbrains.java.decompiler.code.Instruction; +import org.jetbrains.java.decompiler.code.InstructionSequence; +import org.jetbrains.java.decompiler.code.SimpleInstructionSequence; import org.jetbrains.java.decompiler.code.cfg.BasicBlock; import org.jetbrains.java.decompiler.code.cfg.ControlFlowGraph; import org.jetbrains.java.decompiler.code.cfg.ExceptionRangeCFG; @@ -321,7 +324,7 @@ public class FinallyProcessor { for (BasicBlock dest : lstSucc) { // break out - if (!setCopy.contains(dest) && dest != graph.getLast()) { + if (dest != graph.getLast() && !setCopy.contains(dest)) { // disable semaphore SimpleInstructionSequence seq = new SimpleInstructionSequence(); seq.addInstruction(Instruction.create(CodeConstants.opc_bipush, false, CodeConstants.GROUP_GENERAL, bytecode_version, new int[]{0}), -1); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java index 8d50513d8d4e..6467acd7d96a 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java @@ -5,7 +5,6 @@ package org.jetbrains.java.decompiler.modules.decompiler.stats; import org.jetbrains.java.decompiler.code.CodeConstants; import org.jetbrains.java.decompiler.main.DecompilerContext; -import org.jetbrains.java.decompiler.util.TextBuffer; import org.jetbrains.java.decompiler.main.collectors.BytecodeMappingTracer; import org.jetbrains.java.decompiler.main.collectors.CounterContainer; import org.jetbrains.java.decompiler.modules.decompiler.DecHelper; @@ -13,8 +12,12 @@ import org.jetbrains.java.decompiler.modules.decompiler.ExprProcessor; import org.jetbrains.java.decompiler.modules.decompiler.StatEdge; import org.jetbrains.java.decompiler.modules.decompiler.exps.VarExprent; import org.jetbrains.java.decompiler.struct.gen.VarType; +import org.jetbrains.java.decompiler.util.TextBuffer; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; public class CatchAllStatement extends Statement { @@ -75,7 +78,7 @@ public class CatchAllStatement extends Statement { for (StatEdge edge : head.getSuccessorEdges(StatEdge.TYPE_EXCEPTION)) { Statement exc = edge.getDestination(); - if (edge.getExceptions() == null && setHandlers.contains(exc) && exc.getLastBasicType() == LASTBASICTYPE_GENERAL) { + if (edge.getExceptions() == null && exc.getLastBasicType() == LASTBASICTYPE_GENERAL && setHandlers.contains(exc)) { List lstSuccs = exc.getSuccessorEdges(STATEDGE_DIRECT_ALL); if (lstSuccs.isEmpty() || lstSuccs.get(0).getType() != StatEdge.TYPE_REGULAR) { diff --git a/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java index 38c692379a26..76fb16f1e651 100644 --- a/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java +++ b/python/python-community-configure/src/com/jetbrains/python/configuration/PyActiveSdkConfigurable.java @@ -253,7 +253,7 @@ public class PyActiveSdkConfigurable implements UnnamedConfigurable { mySdkSettingsWereModified = false; final Sdk selectedSdk = getSelectedSdk(); - if (myInitialSdkSet.contains(selectedSdk) && selectedSdk != null) { + if (selectedSdk != null && myInitialSdkSet.contains(selectedSdk)) { PythonSdkUpdater.updateOrShowError(selectedSdk, null, myProject, null); } diff --git a/python/src/com/jetbrains/python/debugger/containerview/PyNumericViewUtil.java b/python/src/com/jetbrains/python/debugger/containerview/PyNumericViewUtil.java index 4773af463132..272ae6b7c264 100644 --- a/python/src/com/jetbrains/python/debugger/containerview/PyNumericViewUtil.java +++ b/python/src/com/jetbrains/python/debugger/containerview/PyNumericViewUtil.java @@ -70,7 +70,7 @@ public class PyNumericViewUtil { if (matcher.matches()) { String real = matcher.group(1); String imag = matcher.group(2); - if (real.contains("j") && imag == null) { + if (imag == null && real.contains("j")) { return new Pair<>(new Double(0.0), Double.parseDouble(real.substring(0, real.length() - 1))); } else { diff --git a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java index 8d2eeeee8e3f..2b10c4fda644 100644 --- a/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java +++ b/python/src/com/jetbrains/python/refactoring/changeSignature/PyChangeSignatureUsageProcessor.java @@ -303,7 +303,7 @@ public class PyChangeSignatureUsageProcessor implements ChangeSignatureUsageProc final PyDocstringGenerator generator = PyDocstringGenerator.forDocStringOwner(function); for (PyParameter p : function.getParameterList().getParameters()) { final String paramName = p.getName(); - if (!names.contains(paramName) && paramName != null) { + if (paramName != null && !names.contains(paramName)) { generator.withoutParam(paramName); } }