cleanup

GitOrigin-RevId: 76376d6a8618674cb5129b16fe830cd428efe6d4

diff --git a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
index ddb17a834e20b50f17f9e0cba03ea8f9a2d5fa47..896c0022bd4b2bca25660d18958602086ab5f9c5 100644 (file)
--- a/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
+++ b/platform/core-impl/src/com/intellij/ide/plugins/IdeaPluginDescriptorImpl.java
@@ -322,18 +322,20 @@ public final class IdeaPluginDescriptorImpl implements IdeaPluginDescriptor {
 
   private void readModule(Element child) {
     String moduleName = child.getAttributeValue("value");
-    if (moduleName != null) {
-      if (myModules == null) {
-        myModules = Collections.singletonList(PluginId.getId(moduleName));
-      }
-      else {
-        if (myModules.size() == 1) {
-          List<PluginId> singleton = myModules;
-          myModules = new ArrayList<>(4);
-          myModules.addAll(singleton);
-        }
-        myModules.add(PluginId.getId(moduleName));
+    if (moduleName == null) {
+      return;
+    }
+
+    if (myModules == null) {
+      myModules = Collections.singletonList(PluginId.getId(moduleName));
+    }
+    else {
+      if (myModules.size() == 1) {
+        List<PluginId> singleton = myModules;
+        myModules = new ArrayList<>(4);
+        myModules.addAll(singleton);
       }
+      myModules.add(PluginId.getId(moduleName));
     }
   }
 

diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
index a9517a69591470c5b2cc43342f552abc178881ee..5cd5ba3604d4690b39fd564f7e1e500ad517aa1f 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
@@ -174,18 +174,17 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
 
     EP.forEachExtensionSafe(customizer -> customizer.customize(this));
     DynamicActionConfigurationCustomizer.EP_NAME.forEachExtensionSafe(customizer -> customizer.registerActions(this));
-    DynamicActionConfigurationCustomizer.EP_NAME.addExtensionPointListener(
-      new ExtensionPointListener<DynamicActionConfigurationCustomizer>() {
-        @Override
-        public void extensionAdded(@NotNull DynamicActionConfigurationCustomizer extension, @NotNull PluginDescriptor pluginDescriptor) {
-          extension.registerActions(ActionManagerImpl.this);
-        }
+    DynamicActionConfigurationCustomizer.EP_NAME.addExtensionPointListener(new ExtensionPointListener<>() {
+      @Override
+      public void extensionAdded(@NotNull DynamicActionConfigurationCustomizer extension, @NotNull PluginDescriptor pluginDescriptor) {
+        extension.registerActions(ActionManagerImpl.this);
+      }
 
-        @Override
-        public void extensionRemoved(@NotNull DynamicActionConfigurationCustomizer extension, @NotNull PluginDescriptor pluginDescriptor) {
-          extension.unregisterActions(ActionManagerImpl.this);
-        }
-      }, this);
+      @Override
+      public void extensionRemoved(@NotNull DynamicActionConfigurationCustomizer extension, @NotNull PluginDescriptor pluginDescriptor) {
+        extension.unregisterActions(ActionManagerImpl.this);
+      }
+    }, this);
     EDITOR_ACTION_HANDLER_EP.addChangeListener(this::updateAllHandlers, this);
   }
 
@@ -432,7 +431,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
 
   private static String getPluginInfo(@Nullable PluginId id) {
     if (id != null) {
-      final IdeaPluginDescriptor plugin = PluginManagerCore.getPlugin(id);
+      IdeaPluginDescriptor plugin = PluginManagerCore.getPlugin(id);
       if (plugin != null) {
         String name = plugin.getName();
         if (name == null) {
@@ -874,11 +873,11 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
     }
   }
 
-  private void processReferenceNode(final Element element,
-                                    final PluginId pluginId,
-                                    @Nullable ResourceBundle bundle) {
-    final AnAction action = processReferenceElement(element, pluginId);
-    if (action == null) return;
+  private void processReferenceNode(@NotNull Element element, @Nullable PluginId pluginId, @Nullable ResourceBundle bundle) {
+    AnAction action = processReferenceElement(element, pluginId);
+    if (action == null) {
+      return;
+    }
 
     for (Element child : element.getChildren()) {
       if (ADD_TO_GROUP_ELEMENT_NAME.equals(child.getName())) {
@@ -938,7 +937,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
     }
     AnAction parentGroup = getActionImpl(groupId, true);
     if (parentGroup == null) {
-      reportActionError(pluginId, actionName + ": group with id \"" + groupId + "\" isn't registered; action will be added to the \"Other\" group");
+      reportActionError(pluginId, actionName + ": group with id \"" + groupId + "\" isn't registered; action will be added to the \"Other\" group", null);
       parentGroup = getActionImpl(IdeActions.GROUP_OTHER_MENU, true);
     }
     if (!(parentGroup instanceof DefaultActionGroup)) {
@@ -1098,24 +1097,22 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
     }
   }
 
-  @Nullable
-  private AnAction processReferenceElement(Element element, PluginId pluginId) {
+  private @Nullable AnAction processReferenceElement(Element element, PluginId pluginId) {
     if (!REFERENCE_ELEMENT_NAME.equals(element.getName())) {
-      reportActionError(pluginId, "unexpected name of element \"" + element.getName() + "\"");
+      reportActionError(pluginId, "unexpected name of element \"" + element.getName() + "\"", null);
       return null;
     }
-    String ref = getReferenceActionId(element);
 
+    String ref = getReferenceActionId(element);
     if (ref == null || ref.isEmpty()) {
-      reportActionError(pluginId, "ID of reference element should be defined");
+      reportActionError(pluginId, "ID of reference element should be defined", null);
       return null;
     }
 
     AnAction action = getActionImpl(ref, true);
-
     if (action == null) {
       if (!myNotRegisteredInternalActionIds.contains(ref)) {
-        reportActionError(pluginId, "action specified by reference isn't registered (ID=" + ref + ")");
+        reportActionError(pluginId, "action specified by reference isn't registered (ID=" + ref + ")", null);
       }
       return null;
     }
@@ -1124,7 +1121,6 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
 
   private static String getReferenceActionId(@NotNull Element element) {
     String ref = element.getAttributeValue(REF_ATTR_NAME);
-
     if (ref == null) {
       // support old style references by id
       ref = element.getAttributeValue(ID_ATTR_NAME);
@@ -1164,6 +1160,7 @@ public final class ActionManagerImpl extends ActionManagerEx implements Disposab
     if (elements == null) {
       return null;
     }
+
     for (Element element : elements) {
       if (!element.getName().equals(ACTION_ELEMENT_NAME) &&
           !(element.getName().equals(GROUP_ELEMENT_NAME) && canUnloadGroup(element)) &&

diff --git a/platform/vcs-impl/resources/META-INF/VCS.xml b/platform/vcs-impl/resources/META-INF/VCS.xml
index d97c1e404759d0abf6f935abfdb8a479d0ae858d..24326aaea41904bb5335575df40ee9d0d6c9d508 100644 (file)
--- a/platform/vcs-impl/resources/META-INF/VCS.xml
+++ b/platform/vcs-impl/resources/META-INF/VCS.xml
@@ -1,18 +1,15 @@
 <idea-plugin xmlns:xi="http://www.w3.org/2001/XInclude">
-
   <module value="com.intellij.modules.vcs"/>
 
-  <extensionPoints>
-    <xi:include href="/META-INF/VcsExtensionPoints.xml" xpointer="xpointer(/idea-plugin/extensionPoints/*)"/>
-  </extensionPoints>
+  <xi:include href="/META-INF/VcsExtensionPoints.xml"/>
 
-  <xi:include href="/META-INF/VcsExtensions.xml" xpointer="xpointer(/idea-plugin/*)"/>
-  <xi:include href="/META-INF/VcsActions.xml" xpointer="xpointer(/idea-plugin/*)"/>
+  <xi:include href="/META-INF/VcsExtensions.xml"/>
+  <xi:include href="/META-INF/VcsActions.xml"/>
 
-  <xi:include href="/META-INF/vcs-log.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/vcs-log.xml">
     <xi:fallback/>
   </xi:include>
-  <xi:include href="/META-INF/dvcs.xml" xpointer="xpointer(/idea-plugin/*)">
+  <xi:include href="/META-INF/dvcs.xml">
     <xi:fallback/>
   </xi:include>