Merge pull request #9 from vgough/master

allow comments and options within rpc definitions
vihangm · Mar 21, 2016 · 60eb172 · 60eb172
2 parents 962b8e5 + a1d772b
commit 60eb172
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/Protobuf.YAML-tmLanguage b/Protobuf.YAML-tmLanguage
@@ -114,6 +114,7 @@ repository:
       '2': {name: keyword.source.proto}
     end: ;
     patterns:
+    - include: '#comments'
     - include: '#strings'
     - name: storage.type.proto
       match: default|packed|optimize\_for|java\_package|java\_outer\_classname|go\_package|deprecated|lazy|\w+\_api\_version
@@ -142,6 +143,9 @@ repository:
         '5': {name: keyword.source.proto}
         '6': {name: keyword.source.proto}
       end: \}|;
+      patterns:
+      - include: '#comments'
+      - include: '#option'
 
   storagetypes:
     name: storage.type.proto

diff --git a/Protobuf.tmLanguage b/Protobuf.tmLanguage
@@ -331,6 +331,10 @@
 			<string>;</string>
 			<key>patterns</key>
 			<array>
+				<dict>
+					<key>include</key>
+					<string>#comments</string>
+				</dict>
 				<dict>
 					<key>include</key>
 					<string>#strings</string>
@@ -425,6 +429,17 @@
 					</dict>
 					<key>end</key>
 					<string>\}|;</string>
+					<key>patterns</key>
+					<array>
+						<dict>
+							<key>include</key>
+							<string>#comments</string>
+						</dict>
+						<dict>
+							<key>include</key>
+							<string>#option</string>
+						</dict>
+					</array>
 				</dict>
 			</array>
 		</dict>