Fix regressions

borela · Oct 25, 2017 · 447ba07 · 447ba07
1 parent f64aba6
commit 447ba07
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/syntaxes/fjsx15/class.sublime-syntax b/syntaxes/fjsx15/class.sublime-syntax
@@ -47,7 +47,7 @@ contexts:
           keyword.other.inherit.js.fjsx15
       push: [
         optional-template-arguments,
-        extended-class
+        extended-class-or-namespace
       ]
     # Identifier.
     - match: |
@@ -73,7 +73,8 @@ contexts:
     - match: ""
       pop: true
 
-  extended-class:
+  extended-class-or-namespace:
+    - include: Packages/Naomi/syntaxes/fjsx15/flowtype/namespace-path.no-pop.sublime-syntax
     - match: |
         (?xi)
         \s*({{commonIdentifier}})

diff --git a/syntaxes/fjsx15/function-call.sublime-syntax b/syntaxes/fjsx15/function-call.sublime-syntax
@@ -45,11 +45,7 @@ contexts:
           \s*{{templateArguments}}
           \s*\(
         )
-      set: [
-        arguments,
-        template-arguments,
-        name
-      ]
+      set: name
     # Simple function call.
     - match: |
         (?xi)
@@ -70,17 +66,25 @@ contexts:
         1: >-
           support.js.fjsx15
           entity.name.function.js.fjsx15
-      set: support-arguments
+      set: [
+        support-arguments,
+        possible-template-arguments
+      ]
     # Identifier.
     - match: |
         (?xi)
         \s*({{commonIdentifier}})
       captures:
         1: entity.name.function.js.fjsx15
-      set: arguments
+      set: [
+        arguments,
+        possible-template-arguments
+      ]
 
-  template-arguments:
+  possible-template-arguments:
     - include: Packages/Naomi/syntaxes/fjsx15/flowtype/template/arguments.sublime-syntax
+    - match: ""
+      pop: true
 
   arguments:
     - include: Packages/Naomi/syntaxes/fjsx15/function-call/arguments.sublime-syntax

diff --git a/syntaxes/fjsx15/literal/number.sublime-syntax b/syntaxes/fjsx15/literal/number.sublime-syntax
@@ -19,7 +19,7 @@ scope: ...
 
 variables:
   literalDecimal: |
-    [0-9_]+
+    [0-9][0-9_]*
 
   literalFloat: |
     (?> [0-9]*[.]{{literalDecimal}}