Interpolation, poly variant spread, parens fixes

Author: chenglou

README.md

@@ -2,18 +2,31 @@
 
 The official Sublime Text plugin for ReScript.
 
+## Prerequisite
+
+`bs-platform 8.2.0` installed locally in your project.
+
 ## Install
 
 Get it from https://packagecontrol.io/packages/ReScript
 
 ## Features
 
-- Highlighting
-- Formatting: Command Palette (`cmd-shift-p`) -> ReScript: Format File
+- Syntax highlighting (`.res`, `.resi`).
+- Formatting: Command Palette (`cmd-shift-p`) -> ReScript: Format File. caveats:
+  - Currently requires the file to be part of a ReScript project, i.e. with a `bsconfig.json`.
+  - Cannot be a temporary file.
+
+## Upcoming Features
+
+- Syntax errors diagnosis (only after formatting).
+- Formatting of temporary files
+- Formatting of files outside of a ReScript project root
+- Type diagnosis
 
 ## Config
 
-- Command Palette -> UI: Select Color Scheme. Use Mariana for best effects. Or try another one and tell us. Mariana colors tokens distinctively (and still pleasantly) enough for module and variant to be visually distinct despite both being capitalized. Gotta have accurate highlighting!
+- Command Palette -> UI: Select Color Scheme. Use **Mariana** for best effects (it'll be the new default Sublime Text theme!). Mariana colors tokens distinctively (and still pleasantly) enough for module and variant to be visually distinct despite both being capitalized. Gotta have accurate highlighting!
 
 <!-- - Open this repo's `Default.sublime-settings`, put in the absolute path to the formatter exe in `optionalGlobalFormatter`. -->
 

ReScript.sublime-syntax

@@ -86,7 +86,27 @@ contexts:
         2: punctuation.definition.string.begin
       push:
         # different than reason-highlightjs, for now
+        # interpolation
         - meta_scope: string.quoted.other
+        - match: \${
+          scope: punctuation.section.interpolation.begin
+          push:
+            - clear_scopes: 1
+            - match: \}
+              scope: punctuation.section.interpolation.end
+              pop: true
+            # 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
         - match: '`'
           scope: punctuation.definition.string.end
           pop: true
@@ -122,9 +142,10 @@ contexts:
       # variant and modules confused
       # scope: entity.name.union
       scope: variable.function variable.other
-    - match: '(#)[a-zA-Z][0-9a-zA-Z_]*\b'
+    - match: '(#)(\.\.\.)?[a-zA-Z][0-9a-zA-Z_]*\b'
       captures:
         1: punctuation.definition.keyword
+        2: punctuation.definition.keyword
 
   array:
     - match: '\['
@@ -209,9 +230,9 @@ contexts:
   functorParameter:
     - match: \(
       push: functorParameter
-      scope: punctuation.section.braces.begin
+      scope: punctuation.section.parens.begin
     - match: \)
-      scope: punctuation.section.braces.end
+      scope: punctuation.section.parens.end
       pop: true
     - include: moduleAccessEndsWithModule
     - include: main

syntax_test.res

@@ -107,6 +107,10 @@ let getCenterCoordinates = (aBla, doHello, ~b=1, ~c, ()) => {
   (x, y)
 }
 
+ a->b(c)->Some
+//^^ keyword.operator
+//      ^^ keyword.operator
+
 type profession = Teacher | Director
 //                ^ source.res
 /* test */
@@ -141,12 +145,12 @@ module Bla = Belt.Map.Make(Bar({type t let a:b = "cc"}))
 //     ^ source.res entity.name.namespace
 //           ^ source.res entity.name.namespace
 //                    ^ source.res entity.name.namespace
-//                        ^ source.res punctuation.section.braces.begin
+//                        ^ source.res punctuation.section.parens.begin
 //                         ^ source.res entity.name.namespace
-//                            ^ source.res punctuation.section.braces.begin
+//                            ^ source.res punctuation.section.parens.begin
 //                              ^ source.res storage.type
-//                                                    ^ source.res punctuation.section.braces.end
-//                                                     ^ source.res punctuation.section.braces.end
+//                                                    ^ source.res punctuation.section.parens.end
+//                                                     ^ source.res punctuation.section.parens.end
 module SetOfIntPairs: Foo = MakeSet(IntPair)
 //                    ^ source.res entity.name.namespace
 //                          ^ source.res entity.name.namespace
@@ -269,20 +273,31 @@ let jsx = <div className="foo">
 </div>
 
 
-// Invalid tests
 let \"a b" = c
-let nope = `hi`
-//         ^ source.res string.quoted.other punctuation.definition.string.begin
-//          ^^ source.res string.quoted.other
-//            ^ source.res string.quoted.other punctuation.definition.string.end
-let nope2 = j`hi`
-//          ^ source.res string.quoted.other variable.annotation
-//           ^ source.res string.quoted.other punctuation.definition.string.begin
-//            ^^ source.res string.quoted.other
-//              ^ source.res string.quoted.other punctuation.definition.string.end
+let str = `hi`
+//        ^ source.res string.quoted.other punctuation.definition.string.begin
+//         ^^ source.res string.quoted.other
+//           ^ source.res string.quoted.other punctuation.definition.string.end
+let interp = j`hello $bla bye`
+//                   ^ punctuation.section.interpolation
+//                    ^^^ source.res
+//                       ^^^^^ string.quoted.other
+let interp = j`hello $1 bye`
+//                    ^^^^^^ string.quoted.other
+let interp = j`hello ${world.bla->b(a)} bye`
+//            ^ source.res string.quoted.other punctuation.definition.string.begin
+//             ^ source.res string.quoted.other
+//                   ^^ source.res punctuation.section.interpolation.begin
+//                          ^ punctuation.accessor
+//                              ^^ keyword.operator
+//                                 ^ punctuation.section.parens.begin
+//                                    ^ punctuation.section.interpolation.end
+//                                      ^^^ string.quoted.other
+//                                         ^ string.quoted.other punctuation.definition.string.end
 let variant = #foo
 //            ^ source.res punctuation.definition.keyword
-type a = option<bar>
+let #...foo = bar
+//  ^^^^ punctuation.definition.keyword
 
    @foo(bar) let a = 1
 // ^ source.res meta.annotation punctuation.definition.annotation