#46: Rename refactoring for map/oneof fields

Author: kshchepanovskyi

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

@@ -8,22 +8,20 @@
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import java.util.Optional;
-import org.antlr.jetbrains.adapter.psi.AntlrPsiNode;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * Map node.
  *
  * @author Kostiantyn Shchepanovskyi
  */
-public class MapNode extends AntlrPsiNode
+public class MapNode extends AbstractNamedNode
         implements MessageField, KeywordsContainer {
 
     public MapNode(@NotNull ASTNode node) {
         super(node);
     }
 
-
     @Override
     public String getFieldName() {
         ASTNode nameNode = getFieldNameNode();

src/main/java/io/protostuff/jetbrains/plugin/reference/FieldReferenceProviderImpl.java

@@ -24,6 +24,7 @@
 import io.protostuff.jetbrains.plugin.psi.ExtendNode;
 import io.protostuff.jetbrains.plugin.psi.FieldNode;
 import io.protostuff.jetbrains.plugin.psi.FieldReferenceNode;
+import io.protostuff.jetbrains.plugin.psi.MapNode;
 import io.protostuff.jetbrains.plugin.psi.MessageField;
 import io.protostuff.jetbrains.plugin.psi.MessageNode;
 import io.protostuff.jetbrains.plugin.psi.ProtoPsiFileRoot;
@@ -58,6 +59,7 @@ public class FieldReferenceProviderImpl implements FieldReferenceProvider {
     private static final Map<Class<? extends PsiElement>, String> TARGET_MAPPING
             = ImmutableMap.<Class<? extends PsiElement>, String>builder()
             .put(FieldNode.class, MSG_FIELD_OPTIONS)
+            .put(MapNode.class, MSG_FIELD_OPTIONS)
             .put(MessageNode.class, MSG_MESSAGE_OPTIONS)
             .put(EnumConstantNode.class, MSG_ENUM_VALUE_OPTIONS)
             .put(EnumNode.class, MSG_ENUM_OPTIONS)
@@ -102,11 +104,13 @@ public PsiReference[] getReferencesByElement(FieldReferenceNode fieldReference)
                 message = null;
                 if (targetField != null) {
                     TypeReferenceNode fieldTypeRef = targetField.getFieldType();
-                    PsiReference reference = fieldTypeRef.getReference();
-                    if (reference != null) {
-                        PsiElement fieldType = reference.resolve();
-                        if (fieldType instanceof MessageNode) {
-                            message = (MessageNode) fieldType;
+                    if (fieldTypeRef != null) {
+                        PsiReference reference = fieldTypeRef.getReference();
+                        if (reference != null) {
+                            PsiElement fieldType = reference.resolve();
+                            if (fieldType instanceof MessageNode) {
+                                message = (MessageNode) fieldType;
+                            }
                         }
                     }
                 }

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

@@ -29,6 +29,11 @@ public void testStandardFieldOptionReference() {
                 "StandardFieldOptionReferenceTestData.proto");
     }
 
+    public void testStandardMapFieldOptionReference() {
+        checkReferenceToField(".google.protobuf.FieldOptions", "deprecated",
+                "StandardMapFieldOptionReferenceTestData.proto");
+    }
+
     public void testStandardEnumOptionReference() {
         checkReferenceToField(".google.protobuf.EnumOptions", "deprecated",
                 "StandardEnumOptionReferenceTestData.proto");

src/test/java/io/protostuff/jetbrains/plugin/rename/field/RenameFieldTest.java

@@ -2,6 +2,7 @@
 
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
 import io.protostuff.jetbrains.plugin.psi.FieldNode;
+import io.protostuff.jetbrains.plugin.psi.MapNode;
 import io.protostuff.jetbrains.plugin.psi.OptionNode;
 import org.junit.Assert;
 
@@ -31,4 +32,32 @@ public void testRenameField_caretAtOption() {
         Assert.assertNotNull(option);
     }
 
+    public void testRenameOneofField_caretAtFieldName() {
+        myFixture.configureByFiles("rename/field/RenameOneofField_CaretAtField.proto");
+        myFixture.renameElementAtCaret("NewName");
+        OptionNode option = myFixture.findElementByText("(foo).NewName", OptionNode.class);
+        Assert.assertNotNull(option);
+    }
+
+    public void testRenameOneofField_caretAtOption() {
+        myFixture.configureByFiles("rename/field/RenameOneofField_CaretAtOption.proto");
+        myFixture.renameElementAtCaret("NewName");
+        FieldNode option = myFixture.findElementByText("NewName", FieldNode.class);
+        Assert.assertNotNull(option);
+    }
+
+    public void testRenameMapField_caretAtFieldName() {
+        myFixture.configureByFiles("rename/field/RenameMapField_CaretAtField.proto");
+        myFixture.renameElementAtCaret("NewName");
+        OptionNode option = myFixture.findElementByText("(foo).NewName", OptionNode.class);
+        Assert.assertNotNull(option);
+    }
+
+    public void testRenameMapField_caretAtOption() {
+        myFixture.configureByFiles("rename/field/RenameMapField_CaretAtOption.proto");
+        myFixture.renameElementAtCaret("NewName");
+        MapNode option = myFixture.findElementByText("NewName", MapNode.class);
+        Assert.assertNotNull(option);
+    }
+
 }

src/test/resources/reference/options/StandardMapFieldOptionReferenceTestData.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package reference.options;
+
+message A {
+    map<int32,int32> x = 1[depre<caret>cated = true];
+}

src/test/resources/rename/field/RenameField_CaretAtField.proto

@@ -10,9 +10,9 @@ extend google.protobuf.FieldOptions {
 }
 
 message Foo {
-    optional int32 name = 1;
+    optional int32 name<caret> = 1;
 }
 
 message Bar {
-    optional string field = 1 [(foo).name<caret> = 1];
+    optional string field = 1 [(foo).name = 1];
 }

src/test/resources/rename/field/RenameField_CaretAtOption.proto

@@ -10,9 +10,9 @@ extend google.protobuf.FieldOptions {
 }
 
 message Foo {
-    optional int32 name<caret> = 1;
+    optional int32 name = 1;
 }
 
 message Bar {
-    optional string field = 1 [(foo).name = 1];
+    optional string field = 1 [(foo).name<caret> = 1];
 }

src/test/resources/rename/field/RenameMapField_CaretAtField.proto

@@ -0,0 +1,21 @@
+syntax = "proto2";
+
+package rename.field;
+
+import "google/protobuf/descriptor.proto";
+
+
+extend google.protobuf.FieldOptions {
+    optional Foo foo = 52003;
+}
+
+message Foo {
+    map<int32, int32> name<caret> = 1;
+}
+
+message Bar {
+    optional string field = 1 [(foo).name = {
+        key: 1
+        value: 1
+    }];
+}

src/test/resources/rename/field/RenameMapField_CaretAtOption.proto

@@ -0,0 +1,21 @@
+syntax = "proto2";
+
+package rename.field;
+
+import "google/protobuf/descriptor.proto";
+
+
+extend google.protobuf.FieldOptions {
+    optional Foo foo = 52003;
+}
+
+message Foo {
+    map<int32, int32> name = 1;
+}
+
+message Bar {
+    optional string field = 1 [(foo).name<caret> = {
+        key: 1
+        value: 1
+    }];
+}

src/test/resources/rename/field/RenameOneofField_CaretAtField.proto

@@ -0,0 +1,20 @@
+syntax = "proto2";
+
+package rename.field;
+
+import "google/protobuf/descriptor.proto";
+
+
+extend google.protobuf.FieldOptions {
+    optional Foo foo = 52003;
+}
+
+message Foo {
+    oneof oneof {
+        int32 name<caret> = 1;
+    }
+}
+
+message Bar {
+    optional string field = 1 [(foo).name = 1];
+}