README.md

@@ -4,7 +4,8 @@ The official Sublime Text plugin for ReScript.
 
 ## Prerequisite
 
-`bs-platform 8.2.0` installed locally in your project.
+- `>=0.0.9` requires `bs-platform >=8.3.0` installed locally in your project.
+- `0.0.8` requires `bs-platform 8.2.0` installed locally in your project.
 
 ## Install
 
@@ -16,6 +17,9 @@ Get it from https://packagecontrol.io/packages/ReScript
 - 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.
+- Snippets to ease a few syntaxes:
+  - `external` features such as `@bs.module` and `@bs.val`
+  - `try`, `for`, etc.
 
 ## Upcoming Features
 

ReScript.sublime-syntax

@@ -13,7 +13,7 @@ variables:
 
   # slightly different than reason-highlightjs
   RE_KEYWORDS:
-    \b(and|as|assert|begin|class|constraint|done|downto|exception|external|fun|functor|inherit|lazy|let|pub|mutable|new|nonrec|object|of|or|pri|rec|then|to|val|virtual|try|catch|finally|do|else|for|if|switch|while|import|library|export|module|in|raise|private)\b
+    \b(and|as|assert|constraint|downto|else|exception|external|false|for|if|in|include|lazy|let|module|mutable|of|open|rec|switch|to|true|try|type|when|while|with)\b
   RE_LITERAL: \b(true|false)\b
 
 contexts:
@@ -31,12 +31,13 @@ contexts:
       scope: punctuation.definition.comment.begin
       push:
         - meta_scope: comment.block
+        - include: commentBlock
         - match: \*/
           scope: punctuation.definition.comment.end
           pop: true
 
   punctuations:
-    - match: ~
+    - match: \~
       scope: punctuation.definition.keyword
     - match: ;
       scope: punctuation.terminator
@@ -98,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
@@ -120,34 +113,44 @@ contexts:
     - match: '''[\x00-\x7F]'''
       scope: string.quoted.single
 
+  typeParameter:
+    - match: '''[A-Za-z][A-Za-z0-9_]*'
+      scope: support.type
+
   number:
     - match:
         \b(0[xX][a-fA-F0-9_]+[Lln]?|0[oO][0-7_]+[Lln]?|0[bB][01_]+[Lln]?|[0-9][0-9_]*([Lln]|(\.[0-9_]+)?([eE][-+]?[0-9_]+)?)?)\b
       scope: constant.numeric
 
   operator:
     - match:
-        '->|\|\||&&|\+\+|\*\*|\+\.|\+|-\.|-|\*\.|\*|/\.|/|\.\.\.|\.\.|\|>|===|==|\^|:=|!|>=|<='
-      scope: keyword.operator
-
-  assignment:
-    - match: '='
-      scope: keyword.operator.assignment
+        '->|\|\||&&|\+\+|\*\*|\+\.|\+|-\.|-|\*\.|\*|/\.|/|\.\.\.|\.\.|\|===|==|\^|:=|!|>=(?! *\?)|<=|='
+      # gotta add `keyword` to this scope. This file is synced with our vscode
+      # textmate grammar too, and many themes there don't highlight
+      # `keyword.operator`. So we'll highlight them as `keyword`
+      scope: keyword.operator keyword
+    - match: '\|>'
+      scope: invalid.deprecated
 
   # doesn't contain ` unlike reason-highlightjs
   constructor:
     - match: '\b[A-Z][0-9a-zA-Z_]*\b'
       # won't mark and highlight this for now. This often shares the same
-      # highlighting as entity.name.namespace (our module). We don't want
+      # highlighting as entity.name.namespace our module). We don't want
       # 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
+        # see comment above
+        3: variable.function variable.other
+    - match: '(#)'
+      captures:
+        1: punctuation.definition.keyword
 
-  array:
+  bracketAccess:
     - match: '\['
       scope: punctuation.section.brackets.begin
     - match: '\]'
@@ -161,15 +164,6 @@ contexts:
     - match: '\}'
       scope: punctuation.section.braces.end
 
-  objectAccess:
-    - match: '\b{{RE_IDENT}}(\[)'
-      captures:
-        # technically this should be punctuation.accessor. But we don't wrap
-        # the section, so we'll just conform to list and array brackets
-        1: punctuation.section.brackets.begin
-    - match: '\]'
-      scope: punctuation.section.brackets.end
-
   attribute:
     - match: '@@?'
       scope: storage.modifier punctuation.definition.annotation
@@ -179,13 +173,16 @@ contexts:
       push: attributeContent
   attributeContent:
     - meta_scope: meta.annotation
-    # - match: '{{RE_ATTRIBUTE}} *\('
-    #   scope: variable.annotation
-    #   push:
-    #     - match: \)
-    #     pop: true
-    - match: '{{RE_ATTRIBUTE}}'
-      scope: variable.annotation
+    - match: 'bs\.send\.pipe'
+      scope: invalid.deprecated
+      pop: true
+    - match: 'splice'
+      scope: invalid.illegal
+      pop: true
+    - match: '(bs\.)?({{RE_ATTRIBUTE}})'
+      captures:
+        1: invalid.deprecated
+        2: variable.annotation
       pop: true
 
   jsx:
@@ -203,7 +200,7 @@ contexts:
       push: moduleAccessEndsWithModuleThenPop
 
   openOrIncludeModule:
-    - match: '\b(open|include)\s*'
+    - match: '\b(open|include)\s+'
       scope: keyword
       push: moduleAccessEndsWithModuleThenPop
 
@@ -234,6 +231,9 @@ contexts:
     - match: \)
       scope: punctuation.section.parens.end
       pop: true
+    - match: \{
+      scope: punctuation.section.braces.begin
+      push: moduleInner
     - include: moduleAccessEndsWithModule
     - include: main
 
@@ -265,7 +265,8 @@ contexts:
           captures:
             1: punctuation.section.braces.begin
           push: moduleInner
-        - match: '='
+        - match: '=[^\S]'
+          scope: keyword.operator keyword
           set: moduleRHS
         - match: '(?=\S)'
           pop: true
@@ -283,15 +284,14 @@ contexts:
     - include: commentLine
     - include: commentBlock
     - include: character
+    - include: typeParameter
     - include: string
     - include: attribute
     - include: function
     - include: list
-    - include: objectAccess
-    - include: array
+    - include: bracketAccess
     - include: jsx
     - include: operator
-    - include: assignment
     - include: number
     - include: openOrIncludeModule
     - include: moduleDeclaration

format.py

@@ -109,9 +109,9 @@ def parseBsbLogOutput(content):
   # map of file path to list of diagnosis
   for diagnosisLines in res:
     fileAndLocation, *diagnosisMessage = diagnosisLines
-    lastSpace = fileAndLocation.rfind(" ")
+    lastSpace = fileAndLocation.find(":")
     file = fileAndLocation[2:lastSpace]
-    location = fileAndLocation[lastSpace:]
+    location = fileAndLocation[lastSpace + 1:]
     if not file in ret:
       ret[file] = []
     cleanedUpDiagnosis = "\n".join([line[2:] for line in diagnosisMessage]).strip()

snippets/external-global-module.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+  <content><![CDATA[
+@val external ${1:setTimeout}: ${2:(unit => unit, int) => float} = "${3:setTimeout}"]]></content>
+  <tabTrigger>external</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/external-global-object.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+  <content><![CDATA[
+@val external ${1:setTimeout}: ${2:(unit => unit, int) => float} = "${3:setTimeout}"]]></content>
+  <tabTrigger>external</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/external-js-module-default.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+  <content><![CDATA[
+@module external ${1:leftPad}: ${2:(string, int) => string} = "${3:leftPad}"]]></content>
+  <tabTrigger>external</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/external-js-module.sublime-snippet

@@ -0,0 +1,6 @@
+<snippet>
+  <content><![CDATA[
+@scope("${1:Math}") @val external ${2:random}: ${3:unit => float} = "${4:random}"]]></content>
+  <tabTrigger>external</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/for-loop.sublime-snippet

@@ -0,0 +1,9 @@
+<snippet>
+  <content><![CDATA[
+for ${1:i} in ${2:startValueInclusive} to ${3:endValueInclusive} {
+  ${4:Js.log(${1:i})}
+}
+]]></content>
+  <tabTrigger>for</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/for-reverse.sublime-snippet

@@ -0,0 +1,9 @@
+<snippet>
+  <content><![CDATA[
+for ${1:i} in ${2:startValueInclusive} downto ${3:endValueInclusive} {
+  ${4:Js.log(${1:i})}
+}
+]]></content>
+  <tabTrigger>for</tabTrigger>
+  <scope>source.res</scope>
+</snippet>

snippets/mod.sublime-snippet → snippets/module.sublime-snippet

@@ -1,9 +1,9 @@
 <snippet>
   <content><![CDATA[
 module ${1:Name} = {
-  ${2:/* Module contents */}
+  ${2:// Module contents}
 }
 ]]></content>
-  <tabTrigger>mod</tabTrigger>
+  <tabTrigger>module</tabTrigger>
   <scope>source.res</scope>
 </snippet>

snippets/switch.sublime-snippet

@@ -1,8 +1,8 @@
 <snippet>
   <content><![CDATA[
-switch ${1:subject} {
-| ${2:option1} => ${3:expression}
-${4:| ${5:option2} => ${6:expression}}
+switch ${1:value} {
+| ${2:pattern1} => ${3:expression}
+${4:| ${5:pattern2} => ${6:expression}}
 }
 ]]></content>
   <tabTrigger>switch</tabTrigger>