Merge pull request #5 from jneira/add-log-output

Add log output

Author: ChrisPenner

package-lock.json

@@ -82,7 +82,6 @@
     "scripts": {
         "compile": "tsc -b",
         "watch": "tsc -b -w",
-
         "vscode:prepublish": "npm run esbuild-base -- --minify",
         "vscode:package": "npm run vscode:prepublish && vsce package",
         "esbuild-base": "esbuild ./src/extension.ts --bundle --outfile=out/main.js --external:vscode --format=cjs --platform=node",
@@ -96,7 +95,7 @@
         "@types/node": "^18.0.3",
         "@types/vscode": "^1.69.0",
         "esbuild": "^0.14.49",
-        "typescript": "^4.7.2",
+        "typescript": "^4.8.4",
         "vsce": "^2.9.2"
     },
     "license": "SEE LICENSE IN LICENSE"

package.json

@@ -5,6 +5,10 @@ import { connect } from "node:net";
 const outputChannel: OutputChannel = window.createOutputChannel("Unison");
 const clients: Map<string, LanguageClient> = new Map();
 
+function log(msg: string) {
+  outputChannel.appendLine(msg)
+}
+
 exports.activate = function () {
   workspace.workspaceFolders?.forEach((folder) => addWorkspaceFolder(folder));
   workspace.onDidChangeWorkspaceFolders(({ added, removed }) => {
@@ -27,15 +31,16 @@ async function addWorkspaceFolder(workspaceFolder: WorkspaceFolder) {
     documentSelector: [{ language: "unison" }],
   });
 
+  log(`Activating unison language server at ${folderPath}`)
   clients.set(folderPath, client);
-
   await client.start();
 }
 
 async function removeWorkspaceFolder(workspaceFolder: WorkspaceFolder) {
   let folderPath = workspaceFolder.uri.fsPath;
   let client = clients.get(folderPath);
   if (client) {
+    log(`Deactivating unison language server at ${folderPath}`)
     clients.delete(folderPath);
     await client.stop();
   }
@@ -49,22 +54,26 @@ async function connectToServer() {
   let haveShownError = false;
   while (true) {
     try {
+      const host = "127.0.0.1";
       const port = workspace.getConfiguration("unison").lspPort;
+      log(`Trying to connect to ucm lsp server at ${host}:${port}`);
       let socket = connect({ port, host: "127.0.0.1" });
       await new Promise((resolve, reject) =>
         socket.once("connect", resolve).once("error", reject)
       );
       // Show a success message, but only if we were in an error state
+      const okMsg = `Unison: Connected to Language Server at ${host}:${port}.`;
+      log(okMsg);
       if (haveShownError) {
-        window.showInformationMessage("Unison: Connected to Language Server.");
+        window.showInformationMessage(okMsg);
       }
       return { reader: socket, writer: socket };
     } catch (e) {
+      const errMsg = "Language server failed to connect";
+      log(`${errMsg}, cause: ${e}`)
       if (!haveShownError) {
         haveShownError = true;
-        window.showErrorMessage(
-          "Unison: Language server failed to connect, is there a UCM running? (version M4a or later)"
-        );
+        window.showErrorMessage(`Unison: ${errMsg}, is there a UCM running? (version M4a or later)`);
       }
       await sleep(2000);
       continue;