Merge branch 'master' of https://github.com/rescript-lang/rescript-vscode

Author: cristianoc

.github/workflows/ci.yml

@@ -11,15 +11,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, macos-arm, ubuntu-18.04, windows-latest]
+        # Stay on the oldest Ubuntu version that's still supported by Github Actions
+        # to avoid glibc incompatibilities as far as possible.
+        os: [macos-latest, macos-arm, ubuntu-20.04, windows-latest]
         # syntax explanation:
         # https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions#example-including-additional-values-into-combinations
         include:
           - os: macos-latest
             artifact-folder: darwin
           - os: macos-arm
             artifact-folder: darwinarm64
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             artifact-folder: linux
           - os: windows-latest
             artifact-folder: win32
@@ -44,7 +46,7 @@ jobs:
     - name: Use OCaml
       uses: ocaml/setup-ocaml@v2
       with:
-        ocaml-compiler: 4.12.x
+        ocaml-compiler: 4.14.x
 
     - name: Use Node.js
       uses: actions/setup-node@v3
@@ -80,7 +82,7 @@ jobs:
 
   package:
     needs: test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/[email protected]
@@ -112,7 +114,7 @@ jobs:
     - name: Download Linux binary
       uses: actions/[email protected]
       with:
-        name: ubuntu-18.04
+        name: ubuntu-20.04
         path: ./server/analysis_binaries
     - run: tar -xvf binary.tar
       working-directory: ./server/analysis_binaries

CONTRIBUTING.md

@@ -25,7 +25,7 @@ Thanks for your interest. Below is an informal spec of how the plugin's server c
 ## Install Dependencies
 
 - Run `npm install` at the root. This will also install the npm modules for both the `client` and `server` folders.
-- `opam switch 4.12.0` (if you haven't created the switch, do it). OPAM [here](https://opam.ocaml.org). This is needed for the `analysis` folder, which is native code.
+- `opam switch 4.14.0` (if you haven't created the switch, do it). OPAM [here](https://opam.ocaml.org). This is needed for the `analysis` folder, which is native code.
 - Optionally, you can `opam install ocamlformat` and format the `.ml` files in `analysis`.
 
 ## Build & Run

package.json

@@ -1,6 +1,7 @@
 {
 	"name": "rescript-vscode",
-	"description": "The official VSCode plugin for ReScript.",
+	"displayName": "ReScript",
+	"description": "ReScript language support (official)",
 	"author": "chenglou",
 	"license": "MIT",
 	"version": "1.6.0",