Rescript package compat

.gitignore

@@ -30,13 +30,14 @@ node_modules
 test/**/*.js
 doc/tags
 
-!rescript-vscode/extension/node_modules
-!rescript-vscode/extension/server/node_modules/
-!rescript-vscode/extension/server/darwin/rescript-editor-support.exe
-!rescript-vscode/extension/server/linux/rescript-editor-support.exe
-!rescript-vscode/extension/server/win32/rescript-editor-support.exe
+# We don't need that file
+server/analysis_binaries/README.md
 
-rescript-vscode/extension/server/node_modules/.bin/
+# We need to vendor node_modules and all the executables
+!server/node_modules/
+!server/analysis_binaries/darwin-run.exe
+!server/analysis_binaries/linux-run.exe
+!server/analysis_binaries/win32-run.exe
 
 examples/**/node_modules
 examples/**/lib

CHANGELOG.md

@@ -2,6 +2,34 @@
 
 ## master
 
+**Improvements:**
+
+- Add support for the new `rescript` npm package. This version will handle both, `bs-platform` and `rescript` projects.
+  - Tip: Running `:RescriptInfo` will show you if the plugin is running in `legacy` (`bsc.exe` / `bsb.exe`) or `modern` (`rescript.exe`) mode
+- Updated vendored rescript-vscode server to `1.1.1` (see changes [here](https://github.com/rescript-lang/rescript-vscode/blob/master/CHANGELOG.md#110))
+
+**Breaking Changes:**
+
+We slimmed down our vendored LSP code and changed the binary paths. Within your `CocConfig`, change your server path accordingly:
+
+```diff
+"languageserver": {
+  "rescript": {
+    "enable": true,
+-   "module": "~/.config/nvim/plugged/vim-rescript/rescript-vscode/extension/server/out/server.js",
++   "module": "~/.config/nvim/plugged/vim-rescript/server/out/server.js",
+    "args": ["--node-ipc"],
+    "filetypes": ["rescript"],
+    "rootPatterns": ["bsconfig.json"]
+  }
+}
+```
+
+We also renamed the following plugin commands:
+
+- `:RescriptBuildWorld` to `:RescriptBuildWithDeps`
+- `:RescriptCleanWorld` to `:RescriptBuildWithDeps`
+
 ## 1.4.0
 
 **Improvements:**

CONTRIBUTING.md

@@ -68,16 +68,16 @@ We are currently vendoring rescript-vscode to provide all the binaries + LSP for
 First, `curl` the tagged zip bundle from the `rescript-vscode` GH releases:
 
 ```
-curl -L https://github.com/rescript-lang/rescript-vscode/releases/download/1.0.0/rescript-vscode-1.0.0.vsix -o rescript-vscode-1.0.0.zip
+curl -L https://github.com/rescript-lang/rescript-vscode/releases/download/1.1.1/rescript-vscode-1.1.1.vsix -o rescript-vscode-1.1.1.zip
 ```
 
 Unzip it and replace the `rescript-vscode` directory. Like this:
 
 ```
-unzip rescript-vscode-1.0.0.zip -d rescript-vscode-1.0.0
-rm -rf rescript-vscode
+unzip rescript-vscode-1.1.1.zip -d rescript-vscode-1.1.1
+rm -rf server
 
-mv rescript-vscode-1.0.0 rescript-vscode
+mv rescript-vscode-1.1.1/extension/server server
 ```
 
 Lastly:

README.md

@@ -69,7 +69,7 @@ After the installation, open your coc config (`:CocConfig`) and add the followin
 "languageserver": {
   "rescript": {
     "enable": true,
-    "module": "~/.config/nvim/plugged/vim-rescript/rescript-vscode/extension/server/out/server.js",
+    "module": "~/.config/nvim/plugged/vim-rescript/server/out/server.js",
     "args": ["--node-ipc"],
     "filetypes": ["rescript"],
     "rootPatterns": ["bsconfig.json"]