Support for rescript 9.1.1 with changed location of binaries

autoload/rescript.vim

@@ -26,7 +26,12 @@ endfunction
 " bs-platform setups
 function! rescript#UpdateProjectEnv()
   " Looks for the nearest node_modules directory
-  let l:res_bin_dir = finddir('node_modules/bs-platform/', ".;") . s:rescript_arch
+  let l:res_bin_dir = finddir('node_modules/rescript/', ".;") . s:rescript_arch
+
+  if l:res_bin_dir == s:rescript_arch
+    " look for bs-platform if rescript node module not found
+    let l:res_bin_dir = finddir('node_modules/bs-platform/', ".;") . s:rescript_arch
+  endif
 
   "if !exists("g:rescript_compile_exe")
   let g:rescript_compile_exe = getcwd() . "/" . l:res_bin_dir . "/bsc.exe"

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.7" Publisher="chenglou92"/>
+    <Identity Language="en-US" Id="rescript-vscode" Version="1.0.8" 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,8 +1,15 @@
+## 1.0.8
+Fixes:
+- Diagnostics display for long lines.
+
+Features:
+- Full support for the newest `rescript` npm package!
+- Highlight type parameters.
+
 ## 1.0.7
 
 Fixes:
 - Highlighting for some decorators and keywords.
-- Diagnostics display for long lines.
 - Various hover & autocomplete opportunities.
 
 Features:

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

@@ -188,6 +188,14 @@
         }
       ]
     },
+    "typeParameter": {
+      "patterns": [
+        {
+          "match": "'[A-Za-z][A-Za-z0-9_]*",
+          "name": "support.type"
+        }
+      ]
+    },
     "number": {
       "patterns": [
         {
@@ -431,6 +439,9 @@
     {
       "include": "#character"
     },
+    {
+      "include": "#typeParameter"
+    },
     {
       "include": "#string"
     },

rescript-vscode/extension/package.json

@@ -3,7 +3,7 @@
 	"description": "The official VSCode plugin for ReScript.",
 	"author": "chenglou",
 	"license": "MIT",
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/rescript-lang/rescript-vscode"
@@ -99,7 +99,8 @@
 		]
 	},
 	"scripts": {
-		"vscode:prepublish": "npm run compile",
+		"clean": "rm -r client/out server/out",
+		"vscode:prepublish": "npm run clean && npm run compile",
 		"compile": "tsc -b",
 		"watch": "tsc -b -w",
 		"postinstall": "cd client && npm install && cd ../server && npm install && cd ..",