Merge remote-tracking branch 'dk/master' into db

.github/workflows/main.yml

@@ -4,11 +4,11 @@ on:
   push:
   workflow_dispatch:
 jobs:
-  build:
+  build_lambdapi:
     strategy:
       fail-fast: false
       matrix:
-        ocaml-version: [5.1.0, 5.0.0, 4.14.1, 4.13.1, 4.12.1, 4.11.2, 4.10.2, 4.09.1, 4.08.1]
+        ocaml-version: [5.1.1, 5.0.0, 4.14.1, 4.13.1, 4.12.1, 4.11.2, 4.10.2, 4.09.1, 4.08.1]
     runs-on: ubuntu-latest
     steps:
       - name: checking out lambdapi repo ...
@@ -34,8 +34,15 @@ jobs:
           eval $(opam env)
           #why3 config detect
           make tests
+  build_vscode_extension:
+    strategy:
+      fail-fast: false
+    runs-on: ubuntu-latest
+    steps:
+      - name: checking out lambdapi repo ...
+        uses: actions/checkout@v4
       - name: Use Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: latest
       - name: generate-vscode-extension
@@ -44,7 +51,7 @@ jobs:
           npm install -g vsce 
           make build-vscode-extension
       - name: publish vscode extension
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with: 
           name: assets-for-download
           path: editors/vscode/extensionFolder

editors/vscode/CHANGES.md

@@ -4,6 +4,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
+- code refactoring of the client for maintenability.
+- fix the bug that causes the proof navigation to malfunction when the Goals panel is closed by the user. Now the panel is recreated whenever needed.
 
 ## [0.1.2] - 2020-12-10
 - use vscode configuration for lambdapi.path to call the lambdapi LSP server

editors/vscode/package.json

@@ -153,7 +153,7 @@
       }
     ]
   },
-  "main": "out/src/client.js",
+  "main": "out/src/browser.js",
   "scripts": {
     "vscode:prepublish": "npm run compile",
     "compile": "tsc -p ./",

editors/vscode/src/browser.ts

@@ -0,0 +1,22 @@
+import { ExtensionContext, window } from "vscode";
+import { LanguageClient } from "vscode-languageclient/node";
+import { activateClientLSP, ClientFactoryType, deactivateClientLSP } from "./client";
+
+export function activate(context: ExtensionContext): void {
+  const cf: ClientFactoryType = (context, clientOptions, wsConfig, lspServerPath) => {
+    let serverOptions = {
+      command: lspServerPath,
+      args: ['lsp']
+    };
+    return new LanguageClient(
+      "lambdapi",
+      "lambdapi language server",
+      serverOptions,
+      clientOptions);
+  };
+  activateClientLSP(context, cf);
+}
+
+export function deactivate() {
+  deactivateClientLSP();
+}