Unnecessary semicolons removed; some other warnings fixed

java/compiler/tests/com/intellij/compiler/artifacts/PackagingElementsTestCase.java

@@ -90,7 +90,6 @@ public abstract class PackagingElementsTestCase extends ArtifactsTestCase {
       if (module != null) {
         ModuleRootModificationUtil.addDependency(module, library, scope, false);
       }
-      ;
       return library;
     });
   }

java/debugger/openapi/src/com/intellij/debugger/engine/SyntheticTypeComponentProvider.java

@@ -29,5 +29,5 @@ public interface SyntheticTypeComponentProvider {
   //override this method to prevent other providers treating type component as synthetic
   default boolean isNotSynthetic(TypeComponent typeComponent) {
     return false;
-  };
+  }
 }

java/idea-ui/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java

@@ -109,7 +109,6 @@ public class IdeaProjectModelModifier extends JavaProjectModelModifier {
           for (Module module : modules) {
             ModuleRootModificationUtil.addDependency(module, library, scope, false);
           }
-          ;
         });
       }
     }

java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java

@@ -165,7 +165,6 @@ public class DeannotateIntentionAction implements IntentionAction, LowPriorityAc
       if (annotationsManager.deannotate(listOwner, qualifiedName) && virtualFile != null && virtualFile.isInLocalFileSystem()) {
         UndoUtil.markPsiFileForUndo(file);
       }
-      ;
     });
   }
 

java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java

@@ -155,5 +155,5 @@ public class NullableStuffInspection extends NullableStuffInspectionBase {
     public boolean startInWriteAction() {
       return false;
     }
-  };
+  }
 }

java/java-impl/src/com/intellij/refactoring/introduceVariable/JavaVariableInplaceIntroducer.java

@@ -248,7 +248,6 @@ public class JavaVariableInplaceIntroducer extends AbstractJavaInplaceIntroducer
             if (variable != null) {
               finalListener.perform(myCanBeFinalCb.isSelected(), variable);
             }
-            ;
           });
         }
       });

java/java-impl/src/com/intellij/refactoring/introduceVariable/ReassignVariableUtil.java

@@ -170,7 +170,6 @@ public class ReassignVariableUtil {
       if (modifierList != null) {
         modifierList.setModifierProperty(PsiModifier.FINAL, false);
       }
-      ;
     });
     finishTemplate(editor);
   }

java/java-psi-api/src/com/intellij/codeInsight/TestFrameworks.java

@@ -63,7 +63,7 @@ public abstract class TestFrameworks {
     }
 
     for (TestFramework framework : TestFramework.EXTENSION_NAME.getExtensionList()) {
-      if (frameworks.contains(framework)) continue;;
+      if (frameworks.contains(framework)) continue;
       if (framework.findSetUpMethod(psiClass) != null || framework.findTearDownMethod(psiClass) != null) {
         frameworks.add(framework);
       }

java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java

@@ -744,7 +744,7 @@ public class ExceptionUtil {
 
     static HandlePlace fromBoolean(boolean isHandled) {
       return isHandled ? UNKNOWN : UNHANDLED;
-    };
+    }
   }
 
   @NotNull

jps/jps-builders/src/org/jetbrains/jps/builders/java/dependencyView/AnnotationsChangeTracker.java

@@ -57,7 +57,7 @@ public abstract class AnnotationsChangeTracker {
      * If present in the returned result set, the subclasses of the annotated class will be affected.
      * If returned for an annotated field/method, the subclasses of the class containing this field/method will be affected.
      */
-    SUBCLASSES;
+    SUBCLASSES
   }
 
   /**

platform/analysis-api/src/com/intellij/codeInspection/lang/RefManagerExtension.java

@@ -3,7 +3,9 @@
 package com.intellij.codeInspection.lang;
 
 import com.intellij.codeInspection.LocalInspectionTool;
-import com.intellij.codeInspection.reference.*;
+import com.intellij.codeInspection.reference.RefElement;
+import com.intellij.codeInspection.reference.RefEntity;
+import com.intellij.codeInspection.reference.RefVisitor;
 import com.intellij.lang.Language;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiElement;
@@ -24,7 +26,7 @@ public interface RefManagerExtension<T> {
   @NotNull
   default Collection<Language> getLanguages() {
     return Collections.singleton(getLanguage());
-  };
+  }
 
   @Deprecated
   @NotNull

platform/core-impl/src/com/intellij/psi/templateLanguages/TreePatcher.java

@@ -58,7 +58,7 @@ public interface TreePatcher {
                                   @NotNull TextRange rangeToRemove,
                                   @NotNull CharTable table) {
     CharSequence chars = leaf.getChars();
-    String res = rangeToRemove.replace(chars.toString(), "");;
+    String res = rangeToRemove.replace(chars.toString(), "");
     LeafElement newLeaf = ASTFactory.leaf(leaf.getElementType(), table.intern(res));
     leaf.rawInsertBeforeMe(newLeaf);
     leaf.rawRemove();

platform/editor-ui-api/src/com/intellij/openapi/editor/markup/GutterDraggableObject.java

@@ -53,7 +53,7 @@ public interface GutterDraggableObject {
    */
   Cursor getCursor(int line, int actionId);
 
-  default void remove() {};
+  default void remove() {}
 
-  static DataFlavor[] getFlavors() {return new DataFlavor[] {flavor};};
+  static DataFlavor[] getFlavors() {return new DataFlavor[] {flavor};}
 }

platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractDependencyDataService.java

@@ -29,7 +29,6 @@ import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.text.StringUtil;
-import com.intellij.util.ObjectUtils;
 import com.intellij.util.PathUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.ContainerUtilRt;
@@ -128,7 +127,7 @@ public abstract class AbstractDependencyDataService<E extends AbstractDependency
             continue;
           }
           if (getOrderEntryType().isInstance(entry)) {
-            final String moduleName = modifiableModuleModel.getActualName(entry.getOwnerModule()); ;
+            final String moduleName = modifiableModuleModel.getActualName(entry.getOwnerModule());
             //noinspection unchecked
             if (!byModuleName.get(moduleName).contains(getOrderEntryName(modelsProvider, (I)entry))) {
               //noinspection unchecked

platform/lang-api/src/com/intellij/codeInsight/editorActions/SmartBackspaceMode.java

@@ -16,5 +16,5 @@
 package com.intellij.codeInsight.editorActions;
 
 public enum SmartBackspaceMode {
-  OFF, AUTOINDENT, INDENT;
+  OFF, AUTOINDENT, INDENT
 }

platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/actions/GotoElementUnderCaretUsageBase.java

@@ -80,13 +80,13 @@ import java.util.Comparator;
   }
 
   protected enum Direction {
-    FORWARD((l, r) -> l - r),
-    BACKWARD((l, r) -> r - l);
+    FORWARD(Comparator.naturalOrder()),
+    BACKWARD(Comparator.reverseOrder());
 
     public final Comparator<Integer> ordering;
 
     Direction(Comparator<Integer> ordering) {
       this.ordering = ordering;
     }
-  };
+  }
 }

platform/platform-api/src/com/intellij/openapi/wm/StatusBarWidget.java

@@ -62,7 +62,7 @@ public interface StatusBarWidget extends Disposable {
 
     @NotNull
     @Deprecated
-    default String getMaxPossibleText() { return ""; };
+    default String getMaxPossibleText() { return ""; }
 
     float getAlignment();
   }

platform/platform-impl/src/com/intellij/ide/ApplicationActivationStateManager.java

@@ -40,13 +40,13 @@ public class ApplicationActivationStateManager {
     DEACTIVATING;
 
     public boolean isInactive () {
-      return !this.equals(ACTIVE);
+      return this != ACTIVE;
     }
 
     public boolean isActive() {
-      return this.equals(ACTIVE);
+      return this == ACTIVE;
     }
-  };
+  }
 
   private static State state = State.DEACTIVATED;
 
@@ -91,7 +91,7 @@ public class ApplicationActivationStateManager {
         @Override
         public void actionPerformed(ActionEvent evt) {
 
-          if (state.equals(State.DEACTIVATING)) {
+          if (state == State.DEACTIVATING) {
 
             state = State.DEACTIVATED;
             LOG.debug("The app is in the deactivated state");

platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java

@@ -28,7 +28,7 @@ public class StatisticsUploadAssistant {
   private static final String IDEA_SUPPRESS_REPORT_STATISTICS = "idea.suppress.statistics.report";
   public static final Object LOCK = new Object();
 
-  private StatisticsUploadAssistant(){};
+  private StatisticsUploadAssistant(){}
 
   public static boolean isShouldShowNotification() {
     return UsageStatisticsPersistenceComponent.getInstance().isShowNotification() &&

platform/platform-impl/src/com/intellij/openapi/keymap/impl/KeyState.java

@@ -21,6 +21,6 @@ public enum KeyState {
   STATE_SECOND_STROKE_IN_PROGRESS,
   STATE_PROCESSED,
   STATE_KEY_GESTURE_PROCESSOR,
-  STATE_WAIT_FOR_POSSIBLE_ALT_GR;
+  STATE_WAIT_FOR_POSSIBLE_ALT_GR
 
 }

platform/platform-impl/src/com/intellij/ui/ShowColorPickerAction.java

@@ -19,7 +19,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -54,7 +53,7 @@ public class ShowColorPickerAction extends DumbAwareAction {
   private static Window parent() {
     Window activeWindow = null;
     for (Window w : Window.getWindows()) {
-      if (w.isActive()) {activeWindow = w;};
+      if (w.isActive()) {activeWindow = w;}
     }
     return activeWindow;
   }

platform/smRunner/src/com/intellij/execution/testframework/sm/runner/SMTRunnerTreeBuilder.java

@@ -104,7 +104,7 @@ public class SMTRunnerTreeBuilder implements Disposable, AbstractTestTreeBuilder
   @NotNull
   private static TreeVisitor visitor(@NotNull AbstractTestProxy proxy) {
     return path -> {
-      BaseTestProxyNodeDescriptor descriptor = TreeUtil.getLastUserObject(BaseTestProxyNodeDescriptor.class, path);;
+      BaseTestProxyNodeDescriptor descriptor = TreeUtil.getLastUserObject(BaseTestProxyNodeDescriptor.class, path);
       assert descriptor != null;
       AbstractTestProxy currentProxy = descriptor.getElement();
       if (currentProxy == proxy) return TreeVisitor.Action.INTERRUPT;

platform/testFramework/src/com/intellij/testFramework/ExpectedHighlightingData.java

@@ -611,7 +611,7 @@ public class ExpectedHighlightingData {
     assert start != null: "textLength = " + text.length() + ", startOffset = " + startOffset;
 
     LineColumn end = StringUtil.offsetToLineColumn(text, endOffset);
-    assert end != null : "textLength = " + text.length() + ", endOffset = " + endOffset;;
+    assert end != null : "textLength = " + text.length() + ", endOffset = " + endOffset;
 
     if (start.line == end.line) {
       return String.format("(%d:%d/%d)", start.line + 1, start.column + 1, end.column - start.column);

platform/testFramework/src/com/intellij/testFramework/PsiTestUtil.java

@@ -407,7 +407,6 @@ public class PsiTestUtil {
         model.dispose();
         throw t;
       }
-      ;
       return dep;
     });
   }

platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsBackgroundableActions.java

@@ -15,12 +15,10 @@
  */
 package com.intellij.openapi.vcs.impl;
 
-import com.intellij.openapi.vfs.VirtualFile;
-
 public enum VcsBackgroundableActions {
   ANNOTATE,
   COMPARE_WITH, // common for compare with (selected/latest/same) revision
   CREATE_HISTORY_SESSION,
   HISTORY_FOR_SELECTION,
-  COMMITTED_CHANGES_DETAILS;
+  COMMITTED_CHANGES_DETAILS
 }

plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit5AssertionsConverterInspection.java

@@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
 
 public class JUnit5AssertionsConverterInspection extends BaseInspection {
-  private String myFrameworkName = "JUnit5";;
+  private String myFrameworkName = "JUnit5";
 
   JUnit5AssertionsConverterInspection(String frameworkName) {
     myFrameworkName = frameworkName;
@@ -75,7 +75,7 @@ public class JUnit5AssertionsConverterInspection extends BaseInspection {
     @Override
     public void visitMethodCallExpression(PsiMethodCallExpression expression) {
       doCheck(expression,
-              () -> AssertHint.create(expression, methodName -> AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT.get(methodName), false),
+              () -> AssertHint.create(expression, AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT::get, false),
               psiMethod -> {
                 final PsiClass containingClass = psiMethod.getContainingClass();
                 if (containingClass == null) {
@@ -92,7 +92,7 @@ public class JUnit5AssertionsConverterInspection extends BaseInspection {
     @Override
     public void visitMethodReferenceExpression(PsiMethodReferenceExpression expression) {
       doCheck(expression, 
-              () -> AssertHint.create(expression, methodName -> AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT.get(methodName), false),
+              () -> AssertHint.create(expression, AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT::get, false),
               psiMethod -> {
                 final PsiClass containingClass = psiMethod.getContainingClass();
                 if (containingClass == null) {
@@ -181,7 +181,7 @@ public class JUnit5AssertionsConverterInspection extends BaseInspection {
       PsiElement element = descriptor.getPsiElement();
       if (element instanceof PsiMethodReferenceExpression) {
         AssertHint assertHint =
-          AssertHint.create((PsiMethodReferenceExpression)element, methodName -> AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT.get(methodName), false);
+          AssertHint.create((PsiMethodReferenceExpression)element, AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT::get, false);
         if (assertHint != null) {
           replaceQualifier(project, assertHint.getMethod().getName(), (PsiReferenceExpression)element);
         }
@@ -194,8 +194,7 @@ public class JUnit5AssertionsConverterInspection extends BaseInspection {
       }
 
       AssertHint assertHint =
-        AssertHint.create(methodCallExpression, methodName -> AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT
-          .get(methodName), false);
+        AssertHint.create(methodCallExpression, AssertHint.JUnitCommonAssertNames.ASSERT_METHOD_2_PARAMETER_COUNT::get, false);
       if (assertHint == null) {
         return;
       }

plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/performance/ManualArrayToCollectionCopyFixTest.java

@@ -16,7 +16,6 @@
 package com.siyeh.ig.fixes.performance;
 
 import com.intellij.codeInspection.CommonQuickFixBundle;
-import com.siyeh.InspectionGadgetsBundle;
 import com.siyeh.ig.IGQuickFixesTestCase;
 import com.siyeh.ig.performance.ManualArrayToCollectionCopyInspection;
 
@@ -30,7 +29,7 @@ public class ManualArrayToCollectionCopyFixTest extends IGQuickFixesTestCase {
     super.setUp();
     myFixture.enableInspections(new ManualArrayToCollectionCopyInspection());
     myRelativePath = "performance/replace_with_add_all";
-    myDefaultHint = CommonQuickFixBundle.message("fix.replace.with.x", "Collections.addAll(...,...)");;
+    myDefaultHint = CommonQuickFixBundle.message("fix.replace.with.x", "Collections.addAll(...,...)");
   }
 
   public void testSimpleFor() { doTest(); }

plugins/ant/src/com/intellij/lang/ant/config/execution/AntFinishedExecutionEvent.java

@@ -22,7 +22,7 @@ public class AntFinishedExecutionEvent extends AntExecutionEvent{
   private final int myErrorCount;
 
   public enum Status {
-    SUCCESS, CANCELED, FAILURE;
+    SUCCESS, CANCELED, FAILURE
   }
 
   AntFinishedExecutionEvent(AntBuildFile buildFile, Status status, int errorCount) {

plugins/git4idea/src/git4idea/push/GitPushRepoResult.java

@@ -44,7 +44,7 @@ public class GitPushRepoResult {
     REJECTED_NO_FF,
     REJECTED_OTHER,
     ERROR,
-    NOT_PUSHED;
+    NOT_PUSHED
   }
 
   static Comparator<Type> TYPE_COMPARATOR = (o1, o2) -> o1.ordinal() - o2.ordinal();

plugins/git4idea/src/git4idea/remote/GitDefineRemoteDialog.java

@@ -73,7 +73,7 @@ public class GitDefineRemoteDialog extends DialogWrapper {
   @Override
   protected JComponent createCenterPanel() {
     return null;
-  };
+  }
 
   @Nullable
   @Override

plugins/gradle/java/src/codeInsight/actions/AddGradleDslPluginActionHandler.java

@@ -88,7 +88,6 @@ class AddGradleDslPluginActionHandler implements CodeInsightActionHandler {
                           if (document != null) {
                             documentManager.commitDocument(document);
                           }
-                          ;
                         });
     };
 

plugins/gradle/java/src/execution/test/runner/events/TestEventXmlXPathView.java

@@ -53,7 +53,7 @@ public class TestEventXmlXPathView implements TestEventXmlView {
     }
     catch (Exception ex) {
       throw new XmlParserException(ex);
-    };
+    }
   }
 
   @NotNull

plugins/gradle/java/src/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java

@@ -66,7 +66,7 @@ class AddGradleDslDependencyActionHandler implements CodeInsightActionHandler {
       List<GrMethodCall> closableBlocks = PsiTreeUtil.getChildrenOfTypeAsList(file, GrMethodCall.class);
       GrCall dependenciesBlock = ContainerUtil.find(closableBlocks, call -> {
         GrExpression expression = call.getInvokedExpression();
-        return expression != null && "dependencies".equals(expression.getText());
+        return "dependencies".equals(expression.getText());
       });
 
       if (dependenciesBlock == null) {
@@ -86,7 +86,6 @@ class AddGradleDslDependencyActionHandler implements CodeInsightActionHandler {
           }
         }
       }
-      ;
     });
   }
 

plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/signatures/GrClosureSignatureUtil.java

@@ -323,7 +323,7 @@ public class GrClosureSignatureUtil {
   }
 
   public enum ApplicabilityResult {
-    applicable, inapplicable, canBeApplicable, ambiguous;
+    applicable, inapplicable, canBeApplicable, ambiguous
   }
 
   @Nullable

plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/field/GrInplaceFieldIntroducer.java

@@ -16,7 +16,6 @@
 package org.jetbrains.plugins.groovy.refactoring.introduce.field;
 
 import com.intellij.codeInsight.TestFrameworks;
-import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -316,7 +315,6 @@ public class GrInplaceFieldIntroducer extends GrAbstractInplaceIntroducer<GrIntr
             if (variable != null) {
               finalListener.perform(myDeclareFinalCB.isSelected(), variable);
             }
-            ;
           });
         }
       });

plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java

@@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.refactoring.introduce.variable;
 
 import com.intellij.codeInsight.template.TemplateBuilderImpl;
 import com.intellij.openapi.actionSystem.Shortcut;
-import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.keymap.Keymap;
 import com.intellij.openapi.keymap.KeymapManager;
@@ -96,7 +95,6 @@ public abstract class GrInplaceVariableIntroducer extends GrAbstractInplaceIntro
           if (variable != null) {
             finalListener.perform(myCanBeFinalCb.isSelected(), variable);
           }
-          ;
         });
       }
     });

plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxInjectPageLanguageIntention.java

@@ -117,7 +117,6 @@ public class JavaFxInjectPageLanguageIntention extends PsiElementBaseIntentionAc
           }
         }
       }
-      ;
     });
   }
 

plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/intentions/AddMavenDependencyQuickFix.java

@@ -100,7 +100,6 @@ public class AddMavenDependencyQuickFix implements IntentionAction, LowPriorityA
           dependency.getScope().setStringValue("test");
         }
       }
-      ;
     });
   }
 

plugins/testng/testSources/com/theoryinpractice/testng/inspection/BaseTestNGInspectionsTest.java

@@ -66,5 +66,5 @@ public abstract class BaseTestNGInspectionsTest extends JavaCodeInsightFixtureTe
 
   protected String getActionName() {
     return getEnabledTool().getDisplayName();
-  };
+  }
 }

xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/RearrangeAttributesIntention.java

@@ -81,7 +81,7 @@ public class RearrangeAttributesIntention implements IntentionAction {
     if (parent != null) return parent;
 
     element = file.findElementAt(offset - 1);
-    parent = PsiTreeUtil.getParentOfType(element, XmlTag.class);;
+    parent = PsiTreeUtil.getParentOfType(element, XmlTag.class);
     if (parent != null) return parent;
     return null;
   }

xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java

@@ -59,8 +59,8 @@ import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
-import java.util.*;
 import java.util.List;
+import java.util.*;
 
 /**
  * @author Dmitry Avdeev
@@ -101,7 +101,6 @@ public class GenerateXmlTagAction extends SimpleCodeInsightAction {
           if (newTag != null) {
             generateTag(newTag, editor);
           }
-          ;
         });
       if (ApplicationManager.getApplication().isUnitTestMode()) {
         XmlElementDescriptor descriptor = ContainerUtil.find(descriptors,