#46: Rename refactoring for oneof

Author: kshchepanovskyi

src/main/java/io/protostuff/jetbrains/plugin/ProtoParserDefinition.java

@@ -25,6 +25,7 @@
 import static io.protostuff.compiler.parser.ProtoParser.RULE_messageBlock;
 import static io.protostuff.compiler.parser.ProtoParser.RULE_messageName;
 import static io.protostuff.compiler.parser.ProtoParser.RULE_oneof;
+import static io.protostuff.compiler.parser.ProtoParser.RULE_oneofName;
 import static io.protostuff.compiler.parser.ProtoParser.RULE_option;
 import static io.protostuff.compiler.parser.ProtoParser.RULE_optionEntry;
 import static io.protostuff.compiler.parser.ProtoParser.RULE_optionValue;
@@ -294,6 +295,7 @@ public ProtoParserDefinition() {
         register(RULE_messageBlock, MessageNode::new);
         register(RULE_messageName, GenericNameNode::new);
         register(RULE_oneof, OneOfNode::new);
+        register(RULE_oneofName, GenericNameNode::new);
         register(RULE_option, OptionNode::new);
         register(RULE_optionEntry, OptionEntryNode::new);
         register(RULE_optionValue, OptionValueNode::new);

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

@@ -3,15 +3,14 @@
 import com.intellij.lang.ASTNode;
 import java.util.Arrays;
 import java.util.Collection;
-import org.antlr.jetbrains.adapter.psi.AntlrPsiNode;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * One-of node.
  *
  * @author Kostiantyn Shchepanovskyi
  */
-public class OneOfNode extends AntlrPsiNode implements KeywordsContainer {
+public class OneOfNode extends AbstractNamedNode implements KeywordsContainer {
 
     public OneOfNode(@NotNull ASTNode node) {
         super(node);

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

@@ -67,4 +67,11 @@ public void testRenameMapField_caretAtOption() {
         Assert.assertNotNull(option);
     }
 
+    public void testRenameExtension_caretAtFieldName() {
+        myFixture.configureByFiles("rename/field/RenameExtension_CaretAtField.proto");
+        myFixture.renameElementAtCaret("NewName");
+        FieldNode option = myFixture.findElementByText("NewName", FieldNode.class);
+        Assert.assertNotNull(option);
+    }
+
 }

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

@@ -0,0 +1,26 @@
+package io.protostuff.jetbrains.plugin.rename.field;
+
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import io.protostuff.jetbrains.plugin.psi.OneOfNode;
+import org.junit.Assert;
+
+/**
+ * Tests for rename message refactoring.
+ *
+ * @author Kostiantyn Shchepanovskyi
+ */
+public class RenameOneofTest extends LightCodeInsightFixtureTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "src/test/resources/";
+    }
+
+    public void testRenameField_caretAtFieldName() {
+        myFixture.configureByFiles("rename/field/RenameOneof.proto");
+        myFixture.renameElementAtCaret("NewName");
+        OneOfNode option = myFixture.findElementByText("NewName", OneOfNode.class);
+        Assert.assertNotNull(option);
+    }
+
+}

src/test/java/io/protostuff/jetbrains/plugin/rename/service/RenameServiceTest.java

@@ -0,0 +1,33 @@
+package io.protostuff.jetbrains.plugin.rename.service;
+
+import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase;
+import io.protostuff.jetbrains.plugin.psi.ServiceNode;
+import org.junit.Assert;
+
+/**
+ * Tests for rename message refactoring.
+ *
+ * @author Kostiantyn Shchepanovskyi
+ */
+public class RenameServiceTest extends LightCodeInsightFixtureTestCase {
+
+    @Override
+    protected String getTestDataPath() {
+        return "src/test/resources/";
+    }
+
+    public void testRenameService() {
+        myFixture.configureByFiles("rename/service/RenameService.proto");
+        myFixture.renameElementAtCaret("NewName");
+        ServiceNode option = myFixture.findElementByText("NewName", ServiceNode.class);
+        Assert.assertNotNull(option);
+    }
+
+    public void testRenameRpc() {
+        myFixture.configureByFiles("rename/service/RenameRpc.proto");
+        myFixture.renameElementAtCaret("NewName");
+        ServiceNode option = myFixture.findElementByText("NewName", ServiceNode.class);
+        Assert.assertNotNull(option);
+    }
+
+}

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

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

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

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

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

@@ -0,0 +1,9 @@
+syntax = "proto2";
+
+package rename.field;
+
+message Foo {
+    oneof oneof<caret> {
+        int32 name = 1;
+    }
+}

src/test/resources/rename/service/RenameRpc.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package rename.service;
+
+service TheService {
+    rpc foo<caret> (Message) returns (Message);
+}
+
+message Message {
+
+}

src/test/resources/rename/service/RenameService.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package rename.type;
+
+service TheService<caret> {
+
+}