From b55d973f947e2bc570dd7b184a53b2658aef69fb Mon Sep 17 00:00:00 2001
From: Alexandre Borela <alexandre.borela@gmail.com>
Date: Tue, 20 Feb 2018 20:39:49 -0300
Subject: [PATCH] [FJSX15] Fix expressions inside parenthesis

---
 syntaxes/fjsx15/expression.sublime-syntax | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/syntaxes/fjsx15/expression.sublime-syntax b/syntaxes/fjsx15/expression.sublime-syntax
index bcb18330..34d3a1e9 100644
--- a/syntaxes/fjsx15/expression.sublime-syntax
+++ b/syntaxes/fjsx15/expression.sublime-syntax
@@ -111,17 +111,15 @@ contexts:
     - include: comment-no-pop
     # Close the current expression group.
     - include: close-group
-    # Comma operator.
-    - match: (?=,)
-      push: comma
     # Type cast.
     - match: (?=:)
       set: [ close-group, type-cast ]
-    # Arrow functions need to be detect before expression groups.
-    - include: Packages/Naomi/syntaxes/fjsx15/arrow-function.no-pop.sublime-syntax
-    # Start of the expression.
-    - match: (?=\S)
-      push: [ optional-tail, head ]
+    # Other expressions.
+    - match: ""
+      push:
+        - include: main
+        - match: ""
+          pop: true
 
   optional-tail:
     - include: comment-no-pop