IDEA-144059 DevKit: <add-to-group> support, "relative-to-action"

diff --git a/plugins/devkit/src/dom/AddToGroup.java b/plugins/devkit/src/dom/AddToGroup.java
index 47666eb7a0392a783905df0b9921207d9e9812a0..bd2873f99a201305ef97e45f6106e4d0aa57f05a 100644 (file)
--- a/plugins/devkit/src/dom/AddToGroup.java
+++ b/plugins/devkit/src/dom/AddToGroup.java
@@ -46,7 +46,8 @@ public interface AddToGroup extends DomElement {
         * @return the value of the relative-to-action child.
         */
        @NotNull
-       GenericAttributeValue<String> getRelativeToAction();
+       @Convert(ActionOrGroupResolveConverter.class)
+        GenericAttributeValue<ActionOrGroup> getRelativeToAction();
 
 
        /**

diff --git a/plugins/devkit/testData/codeInsight/ActionHighlighting.xml b/plugins/devkit/testData/codeInsight/ActionHighlighting.xml
index 7ac985ad17fd9ba6711beb48b93495ef54898d8b..b43048f849ddd025da1714c758587fb60d959aa5 100644 (file)
--- a/plugins/devkit/testData/codeInsight/ActionHighlighting.xml
+++ b/plugins/devkit/testData/codeInsight/ActionHighlighting.xml
@@ -23,6 +23,8 @@
       <add-to-group group-id="<error descr="Cannot resolve group 'INVALID_VALUE'">INVALID_VALUE</error>"/>
 
       <add-to-group group-id="myGroup" relative-to-action="myAction" anchor="after"/>
+      <add-to-group group-id="myGroup" relative-to-action="<error descr="Cannot resolve action or group 'INVALID_VALUE'">INVALID_VALUE</error>" anchor="after"/>
+
       <<error descr="'anchor' must be specified with 'relative-to-action'">add-to-group</error> group-id="myGroup" relative-to-action="myAction"/>
       <add-to-group group-id="myGroup" relative-to-action="myAction" anchor="<error descr="Must use 'after'|'before' with 'relative-to-action'">first</error>"/>
     </action>