Improve sub-expression handling.

.sublime-build

@@ -1,7 +1,7 @@
 {
     "target": "convert_file",
+    "source": "json",
     "target_format": "plist",
     "ext": "tmLanguage",
-
     "selector": "Handlebars.json"
 }

grammars/Handlebars.json

@@ -631,7 +631,7 @@
             ]
         },
         "else_token": {
-            "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\./]+))?",
+            "begin": "(\\{\\{)(~?else)(@?\\s(if)\\s([-a-zA-Z0-9_\\.\\(\\s\\)/]+))?",
             "end": "(~?\\}\\}\\}*)",
             "name": "meta.function.inline.else.handlebars",
             "beginCaptures": {

grammars/Handlebars.tmLanguage

@@ -242,7 +242,7 @@
 		<key>else_token</key>
 		<dict>
 			<key>begin</key>
-			<string>(\{\{)(~?else)(@?\s(if)\s([-a-zA-Z0-9_\./]+))?</string>
+			<string>(\{\{)(~?else)(@?\s(if)\s([-a-zA-Z0-9_\.\(\s\)/]+))?</string>
 			<key>beginCaptures</key>
 			<dict>
 				<key>1</key>

test/template.handlebars

@@ -78,6 +78,8 @@
 <p>First</p>
 {{else if alternate}}
 <p>Second</p>
+{{else if (sub-exp this.message)}}
+<p>Third</p>
 {{/if}}
 
 {{#x-card onsubmit=attrs.onsubmit title='Login to Peepchat' buttonText='Login'}}