Merge pull request #33 from rescript-lang/upgrade-rescript-vscode-107

Upgrade to rescript-vscode 1.0.7

Author: ryyppy

CHANGELOG.md

@@ -4,11 +4,13 @@
 
 **Improvements:**
 
+- Upgrade to `rescript-vscode@1.7.0` (see changes [here](https://github.com/rescript-lang/rescript-vscode/blob/master/CHANGELOG.md#107))
+  - Please note that auto-completetion for `@` / `->` / `~` is not implemented yet
 - Improved syntax highlighting for polyvariants [#31](https://github.com/rescript-lang/vim-rescript/pull/31)
 
 **Bugfixes:**
 
-- Fix an issue that causes the plugin to change cwd (e.g. in a monorepo setup) [#32](https://github.com/rescript-lang/vim-rescript/pull/32)
+- Fix an issue that causes the plugin to change cwd for the whole vim instance (e.g. in a monorepo setup) [#32](https://github.com/rescript-lang/vim-rescript/pull/32)
 
 ## 1.3.0
 

rescript-vscode/extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Language="en-US" Id="rescript-vscode" Version="1.0.6" Publisher="chenglou92"/>
+    <Identity Language="en-US" Id="rescript-vscode" Version="1.0.7" Publisher="chenglou92"/>
     <DisplayName>rescript-vscode</DisplayName>
     <Description xml:space="preserve">The official VSCode plugin for ReScript.</Description>
     <Tags>rescript,language-server,snippet,json,ReScript,__ext_res,__ext_resi</Tags>

rescript-vscode/extension/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 1.0.7
+
+Fixes:
+- Highlighting for some decorators and keywords.
+- Diagnostics display for long lines.
+- Various hover & autocomplete opportunities.
+
+Features:
+- Autocomplete for `->` pipe!
+- Autocomplete for decorators such as `@module` and `@val` and `@deprecated`.
+- Autocomplete for labels `func(~...)`.
+- Support for the upcoming `rescript` npm package.
+
 ## 1.0.6
 
 Fixes:

rescript-vscode/extension/README.md

@@ -6,7 +6,7 @@ The official VSCode plugin for ReScript.
 
 ## Prerequisite
 
-You **must** have `bs-platform 8.3.3` installed locally in your project, through the usual [npm installation](https://rescript-lang.org/docs/manual/latest/installation#integrate-into-existing-js-project). Older versions are not guaranteed to work.
+You **must** have `bs-platform >=8.3.3` installed locally in your project, through the usual [npm installation](https://rescript-lang.org/docs/manual/latest/installation#integrate-into-existing-js-project). Older versions are not guaranteed to work.
 
 ## Recommendation
 
@@ -38,9 +38,9 @@ The plugin activates on `.res` and `.resi` files. If you've already got Reason-L
 - Formatting, with caveats:
   - Currently requires the file to be part of a ReScript project, i.e. with a `bsconfig.json`.
   - Cannot be a temporary file.
-- Syntax errors diagnosis (only after formatting).
+- Build diagnostics.
 - Built-in bsb watcher (optional, and exposed explicitly as a pop-up; no worries of dangling build).
-- Type hint.
+- Type hint hover.
 - Jump to location.
 - Autocomplete.
 - Snippets to ease a few syntaxes:

rescript-vscode/extension/grammars/rescript.tmLanguage.json

@@ -15,7 +15,7 @@
     },
     "RE_KEYWORDS": {
       "name": "keyword.control",
-      "match": "\\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"
+      "match": "\\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": {
       "name": "constant.language",
@@ -230,7 +230,7 @@
         }
       ]
     },
-    "array": {
+    "bracketAccess": {
       "patterns": [
         {
           "match": "\\[",
@@ -261,57 +261,40 @@
         }
       ]
     },
-    "objectAccess": {
-      "patterns": [
-        {
-          "match": "\\b[a-z_][0-9a-zA-Z_]*(\\[)",
-          "captures": {
-            "1": {
-              "name": "punctuation.section.brackets.begin"
-            }
-          }
-        },
-        {
-          "match": "\\]",
-          "name": "punctuation.section.brackets.end"
-        }
-      ]
-    },
     "attribute": {
       "patterns": [
         {
-          "match": "(@)(splice)",
+          "match": "(%%?|@@?)([A-Za-z_][A-Za-z0-9_\\.]*)",
           "captures": {
             "1": {
               "name": "storage.modifier punctuation.definition.annotation"
             },
             "2": {
-              "name": "invalid.illegal"
-            }
-          }
-        },
-        {
-          "match": "(@@?)(bs\\.)?([A-Za-z_][A-Za-z0-9_\\.]*)",
-          "captures": {
-            "1": {
-              "name": "storage.modifier punctuation.definition.annotation"
-            },
-            "2": {
-              "name": "invalid.deprecated"
-            },
-            "3": {
-              "name": "variable.annotation"
-            }
-          }
-        },
-        {
-          "match": "(%%?)([A-Za-z_][A-Za-z0-9_\\.]*)",
-          "captures": {
-            "1": {
-              "name": "storage.modifier punctuation.definition.annotation"
-            },
-            "2": {
-              "name": "variable.annotation"
+              "patterns": [
+                {
+                  "match": "bs\\.send\\.pipe",
+                  "name": "invalid.deprecated"
+                },
+                {
+                  "match": "splice",
+                  "name": "invalid.illegal"
+                },
+                {
+                  "match": "(bs\\.)?([A-Za-z_][A-Za-z0-9_\\.]*)",
+                  "captures": {
+                    "1": {
+                      "name": "invalid.deprecated"
+                    },
+                    "2": {
+                      "name": "variable.annotation"
+                    }
+                  }
+                },
+                {
+                  "match": "[A-Za-z_][A-Za-z0-9_\\.]*",
+                  "name": "variable.annotation"
+                }
+              ]
             }
           }
         }
@@ -461,10 +444,7 @@
       "include": "#list"
     },
     {
-      "include": "#objectAccess"
-    },
-    {
-      "include": "#array"
+      "include": "#bracketAccess"
     },
     {
       "include": "#jsx"

rescript-vscode/extension/package.json

@@ -3,7 +3,7 @@
 	"description": "The official VSCode plugin for ReScript.",
 	"author": "chenglou",
 	"license": "MIT",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/rescript-lang/rescript-vscode"