IfStatementWithIdenticalBranches: remove trailing space

java/java-tests/testData/inspection/commonIfParts/afterAnonymous.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterArrayInitializer.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCallWithSideEffectsConditionPure.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCallWithSideEffectsConditionWithSideEfects.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if (may change semantics)" "INFORMATION"
+// "Extract common part with variables from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCommonTailVariableExtract.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCommonTailVariableExtractMultiple.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCommonVariableDefinition.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterCompleteDuplicateIfElse.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterCompleteDuplicateImplicitReturn.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterCompleteDuplicateImplicitReturnFoldedIf.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterCompleteDuplicateImplicitReturnNothing.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterCompleteDuplicateImplicitReturnNothing2.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterDifferentNames.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterDifferentNamesFinalVar.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterDifferentNamesFinalVarDifferentInitializers.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterImplicitElseReturnValue.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterInconsistentBraces.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterInconsistentBraces2.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterIncrement.java

@@ -1,4 +1,4 @@
-// "Extract common part from if (may change semantics)" "INFORMATION"
+// "Extract common part from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterPureField.java

@@ -1,4 +1,4 @@
-// "Extract common part from if (may change semantics)" "INFORMATION"
+// "Extract common part from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/afterThenElseComments.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.io.*;
 

java/java-tests/testData/inspection/commonIfParts/afterThenRemove.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/afterThenRemoveComments.java

@@ -1,4 +1,4 @@
-// "Extract variables from if " "true"
+// "Extract variables from 'if'" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeAnonymous.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeArrayInitializer.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCallWithSideEffectsConditionPure.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCallWithSideEffectsConditionWithSideEfects.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if (may change semantics)" "INFORMATION"
+// "Extract common part with variables from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCommonTailDependsOnInBranchVar.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "false"
+// "Extract common part with variables from 'if'" "false"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCommonTailVariableExtract.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCommonTailVariableExtractMultiple.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCommonVariableDefinition.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeCompleteDuplicateIfElse.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeCompleteDuplicateImplicitReturn.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeCompleteDuplicateImplicitReturnFoldedIf.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeCompleteDuplicateImplicitReturnNothing.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeCompleteDuplicateImplicitReturnNothing2.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentAnnotations.java

@@ -1,4 +1,4 @@
-// "Fix all 'Common parts of if statement branches can be extracted' problems in file" "false"
+// "Fix all 'Common parts of 'if' statement branches can be extracted' problems in file" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentNames.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentNamesExistingName.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "false"
+// "Extract common part removing branch" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentNamesFinalAndNonFinalVar.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "false"
+// "Extract common part removing branch" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentNamesFinalVar.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeDifferentNamesFinalVarDifferentInitializers.java

@@ -1,4 +1,4 @@
-// "Extract common part with variables from if " "true"
+// "Extract common part with variables from 'if'" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeImplicitElseReturn.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "false"
+// "Collapse 'if' statement" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeImplicitElseReturnLoop.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "false"
+// "Collapse 'if' statement" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeImplicitElseReturnValue.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeImplicitElseSideEffectsPreserved.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "false"
+// "Collapse 'if' statement" "false"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeInconsistentBraces.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeInconsistentBraces2.java

@@ -1,4 +1,4 @@
-// "Collapse if statement " "true"
+// "Collapse 'if' statement" "true"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeIncrement.java

@@ -1,4 +1,4 @@
-// "Extract common part from if (may change semantics)" "INFORMATION"
+// "Extract common part from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforePureField.java

@@ -1,4 +1,4 @@
-// "Extract common part from if (may change semantics)" "INFORMATION"
+// "Extract common part from 'if' (may change semantics)" "INFORMATION"
 
 import java.util.List;
 import java.util.Map;

java/java-tests/testData/inspection/commonIfParts/beforeSimilarStatementChain.java

@@ -1,4 +1,4 @@
-// "Extract common part from if " "false"
+// "Extract common part from 'if'" "false"
 
 public class Main {
 

java/java-tests/testData/inspection/commonIfParts/beforeSimilarStatements.java

@@ -1,4 +1,4 @@
-// "Extract common part from if " "false"
+// "Extract common part from 'if'" "false"
 
 public class Main {
   public static void main(String[] args) {

java/java-tests/testData/inspection/commonIfParts/beforeThenElseComments.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.io.*;
 

java/java-tests/testData/inspection/commonIfParts/beforeThenRemove.java

@@ -1,4 +1,4 @@
-// "Extract common part removing branch " "true"
+// "Extract common part removing branch" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeThenRemoveComments.java

@@ -1,4 +1,4 @@
-// "Extract variables from if " "true"
+// "Extract variables from 'if'" "true"
 
 import java.util.Collection;
 import java.util.List;

java/java-tests/testData/inspection/commonIfParts/beforeWithoutElse.java

@@ -1,4 +1,4 @@
-// "Common parts of if statement can be extracted" "false"
+// "Common parts of 'if' statement can be extracted" "false"
 
 import java.util.List;
 import java.util.Map;

platform/platform-resources-en/src/messages/InspectionsBundle.properties

@@ -260,11 +260,11 @@ inspection.export.error.writing.to=Error writing to {0}: {1}
 
 inspection.common.if.parts.family=Extract common parts of 'if' statement
 inspection.common.if.parts.family.else.if=Merge 'else if' statement
-inspection.common.if.parts.message.variables.only=Extract variables from 'if' {0}
-inspection.common.if.parts.message.with.variables.extract=Extract common part with variables from 'if' {0}
-inspection.common.if.parts.message.without.variables.extract=Extract common part from 'if' {0}
-inspection.common.if.parts.message.whole.branch=Extract common part removing branch {0}
-inspection.common.if.parts.message.complete.duplicate=Collapse 'if' statement {0}
+inspection.common.if.parts.message.variables.only=Extract variables from ''if''{0}
+inspection.common.if.parts.message.with.variables.extract=Extract common part with variables from ''if''{0}
+inspection.common.if.parts.message.without.variables.extract=Extract common part from ''if''{0}
+inspection.common.if.parts.message.whole.branch=Extract common part removing branch{0}
+inspection.common.if.parts.message.complete.duplicate=Collapse ''if'' statement{0}
 inspection.common.if.parts.message.complete.duplicate.side.effect=Collapse 'if' statement and extract side effect
 inspection.common.if.parts.description='if' statement with common parts
 

plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java

@@ -61,7 +61,7 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava
               if (!isOnTheFly) return;
               highlightType = ProblemHighlightType.INFORMATION;
             }
-            holder.registerProblem(result.myElementToHighlight, InspectionsBundle.message("inspection.common.if.parts.description"), highlightType, result.myFix);
+            holder.registerProblem(result.myElementToHighlight, result.myMessage, highlightType, result.myFix);
           }
         }
       }
@@ -455,7 +455,7 @@ public class IfStatementWithIdenticalBranchesInspection extends AbstractBaseJava
 
     @NotNull
     private String getMessage(boolean mayChangeSemantics) {
-      String mayChangeSemanticsText = mayChangeSemantics ? "(may change semantics)" : "";
+      String mayChangeSemanticsText = mayChangeSemantics ? " (may change semantics)" : "";
       return InspectionsBundle.message(myBundleKey, mayChangeSemanticsText);
     }
 

plugins/junit5_rt_tests/intellij.junit.v5.rt.tests.iml

@@ -47,6 +47,8 @@
           <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.1.0/junit-platform-engine-1.1.0.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.1.0/junit-platform-commons-1.1.0.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.0.0/opentest4j-1.0.0.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
@@ -55,6 +57,8 @@
           <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.1.0/junit-platform-engine-1.1.0-sources.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.1.0/junit-platform-commons-1.1.0-sources.jar!/" />
           <root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.0.0/opentest4j-1.0.0-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.12/junit-4.12-sources.jar!/" />
+          <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3-sources.jar!/" />
         </SOURCES>
       </library>
     </orderEntry>