From e25a17769820b63e048bcfb67da8d07d95420819 Mon Sep 17 00:00:00 2001
From: Maciej Kasprzak <maciej.kasprzak@goeuroc.com>
Date: Sat, 7 Nov 2015 00:23:57 +0100
Subject: [PATCH 1/3] resolves #68 tolerate lack of optional/required labels
 for proto3

---
 .idea/misc.xml                                |  6 +-
 META-INF/plugin.xml                           |  2 +-
 src/protobuf/lang/PbTokenTypes.java           |  1 +
 .../lang/parser/parsing/CompilationUnit.java  | 24 +++++++-
 .../parser/parsing/ExtendDeclaration.java     | 12 ++--
 .../lang/parser/parsing/FieldDeclaration.java |  2 +-
 .../parser/parsing/MessageDeclaration.java    | 16 ++---
 .../parsing/Proto3FieldDeclaration.java       | 58 +++++++++++++++++++
 .../parser/parsing/SyntaxDeclaration.java     |  3 +-
 9 files changed, 103 insertions(+), 21 deletions(-)
 create mode 100644 src/protobuf/lang/parser/parsing/Proto3FieldDeclaration.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 66deecf..261edfe 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -260,6 +260,7 @@
       <facet-type id="Scala" />
     </autodetection-disabled>
   </component>
+  <component name="IdProvider" IDEtalkID="656D27171A51E264FCCFBA9F80852878" />
   <component name="IvyIDEA.ProjectSettings">
     <option name="artifactTypeSettings">
       <ArtifactTypeSettings />
@@ -291,7 +292,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA 13 SDK" project-jdk-type="IDEA JDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA IU-139.1603.1" project-jdk-type="IDEA JDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">
@@ -334,5 +335,4 @@
     </option>
     <option name="mySupportsUserInfoFilter" value="true" />
   </component>
-</project>
-
+</project>
\ No newline at end of file
diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 5e7820a..d5e5f00 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -2,7 +2,7 @@
     <id>com.nmatveev.idea-plugin-protobuf</id>
     <vendor>Strintec</vendor>
     <name>Google Protocol Buffers support</name>
-    <version>0.5.9</version>
+    <version>0.5.9.1</version>
     <category>Custom Languages</category>
     <description>
         <![CDATA[
diff --git a/src/protobuf/lang/PbTokenTypes.java b/src/protobuf/lang/PbTokenTypes.java
index a04d9d2..476f496 100644
--- a/src/protobuf/lang/PbTokenTypes.java
+++ b/src/protobuf/lang/PbTokenTypes.java
@@ -84,6 +84,7 @@ public interface PbTokenTypes {
     IElementType OPTIONAL = new PbElementType("OPTIONAL");
     IElementType REPEATED = new PbElementType("REPEATED");
     TokenSet FIELD_LABELS = TokenSet.create(REQUIRED,OPTIONAL,REPEATED); //keywords
+    TokenSet PROTO3_FIELD_LABELS = TokenSet.create(REPEATED); //keywords
 
 
     IElementType GROUP = new PbElementType("GROUP");  TokenSet GROUP_SET = TokenSet.create(GROUP); //hack for lookAhead
diff --git a/src/protobuf/lang/parser/parsing/CompilationUnit.java b/src/protobuf/lang/parser/parsing/CompilationUnit.java
index ad22c86..f4f4af8 100644
--- a/src/protobuf/lang/parser/parsing/CompilationUnit.java
+++ b/src/protobuf/lang/parser/parsing/CompilationUnit.java
@@ -14,14 +14,15 @@
 public class CompilationUnit implements PbElementTypes {
     public static void parse(PbPatchedPsiBuilder builder) {
         //parseSeparateOption root level statements
+        Context context = new Context();
         while (!builder.eof()) {
-            if (SyntaxDeclaration.parse(builder)) {
+            if (SyntaxDeclaration.parse(builder, context)) {
             } else if (PackageDeclaration.parse(builder)) {
             } else if (ImportDeclaration.parse(builder)) {
             } else if (OptionDeclaration.parseSeparateOption(builder)) {
-            } else if (ExtendDeclaration.parse(builder)) {
+            } else if (ExtendDeclaration.parse(builder, context.isProto3())) {
             } else if (ServiceDeclaration.parse(builder)) {
-            } else if (MessageDeclaration.parse(builder)) {
+            } else if (MessageDeclaration.parse(builder, context.isProto3())) {
             } else if (EnumDeclaration.parse(builder)) {
             } else if (builder.match(SEMICOLON)) {
             } else {
@@ -29,4 +30,21 @@ public static void parse(PbPatchedPsiBuilder builder) {
             }
         }
     }
+
+    public static class Context {
+        public static final String PROTO3 = "\"proto3\"";
+        private String syntax;
+
+        public String getSyntax() {
+            return syntax;
+        }
+
+        public void setSyntax(String syntax) {
+            this.syntax = syntax;
+        }
+
+        public boolean isProto3() {
+            return PROTO3.equals(syntax);
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/protobuf/lang/parser/parsing/ExtendDeclaration.java b/src/protobuf/lang/parser/parsing/ExtendDeclaration.java
index 6d063ea..14053f4 100644
--- a/src/protobuf/lang/parser/parsing/ExtendDeclaration.java
+++ b/src/protobuf/lang/parser/parsing/ExtendDeclaration.java
@@ -10,7 +10,7 @@
 
 public class ExtendDeclaration implements PbElementTypes {
 
-    public static boolean parse(PbPatchedPsiBuilder builder) {
+    public static boolean parse(PbPatchedPsiBuilder builder, boolean proto3Syntax) {
         if (!builder.compareToken(EXTEND)) {
             return false;
         }
@@ -19,21 +19,21 @@ public static boolean parse(PbPatchedPsiBuilder builder) {
         if (!ReferenceElement.parseForCustomType(builder)) {
             builder.error("type.expected");
         }
-        if (!parseExtendBlock(builder)) {
+        if (!parseExtendBlock(builder, proto3Syntax)) {
             builder.error("open.block.expected");
         }
         extendMarker.done(EXTEND_DECL);
         return true;
     }
 
-    public static boolean parseExtendBlock(PbPatchedPsiBuilder builder) {
+    public static boolean parseExtendBlock(PbPatchedPsiBuilder builder, boolean proto3Syntax) {
         if (!builder.compareToken(OPEN_BLOCK)) {
             return false;
         }
         PsiBuilder.Marker extendBlockMarker = builder.mark();
         builder.match(OPEN_BLOCK);
         while (!builder.eof() && !builder.compareToken(CLOSE_BLOCK)) {
-            if (!FieldDeclaration.parse(builder)) {
+            if (!parseField(builder, proto3Syntax)) {
                 builder.eatError("unexpected.token");
             }
         }
@@ -41,4 +41,8 @@ public static boolean parseExtendBlock(PbPatchedPsiBuilder builder) {
         extendBlockMarker.done(EXTEND_BLOCK);
         return true;
     }
+
+    private static boolean parseField(PbPatchedPsiBuilder builder, boolean proto3Syntax) {
+        return proto3Syntax ? Proto3FieldDeclaration.parse(builder) : FieldDeclaration.parse(builder);
+    }
 }
\ No newline at end of file
diff --git a/src/protobuf/lang/parser/parsing/FieldDeclaration.java b/src/protobuf/lang/parser/parsing/FieldDeclaration.java
index bb6acf9..0f027db 100644
--- a/src/protobuf/lang/parser/parsing/FieldDeclaration.java
+++ b/src/protobuf/lang/parser/parsing/FieldDeclaration.java
@@ -24,7 +24,7 @@ public static boolean parse(PbPatchedPsiBuilder builder) {
             builder.match(EQUAL, "equal.expected");
             builder.matchAs(NUM_INT, VALUE, "num.integer.expected");
             OptionDeclaration.parseOptionList(builder);
-            if (!MessageDeclaration.parseMessageBlock(builder)) {
+            if (!MessageDeclaration.parseMessageBlock(builder, false)) {
                 builder.error("group.block.expected");
             }
             messageMarker.done(GROUP_DECL);
diff --git a/src/protobuf/lang/parser/parsing/MessageDeclaration.java b/src/protobuf/lang/parser/parsing/MessageDeclaration.java
index ba94fb8..c750ef2 100644
--- a/src/protobuf/lang/parser/parsing/MessageDeclaration.java
+++ b/src/protobuf/lang/parser/parsing/MessageDeclaration.java
@@ -10,7 +10,7 @@
 
 public class MessageDeclaration implements PbElementTypes {
 
-    public static boolean parse(PbPatchedPsiBuilder builder) {
+    public static boolean parse(PbPatchedPsiBuilder builder, boolean proto3Syntax) {
         if (!builder.compareToken(MESSAGE)) {
             return false;
         }
@@ -18,21 +18,21 @@ public static boolean parse(PbPatchedPsiBuilder builder) {
         builder.match(MESSAGE);
         //builder.matchAs(IK,NAME,"identifier.expected");
         builder.match(IK, "identifier.expected");
-        if (!parseMessageBlock(builder)) {
+        if (!parseMessageBlock(builder, proto3Syntax)) {
             builder.error("message.block.expected");
         }
         messageMarker.done(MESSAGE_DECL);
         return true;
     }
 
-    public static boolean parseMessageBlock(PbPatchedPsiBuilder builder) {
+    public static boolean parseMessageBlock(PbPatchedPsiBuilder builder, boolean isProto3Syntax) {
         if (!builder.compareToken(OPEN_BLOCK)) {
             return false;
         }
         PsiBuilder.Marker blockMarker = builder.mark();
         builder.match(OPEN_BLOCK); //matching OPEN_BLOCK
         while (!builder.eof() && !builder.compareToken(CLOSE_BLOCK)) {
-            if (!parseMessageMember(builder)) {
+            if (!parseMessageMember(builder, isProto3Syntax)) {
                 builder.eatError("unexpected.token");
             }
         }
@@ -41,22 +41,22 @@ public static boolean parseMessageBlock(PbPatchedPsiBuilder builder) {
         return true;
     }
 
-    public static boolean parseMessageMember(PbPatchedPsiBuilder builder) {
+    public static boolean parseMessageMember(PbPatchedPsiBuilder builder, boolean proto3Syntax) {
         //PsiBuilder.Marker statementMarker = builder.mark();
         if (builder.match(SEMICOLON)) {
-        } else if (MessageDeclaration.parse(builder)) {
+        } else if (MessageDeclaration.parse(builder, proto3Syntax)) {
 
         } else if (OneofDeclaration.parse(builder)) {
 
         } else if (EnumDeclaration.parse(builder)) {
 
-        } else if (ExtendDeclaration.parse(builder)) {
+        } else if (ExtendDeclaration.parse(builder, proto3Syntax)) {
 
         } else if (OptionDeclaration.parseSeparateOption(builder)) {
 
         } else if (parseExtensions(builder)) {
 
-        } else if (FieldDeclaration.parse(builder)) {
+        } else if (proto3Syntax ? Proto3FieldDeclaration.parse(builder) : FieldDeclaration.parse(builder)) {
         } else {
             //statementMarker.drop();
             return false;
diff --git a/src/protobuf/lang/parser/parsing/Proto3FieldDeclaration.java b/src/protobuf/lang/parser/parsing/Proto3FieldDeclaration.java
new file mode 100644
index 0000000..6a9e6ff
--- /dev/null
+++ b/src/protobuf/lang/parser/parsing/Proto3FieldDeclaration.java
@@ -0,0 +1,58 @@
+package protobuf.lang.parser.parsing;
+
+import com.intellij.lang.PsiBuilder;
+import protobuf.lang.parser.util.PbPatchedPsiBuilder;
+
+import static protobuf.lang.PbElementTypes.*;
+
+/**
+ * @author Nikolay Matveev
+ *         Date: Mar 25, 2010
+ */
+public class Proto3FieldDeclaration {
+
+    public static boolean parse(PbPatchedPsiBuilder builder) {
+        if (builder.lookAhead(PROTO3_FIELD_LABELS, GROUP_SET) || builder.lookAhead(GROUP_SET)) {
+            PsiBuilder.Marker messageMarker = builder.mark();
+            builder.match(PROTO3_FIELD_LABELS);
+            builder.match(GROUP);
+            builder.match(IK, "identifier.expected");
+            //builder.matchAs(IK, NAME, "identifier.expected");
+            builder.match(EQUAL, "equal.expected");
+            builder.matchAs(NUM_INT, VALUE, "num.integer.expected");
+            OptionDeclaration.parseOptionList(builder);
+            if (!MessageDeclaration.parseMessageBlock(builder, true)) {
+                builder.error("group.block.expected");
+            }
+            messageMarker.done(GROUP_DECL);
+
+        } else {
+            PsiBuilder.Marker messageMarker = builder.mark();
+            builder.match(PROTO3_FIELD_LABELS);
+            parseType(builder);
+            builder.match(IK, "identifier.expected");
+            //builder.matchAs(IK, NAME, "identifier.expected");
+            builder.match(EQUAL, "equal.expected");
+            builder.matchAs(NUM_INT, VALUE, "num.integer.expected");
+            OptionDeclaration.parseOptionList(builder);
+            builder.match(SEMICOLON, "semicolon.expected");
+            messageMarker.done(FIELD_DECL);
+        }
+        return true;
+    }
+
+    //done
+    public static boolean parseType(PbPatchedPsiBuilder builder) {
+        PsiBuilder.Marker marker = builder.mark();
+        if (builder.match(BUILT_IN_TYPES)) {
+        } else if (ReferenceElement.parseForCustomType(builder)) {
+        } else {
+            marker.drop();
+            return false;
+        }
+        marker.done(FIELD_TYPE);
+        return true;
+    }
+
+    //done
+}
diff --git a/src/protobuf/lang/parser/parsing/SyntaxDeclaration.java b/src/protobuf/lang/parser/parsing/SyntaxDeclaration.java
index 065f7a5..dbefe8d 100644
--- a/src/protobuf/lang/parser/parsing/SyntaxDeclaration.java
+++ b/src/protobuf/lang/parser/parsing/SyntaxDeclaration.java
@@ -13,7 +13,7 @@
  */
 public class SyntaxDeclaration implements PbElementTypes {
 
-    public static boolean parse(PbPatchedPsiBuilder builder) {
+    public static boolean parse(PbPatchedPsiBuilder builder, CompilationUnit.Context parsingContext) {
         if (!builder.compareToken(SYNTAX)) {
             return false;
         }
@@ -22,6 +22,7 @@ public static boolean parse(PbPatchedPsiBuilder builder) {
         builder.match(EQUAL, "equal.expected");
 
         PsiBuilder.Marker valueMarker = builder.mark();
+        parsingContext.setSyntax(builder.getTokenText());
         if (builder.match(STRING_LITERALS)) {
             valueMarker.done(VALUE);
         } else {

From 7f471455d59b55e305990c9f5cdb2e15e772819c Mon Sep 17 00:00:00 2001
From: Maciej Kasprzak <maciej.kasprzak@goeuroc.com>
Date: Sat, 7 Nov 2015 00:33:37 +0100
Subject: [PATCH 2/3] revert misc.xml

---
 .idea/misc.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 261edfe..ca5b6c0 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -260,7 +260,6 @@
       <facet-type id="Scala" />
     </autodetection-disabled>
   </component>
-  <component name="IdProvider" IDEtalkID="656D27171A51E264FCCFBA9F80852878" />
   <component name="IvyIDEA.ProjectSettings">
     <option name="artifactTypeSettings">
       <ArtifactTypeSettings />
@@ -292,7 +291,7 @@
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA IU-139.1603.1" project-jdk-type="IDEA JDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="IDEA 13 SDK" project-jdk-type="IDEA JDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SvnBranchConfigurationManager">

From ff5961bfddd90db957e3f5809c0a0a25015b1efb Mon Sep 17 00:00:00 2001
From: Maciej Kasprzak <maciej.kasprzak@goeuroc.com>
Date: Sat, 7 Nov 2015 00:34:58 +0100
Subject: [PATCH 3/3] revert misc.xml

---
 .idea/misc.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index ca5b6c0..66deecf 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -334,4 +334,5 @@
     </option>
     <option name="mySupportsUserInfoFilter" value="true" />
   </component>
-</project>
\ No newline at end of file
+</project>
+