#72: Resolve references inside oneof + group nodes

Fix IncorrectOperationException: Could not detect qualified name
in given context: io.protostuff.jetbrains.plugin.psi.OneOfNode

Author: kshchepanovskyi

src/main/java/io/protostuff/jetbrains/plugin/psi/DataType.java

@@ -38,6 +38,12 @@ public String getQualifiedName() {
             }
             return "." + packageName + "." + getName();
         }
+        if (parent instanceof OneOfNode) {
+            OneOfNode oneOfNode = (OneOfNode) parent;
+            MessageNode parentMessage = (MessageNode) oneOfNode.getParent();
+            String parentMessageQualifiedName = parentMessage.getQualifiedName();
+            return parentMessageQualifiedName + "." + getName();
+        }
         if (parent instanceof MessageNode) {
             MessageNode parentMessage = (MessageNode) parent;
             String parentMessageQualifiedName = parentMessage.getQualifiedName();

src/main/java/io/protostuff/jetbrains/plugin/psi/MessageNode.java

@@ -5,10 +5,10 @@
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
-import io.protostuff.compiler.parser.ProtoParser;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -51,7 +51,14 @@ public String getNamespace() {
 
     @Override
     public Collection<DataType> getDeclaredDataTypes() {
-        return Arrays.asList(findChildrenByClass(DataType.class));
+        List<DataType> types = new ArrayList<>();
+        DataType[] direct = findChildrenByClass(DataType.class);
+        Collections.addAll(types, direct);
+        OneOfNode[] oneOfNodes = findChildrenByClass(OneOfNode.class);
+        for (OneOfNode oneOfNode : oneOfNodes) {
+            Collections.addAll(types, oneOfNode.getDeclaredDataTypes());
+        }
+        return types;
     }
 
     @Override

src/main/java/io/protostuff/jetbrains/plugin/psi/OneOfNode.java

@@ -20,4 +20,9 @@ public Collection<MessageField> getFields() {
         MessageField[] fields = findChildrenByClass(FieldNode.class);
         return Arrays.asList(fields);
     }
+
+    @NotNull
+    public DataType[] getDeclaredDataTypes() {
+        return findChildrenByClass(DataType.class);
+    }
 }

src/test/java/io/protostuff/jetbrains/plugin/reference/ReferenceTest.java

@@ -76,6 +76,15 @@ public void testReferenceInsideOfGroup() {
         checkReferenceToDataType(".reference.Message.Group.NestedMessage", "reference/GroupReference.proto");
     }
 
+    /**
+     * Check that type references work correctly inside of oneof+group block.
+     *
+     * https://github.com/protostuff/protobuf-jetbrains-plugin/issues/72
+     */
+    public void testReferenceInsideOfOneof() {
+        checkReferenceToDataType(".reference.Message.Group2.NestedMessage", "reference/OneofReference.proto");
+    }
+
     public void testProtoFileImportsItself() {
         // referenced type does not exist, so we expect that it is not resolvable
         // the only thing that we check here - is that we do not get StackOverflowError

src/test/resources/reference/OneofReference.proto

@@ -0,0 +1,23 @@
+syntax = "proto2";
+
+package reference;
+
+message Message {
+
+
+    oneof OneOf {
+
+        group Group1 = 1 {
+            message NestedMessage {
+                optional Group2.<caret>NestedMessage n = 1;
+            }
+        }
+
+        group Group2 = 2 {
+            message NestedMessage {
+                optional Group1.NestedMessage n = 1;
+            }
+        }
+    }
+
+}