Merge pull request #1 from herolover/master

Fixed highlighting of Allman style.
vihangm · Apr 6, 2015 · ac83fe0 · ac83fe0
2 parents 3fb26ef + 4585b55
commit ac83fe0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Protobuf.JSON-tmLanguage b/Protobuf.JSON-tmLanguage
@@ -22,7 +22,7 @@
  "match": "\\b(double|float|int32|int64|uint32|uint64|sint32|sint64|fixed32|fixed64|sfixed32|sfixed64|bool|string|bytes)\\b"
  },
  "enum": {
- "begin": "(enum)(\\s+)([A-Za-z][A-Za-z0-9_]*)(\\s*)(\\{)",
+ "begin": "(enum)(\\s+)([A-Za-z][A-Za-z0-9_]*)(\\s*)(\\{)?",
  "beginCaptures": {
  "1": { "name": "keyword.source.proto" },
  "3": { "name": "entity.name.class.proto" }
@@ -45,7 +45,7 @@
  ]
  },
  "message": {
- "begin": "(message|extend)(\\s+)([A-Za-z][A-Za-z0-9_.]*)(\\s*)(\\{)",
+ "begin": "(message|extend)(\\s+)([A-Za-z][A-Za-z0-9_.]*)(\\s*)(\\{)?",
  "beginCaptures": {
  "1": { "name": "keyword.source.proto" },
  "3": { "name": "entity.name.class.proto" }
@@ -124,7 +124,7 @@
  "name": "string.quoted.double.proto"
  },
  "oneof": {
- "begin": "(oneof)(\\s+)([A-Za-z][A-Za-z0-9_]*)(\\s*)(\\{)",
+ "begin": "(oneof)(\\s+)([A-Za-z][A-Za-z0-9_]*)(\\s*)(\\{)?",
  "beginCaptures": {
  "1": {
  "name": "keyword.source.proto"

diff --git a/Protobuf.YAML-tmLanguage b/Protobuf.YAML-tmLanguage
@@ -41,7 +41,7 @@ repository:
  match: \b(true|false|max)\b
 
  enum:
- begin: (enum)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)
+ begin: (enum)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)?
  beginCaptures:
  '1': {name: keyword.source.proto}
  '3': {name: entity.name.class.proto}
@@ -57,7 +57,7 @@ repository:
  '5': {name: constant.numeric.proto}
 
  message:
- begin: (message|extend)(\s+)([A-Za-z][A-Za-z0-9_.]*)(\s*)(\{)
+ begin: (message|extend)(\s+)([A-Za-z][A-Za-z0-9_.]*)(\s*)(\{)?
  beginCaptures:
  '1': {name: keyword.source.proto}
  '3': {name: entity.name.class.proto}
@@ -88,7 +88,7 @@ repository:
  - include: '#constants'
 
  oneof:
- begin: (oneof)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)
+ begin: (oneof)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)?
  beginCaptures:
  '1': {name: keyword.source.proto}
  end: \}

diff --git a/Protobuf.tmLanguage b/Protobuf.tmLanguage
@@ -87,7 +87,7 @@
  <key>enum</key>
  <dict>
  <key>begin</key>
- <string>(enum)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)</string>
+ <string>(enum)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)?</string>
  <key>beginCaptures</key>
  <dict>
  <key>1</key>
@@ -141,7 +141,7 @@
  <key>message</key>
  <dict>
  <key>begin</key>
- <string>(message|extend)(\s+)([A-Za-z][A-Za-z0-9_.]*)(\s*)(\{)</string>
+ <string>(message|extend)(\s+)([A-Za-z][A-Za-z0-9_.]*)(\s*)(\{)?</string>
  <key>beginCaptures</key>
  <dict>
  <key>1</key>
@@ -248,7 +248,7 @@
  <key>oneof</key>
  <dict>
  <key>begin</key>
- <string>(oneof)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)</string>
+ <string>(oneof)(\s+)([A-Za-z][A-Za-z0-9_]*)(\s*)(\{)?</string>
  <key>beginCaptures</key>
  <dict>
  <key>1</key>