Added support for the "stream" keyword for Service definitions

nnmatveev · Dec 11, 2015 · ece3b7a · ece3b7a
1 parent bb3f2b6
commit ece3b7a
Show file tree

Hide file tree

Showing 7 changed files with 286 additions and 278 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/src/protobuf/lang/PbTokenTypes.java b/src/protobuf/lang/PbTokenTypes.java
@@ -67,6 +67,7 @@ public interface PbTokenTypes {
 
     IElementType RPC = new PbElementType("RPC");
     IElementType RETURNS = new PbElementType("RETURNS");
+    IElementType STREAM = new PbElementType("STREAM");
     IElementType EXTENSIONS = new PbElementType("EXTENSIONS");
     //--
 
@@ -110,7 +111,7 @@ public interface PbTokenTypes {
                                                 FIXED32,FIXED64,SFIXED32,
                                                 SFIXED64,BOOL,STRING,BYTES);  //keywords
 
-    TokenSet OTHER_KEYWORDS = TokenSet.create(RPC,RETURNS,GROUP,EXTENSIONS,TO,MAX);//keywords
+    TokenSet OTHER_KEYWORDS = TokenSet.create(RPC,RETURNS,GROUP,EXTENSIONS,TO,MAX,STREAM);//keywords
 
     //Options
     //--File settings

diff --git a/src/protobuf/lang/lexer/_ProtobufLexer.java b/src/protobuf/lang/lexer/_ProtobufLexer.java
diff --git a/src/protobuf/lang/lexer/protobuf.flex b/src/protobuf/lang/lexer/protobuf.flex
@@ -93,6 +93,7 @@ WRONG_STRING_SINGLE_QUOTED = \'[^\'\r\n]*
 "enum"                              {return (ENUM);}
 "oneof"                              {return (ONEOF);}
 "returns"                           {return (RETURNS);}
+"stream"                            {return (STREAM);}
 "option"                            {return (OPTION);}
 "group"                             {return (GROUP);}
 "extensions"                        {return (EXTENSIONS);}

diff --git a/src/protobuf/lang/parser/parsing/ServiceDeclaration.java b/src/protobuf/lang/parser/parsing/ServiceDeclaration.java
@@ -54,12 +54,14 @@ public static boolean parseServiceMethod(PbPatchedPsiBuilder builder) {
         builder.match(IK, "identifier.expected");
         //builder.matchAs(IK,NAME, "identifier.expected");
         builder.match(OPEN_PARENTHESIS, "open.parenthesis.expected");
+        builder.match(STREAM);
         if (!ReferenceElement.parseForCustomType(builder)) {
             builder.error("user.defined.type.expected");
         }
         builder.match(CLOSE_PARENTHESIS, "close.parenthesis.expected");
         builder.match(RETURNS, "returns.expected");
         builder.match(OPEN_PARENTHESIS, "open.parenthesis.expected");
+        builder.match(STREAM);
         if (!ReferenceElement.parseForCustomType(builder)) {
             builder.error("user.defined.type.expected");
         }

diff --git a/src/protobuf/lang/parser/parsing/protobuf-grammar.bnf b/src/protobuf/lang/parser/parsing/protobuf-grammar.bnf
@@ -63,5 +63,5 @@ STRING_LITERALS ::= NUMBERS | IDENTIFIER | STRING | KEYWORD | BOOL_VALUES
 <Service Declaration> ::= 'service' IDENTIFIER <Service Block>
 <Service Block> ::= '{' (<Service Member> | ';')* '}'
 <Service Member> ::= <Service Method> | <Option Declaration>
-<Service Method> ::= 'rpc' IDENTIFIER '(' <User Defined Type> ')' 'returns' '(' <User Defined Type> ')' <Service Method Block>? ';'
+<Service Method> ::= 'rpc' IDENTIFIER '(' <User Defined Type> ')' 'returns' '(' ('stream' | <User Defined Type>) ')' <Service Method Block>? ';'
 <Service Method Block> ::= '{' (<Option Declaration>|';')* '}'