From c81ffaacec5f8a0f5d137d27689136e6095b1d61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yann=20C=C3=A9bron?= <yann.cebron@jetbrains.com>
Date: Mon, 12 Nov 2018 17:28:15 +0100
Subject: [PATCH] IDEA-196765 Good code red in a module.xml when referring an
 action defined in the same xml

---
 .../src/dom/impl/ActionOrGroupResolveConverter.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/devkit/devkit-core/src/dom/impl/ActionOrGroupResolveConverter.java b/plugins/devkit/devkit-core/src/dom/impl/ActionOrGroupResolveConverter.java
index af8cdb1ebb59..d69c1c23453c 100644
--- a/plugins/devkit/devkit-core/src/dom/impl/ActionOrGroupResolveConverter.java
+++ b/plugins/devkit/devkit-core/src/dom/impl/ActionOrGroupResolveConverter.java
@@ -165,9 +165,9 @@ public class ActionOrGroupResolveConverter extends ResolvingConverter<ActionOrGr
   }
 
   private static boolean processPlugins(Collection<IdeaPlugin> plugins, PairProcessor<String, ActionOrGroup> processor) {
-    for (IdeaPlugin plugin: plugins) {
+    for (IdeaPlugin plugin : plugins) {
       final Map<String, ActionOrGroup> forFile = collectForFile(plugin);
-      for (Map.Entry<String, ActionOrGroup> entry: forFile.entrySet()) {
+      for (Map.Entry<String, ActionOrGroup> entry : forFile.entrySet()) {
         if (!processor.process(entry.getKey(), entry.getValue())) return false;
       }
     }
@@ -178,22 +178,22 @@ public class ActionOrGroupResolveConverter extends ResolvingConverter<ActionOrGr
     final XmlFile xmlFile = DomUtil.getFile(plugin);
     return CachedValuesManager.getCachedValue(xmlFile, () -> {
       Map<String, ActionOrGroup> result = new HashMap<>();
-      for (Actions actions: plugin.getActions()) {
+      for (Actions actions : plugin.getActions()) {
         collectRecursive(result, actions);
       }
 
-      return CachedValueProvider.Result.create(result, xmlFile);
+      return CachedValueProvider.Result.create(result, DomManager.getDomManager(xmlFile.getProject()));
     });
   }
 
   private static void collectRecursive(Map<String, ActionOrGroup> result, Actions actions) {
-    for (Action action: actions.getActions()) {
+    for (Action action : actions.getActions()) {
       final String name = getName(action);
       if (!StringUtil.isEmptyOrSpaces(name)) {
         result.put(name, action);
       }
     }
-    for (Group group: actions.getGroups()) {
+    for (Group group : actions.getGroups()) {
       final String name = getName(group);
       if (!StringUtil.isEmptyOrSpaces(name)) {
         result.put(name, group);