Beef up interpolation

Author: chenglou

ReScript.sublime-syntax

@@ -99,15 +99,7 @@ contexts:
             # TODO: will need expression
             - include: operator
             - include: punctuations
-        - match: (\$)
-          captures:
-            1: punctuation.section.interpolation
-          push:
-            - clear_scopes: 1
-            - match: '{{RE_IDENT}}'
-              pop: true
-            - match: '(?=\S)'
-              pop: true
+            - include: string
         - match: '`'
           scope: punctuation.definition.string.end
           pop: true

syntax_test.res

@@ -46,11 +46,10 @@ let str = `hi`
 //           ^ string.quoted.other punctuation.definition.string.end
 let interp = j`hello $bla bye`
 //           ^ string.quoted.other variable.annotation
-//                   ^ punctuation.section.interpolation
-//                    ^^^ source.res
+//                   ^^^^ source.res
 //                       ^^^^^ string.quoted.other
 let interp = j`hello $1 bye`
-//                    ^^^^^^ string.quoted.other
+//                   ^^^^^^^ string.quoted.other
 let interp = j`hi ${world.bla->b(a)} bye`
 //            ^ string.quoted.other punctuation.definition.string.begin
 //             ^^^ string.quoted.other
@@ -61,7 +60,17 @@ let interp = j`hi ${world.bla->b(a)} bye`
 //                                 ^ punctuation.section.interpolation.end
 //                                   ^^^ string.quoted.other
 //                                      ^ string.quoted.other punctuation.definition.string.end
-
+let asd = `a${hello(`world ${hi} bye`)}b$`
+//            ^^^^^^ source.res
+//                  ^ string.quoted.other punctuation.definition.string.begin
+//                   ^^^^^^ string.quoted.other
+//                         ^^ punctuation.section.interpolation.begin
+//                           ^^ source.res
+//                             ^ punctuation.section.interpolation.end
+//                              ^^^^^ string.quoted.other
+//                                    ^ punctuation.section.interpolation.end
+//                                     ^^ string.quoted.other
+//                                       ^ string.quoted.other punctuation.definition.string.end
 
 // === numbers