better packaging, dont ship the binary

Author: jaredly

.vscode/settings.json

@@ -5,5 +5,7 @@
   "git.ignoreLimitWarning": true,
   "git.enabled": false,
   "reason.path.bsb": "./node_modules/.bin/bsb",
-  "editor.codeLens": true
+  "editor.codeLens": true,
+  "reason_language_server.location": "./lib/bs/native/bin.native",
+  "reason_language_server.reloadOnChange": true
 }

client/package-lock.json

@@ -30,22 +30,14 @@
 			"type": "object",
 			"title": "Reason Language Server",
 			"properties": {
-				"reason_language_server.maxNumberOfProblems": {
-					"scope": "resource",
-					"type": "number",
-					"default": 100,
-					"description": "Controls the maximum number of problems produced by the server."
-				},
-				"reason_language_server.trace.server": {
-					"scope": "window",
+				"reason_language_server.location": {
 					"type": "string",
-					"enum": [
-						"off",
-						"messages",
-						"verbose"
-					],
-					"default": "off",
-					"description": "Traces the communication between VSCode and the language server."
+					"description": "Provide a custom location for the language server binary"
+				},
+				"reason_language_server.reloadOnChange": {
+					"type": "boolean",
+					"default": false,
+					"description": "Monitor the language server binary for updates, and restart it (for development)."
 				}
 			}
 		},
@@ -75,7 +67,6 @@
 	},
 	"dependencies": {
 		"vscode": "^1.1.17",
-		"vscode-languageclient": "^4.1.3",
-		"@jaredly/reason-language-server": "file:../"
+		"vscode-languageclient": "^4.1.3"
 	}
 }

client/package.json

@@ -7,18 +7,38 @@ const vscode = require("vscode");
 const {LanguageClient} = require("vscode-languageclient");
 const path = require('path')
 const fs = require('fs')
-const DEV = true;
+// const DEV = false;
+
+const getLocation = () => {
+    let config = vscode.workspace.getConfiguration('reason_language_server')
+
+    let binaryLocation = config.get('location')
+
+    if (!binaryLocation) {
+        binaryLocation = path.join(vscode.workspace.rootPath, 'node_modules', '@jaredly', 'reason-language-server', 'lib', 'bs', 'native', 'bin.native')
+        // binaryLocation = path.join(vscode.workspace.rootPath, '..', 'lib', 'bs', 'native', 'bin.native')
+    } else {
+        if (!binaryLocation.startsWith('/')) {
+            binaryLocation = path.join(vscode.workspace.rootPath, binaryLocation)
+        }
+    }
+    return binaryLocation
+}
+
+const newClient = (clientOptions, location) => {
+    return new LanguageClient(
+        'reason-language-server',
+        'Reason Language Server',
+        serverOptions,
+        clientOptions
+    )
+}
+
+const shouldReload = () => vscode.workspace.getConfiguration('reason_language_server').get('reloadOnChange')
 
 function activate(context) {
     // The server is implemented in reason
-    let binaryLocation = DEV
-    ? context.asAbsolutePath(path.join('..', 'lib', 'bs', 'native', 'bin.native'))
-    : context.asAbsolutePath(path.join('node_modules', '@jaredly', 'reason-language-server', 'lib', 'bs', 'native', 'bin.native'));
 
-    let serverOptions = {
-        command: binaryLocation,
-        args: [],
-    };
     let clientOptions = {
         documentSelector: [{scheme: 'file', language: 'reason'}],
         synchronize: {
@@ -28,35 +48,16 @@ function activate(context) {
             fileEvents: vscode.workspace.createFileSystemWatcher('**/bsconfig.json')
         }
     };
-    let client = new LanguageClient(
-        'reason-language-server',
-        'Reason Language Server',
-        serverOptions,
-        clientOptions
-    )
-    // Push the disposable to the context's subscriptions so that the
-    // client can be deactivated on extension deactivation
-    context.subscriptions.push(client.start());
 
-    let lastStartTime = Date.now();
-    const restart = () => {
-        client.stop();
-        client = new LanguageClient(
-            'reason-language-server',
-            'Reason Language Server',
-            serverOptions,
-            clientOptions
-        );
-        lastStartTime = Date.now()
-        context.subscriptions.push(client.start());
-        vscode.window.showInformationMessage('Reason language server restarted');
-    }
+    let client = null
+    let lastStartTime = null
+    let interval = null
 
-    if (DEV) {
+    const startChecking = (location) => {
         vscode.window.showInformationMessage('DEBUG MODE: Will auto-restart the reason language server if it recompiles');
-        const checkForBinaryChagne = setInterval(() => {
+        interval = setInterval(() => {
             try {
-                const stat = fs.statSync(binaryLocation)
+                const stat = fs.statSync(location)
                 const mtime = stat.mtime.getTime()
                 if (mtime > lastStartTime) {
                     restart()
@@ -68,6 +69,36 @@ function activate(context) {
         context.subscriptions.push({dispose: () => clearInterval(checkForBinaryChange)})
     }
 
+    const restart = () => {
+        if (client) {
+            client.stop();
+        }
+        const location = getLocation()
+        client = new LanguageClient(
+            'reason-language-server',
+            'Reason Language Server',
+            {
+                command: location,
+                args: [],
+            },
+            clientOptions
+        );
+        lastStartTime = Date.now()
+        context.subscriptions.push(client.start());
+        vscode.window.showInformationMessage('Reason language server restarted');
+        if (shouldReload()) {
+            if (!interval) {
+                startChecking(location)
+            }
+        } else if (interval) {
+            vscode.window.showInformationMessage('DEBUG MODE OFF - no longer monitoring reason-language-server binary');
+            clearInterval(interval)
+            interval = null
+        }
+    }
+
+    restart();
+
     vscode.commands.registerCommand('reason-language-server.restart', restart);
 }
 exports.activate = activate;

client/src/index.js

@@ -1,3 +1,5 @@
 {
-  "editor.codeLens": true
+  "editor.codeLens": true,
+  "reason_language_server.location": "../lib/bs/native/bin.native",
+  "reason_language_server.reloadOnChange": false
 }

example-project/.vscode/settings.json

@@ -7,9 +7,9 @@ string_of_bool; */
 module Something = {
   open Other;
 
-  let m = {firstName: "Me", age: 0};
-  let animal = Wolf(10);
-  let other = Wolf(2);
+  let m = {name: "Me", age: 0};
+  let animal = Dogz(10);
+  let other = Dogz(2);
   let me = Cat("Hie");
   let x = something + 10;
 };

example-project/src/Hello.re

@@ -5,12 +5,12 @@
 
 let something = 10;
 
-type person = {firstName: string, age: int};
+type person = {name: string, age: int};
 
-type animals = Wolf(int) | Cat(string) | Mouse;
+type animals = Dogz(int) | Cat(string) | Mouse;
 
-let m = Wolf(1);
+let m = Dogz(1);
 
-let z = {firstName: "hi", age: 20};
+let z = {name: "hi", age: 20};
 
 /* let e = z.name; */

example-project/src/Other.re

@@ -5,11 +5,11 @@
     "start": "bsb -make-world -backend native",
     "clean": "bsb -clean-world",
     "watch": "bsb -make-world -backend native -w",
-    "package": "npm run package:cp && npm run package:remap && npm run package:bundle && npm run package:done",
-    "package:cp": "rm -rf tmp; mkdir tmp; cp -r bsconfig.json package.json src omd odoc_parser bin lib tmp; mkdir tmp/node_modules; cp package.thin.json tmp/package.json",
-    "package:remap": "sed -i .bak 's/file:\\.\\.\\//file:..\\/tmp/' client/package.json",
+    "package": "npm run package:bundle",
+    "// package:cp": "rm -rf tmp; mkdir tmp; cp -r bsconfig.json package.json src omd odoc_parser bin lib tmp; mkdir tmp/node_modules; cp package.thin.json tmp/package.json",
+    "// package:remap": "sed -i .bak 's/file:\\.\\.\\//file:..\\/tmp/' client/package.json",
     "package:bundle": "cd client && npm i && vsce package",
-    "package:done": "mv client/package.json.bak client/package.json && rm -rf tmp",
+    "// package:done": "mv client/package.json.bak client/package.json && rm -rf tmp",
     "postinstall": "bsb -make-world -backend native"
   },
   "keywords": [