#46: Bump protostuff-parser version

Author: kshchepanovskyi

build.gradle

@@ -32,7 +32,7 @@ dependencies {
         exclude group: 'com.jetbrains'
     }
     compile 'com.google.guava:guava:21.0'
-    compile 'io.protostuff:protostuff-parser:2.0.0-alpha38'
+    compile 'io.protostuff:protostuff-parser:2.1.9'
 }
 
 apply plugin: 'idea'

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

@@ -25,7 +25,6 @@
 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_oneofField;
 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;
@@ -74,7 +73,6 @@
 import io.protostuff.jetbrains.plugin.psi.MapNode;
 import io.protostuff.jetbrains.plugin.psi.MessageNode;
 import io.protostuff.jetbrains.plugin.psi.OneOfNode;
-import io.protostuff.jetbrains.plugin.psi.OneofFieldNode;
 import io.protostuff.jetbrains.plugin.psi.OptionEntryNode;
 import io.protostuff.jetbrains.plugin.psi.OptionNode;
 import io.protostuff.jetbrains.plugin.psi.OptionValueNode;
@@ -296,7 +294,6 @@ public ProtoParserDefinition() {
         register(RULE_messageBlock, MessageNode::new);
         register(RULE_messageName, GenericNameNode::new);
         register(RULE_oneof, OneOfNode::new);
-        register(RULE_oneofField, OneofFieldNode::new);
         register(RULE_option, OptionNode::new);
         register(RULE_optionEntry, OptionEntryNode::new);
         register(RULE_optionValue, OptionValueNode::new);

src/main/java/io/protostuff/jetbrains/plugin/formatter/BlockFactory.java

@@ -26,8 +26,6 @@
 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_oneofField;
-import static io.protostuff.compiler.parser.ProtoParser.RULE_oneofGroup;
 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;
@@ -119,8 +117,6 @@ class BlockFactory {
         register(rule(RULE_extendBlock), ParentBlock::new);
         register(rule(RULE_extendBlockEntry), StatementBlock::new);
         register(rule(RULE_oneof), ParentBlock::new);
-        register(rule(RULE_oneofField), StatementBlock::new);
-        register(rule(RULE_oneofGroup), ParentBlock::new);
         register(rule(RULE_groupBlock), ParentBlock::new);
         register(rule(RULE_extensions), StatementBlock::new);
 

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

@@ -18,7 +18,7 @@ public OneOfNode(@NotNull ASTNode node) {
     }
 
     public Collection<MessageField> getFields() {
-        MessageField[] fields = findChildrenByClass(OneofFieldNode.class);
+        MessageField[] fields = findChildrenByClass(FieldNode.class);
         return Arrays.asList(fields);
     }
 }