pull main

.github/workflows/clippy.yml

@@ -21,6 +21,8 @@ on:
 jobs:
   rust-clippy-analyze:
     name: Run rust-clippy analyzing
+    runs-on: ubuntu-latest
+    container: ghcr.io/sevki/devcontainer:main
     permissions:
       contents: read
       security-events: write

.github/workflows/mdbook.yml

@@ -33,11 +33,12 @@ jobs:
     container: ghcr.io/sevki/devcontainer:main
     strategy:
         matrix:
-          targets: [
-            x86_64-unknown-linux-gnu
-          ]
-          packages: [srclang]
-          toolchains: [stable]
+          targets: 
+          - x86_64-unknown-linux-gnu
+          packages: 
+          - srclang
+          toolchains: 
+          - stable
 
     env:
       MDBOOK_VERSION: 0.4.40

.gitignore

@@ -1,4 +1,7 @@
 book
 target
 node_modules
-packages/app/assets/**
+packages/app/assets/wasm/src_lsp_browser.d.ts
+packages/app/assets/wasm/src_lsp_browser.js
+packages/app/assets/wasm/src_lsp_browser_bg.wasm
+packages/app/assets/wasm/src_lsp_browser_bg.wasm.d.ts

Cargo.lock

@@ -727,9 +727,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "js-sys"
-version = "0.3.58"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3fac17f7123a73ca62df411b1bf727ccc805daa070338fda671c86dac1bdc27"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -1908,9 +1908,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.58"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fed94beee57daf8dd7d51f2b15dc2bcde92d7a72304cdf662a4371008b71b90"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",

crates/src-lsp-browser/Cargo.toml

@@ -17,15 +17,14 @@ futures = "0.3.21"
 js-sys = "0.3.57"
 tower-lsp = { version = "0.17.0", default-features = false }
 wasm-bindgen = "0.2.81"
-wasm-bindgen-futures = { version = "0.4.30", features = ["futures-core-03-stream"] }
+wasm-bindgen-futures = { version = "0.4.30", features = [
+  "futures-core-03-stream",
+] }
 wasm-streams = "0.2.3"
 srclang = { version = "0.1.0", path = "../..", registry = "oksoftware" }
-
-[dependencies.web-sys]
-version = "0.3.57"
-features = [
+web-sys = { version = "0.3.69", features = [
   "console",
   "HtmlTextAreaElement",
   "ReadableStream",
   "WritableStream",
-]
+] }

packages/app/assets/wasm/src_lsp_browser.d.ts

@@ -192,14 +192,6 @@ export interface InitOutput {
   readonly intounderlyingsink_write: (a: number, b: number) => number;
   readonly intounderlyingsink_close: (a: number) => number;
   readonly intounderlyingsink_abort: (a: number, b: number) => number;
-  readonly __wbg_queuingstrategy_free: (a: number) => void;
-  readonly queuingstrategy_highWaterMark: (a: number) => number;
-  readonly __wbg_intounderlyingbytesource_free: (a: number) => void;
-  readonly intounderlyingbytesource_type: (a: number) => number;
-  readonly intounderlyingbytesource_autoAllocateChunkSize: (a: number) => number;
-  readonly intounderlyingbytesource_start: (a: number, b: number) => void;
-  readonly intounderlyingbytesource_pull: (a: number, b: number) => number;
-  readonly intounderlyingbytesource_cancel: (a: number) => void;
   readonly __wbg_intounderlyingsource_free: (a: number) => void;
   readonly intounderlyingsource_pull: (a: number, b: number) => number;
   readonly intounderlyingsource_cancel: (a: number) => void;
@@ -210,14 +202,22 @@ export interface InitOutput {
   readonly pipeoptions_preventCancel: (a: number) => number;
   readonly pipeoptions_preventAbort: (a: number) => number;
   readonly pipeoptions_signal: (a: number) => number;
+  readonly __wbg_queuingstrategy_free: (a: number) => void;
+  readonly queuingstrategy_highWaterMark: (a: number) => number;
+  readonly __wbg_intounderlyingbytesource_free: (a: number) => void;
+  readonly intounderlyingbytesource_type: (a: number) => number;
+  readonly intounderlyingbytesource_autoAllocateChunkSize: (a: number) => number;
+  readonly intounderlyingbytesource_start: (a: number, b: number) => void;
+  readonly intounderlyingbytesource_pull: (a: number, b: number) => number;
+  readonly intounderlyingbytesource_cancel: (a: number) => void;
   readonly __wbindgen_malloc: (a: number, b: number) => number;
   readonly __wbindgen_realloc: (a: number, b: number, c: number, d: number) => number;
   readonly __wbindgen_export_2: WebAssembly.Table;
-  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb27815019b215f9b: (a: number, b: number, c: number) => void;
+  readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hef4ca354c23a4fc7: (a: number, b: number, c: number) => void;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;
   readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_exn_store: (a: number) => void;
-  readonly wasm_bindgen__convert__closures__invoke2_mut__h46fcf022e9949c5e: (a: number, b: number, c: number, d: number) => void;
+  readonly wasm_bindgen__convert__closures__invoke2_mut__hd246805203d2bb11: (a: number, b: number, c: number, d: number) => void;
 }
 
 export type SyncInitInput = BufferSource | WebAssembly.Module;

packages/app/assets/wasm/src_lsp_browser.js

@@ -214,7 +214,7 @@ function makeMutClosure(arg0, arg1, dtor, f) {
     return real;
 }
 function __wbg_adapter_20(arg0, arg1, arg2) {
-    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb27815019b215f9b(arg0, arg1, addHeapObject(arg2));
+    wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hef4ca354c23a4fc7(arg0, arg1, addHeapObject(arg2));
 }
 
 function _assertClass(instance, klass) {
@@ -295,7 +295,7 @@ function handleError(f, args) {
     }
 }
 function __wbg_adapter_99(arg0, arg1, arg2, arg3) {
-    wasm.wasm_bindgen__convert__closures__invoke2_mut__h46fcf022e9949c5e(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
+    wasm.wasm_bindgen__convert__closures__invoke2_mut__hd246805203d2bb11(arg0, arg1, addHeapObject(arg2), addHeapObject(arg3));
 }
 
 /**
@@ -669,10 +669,6 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbg_tokenspan_new = function(arg0) {
-        const ret = TokenSpan.__wrap(arg0);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbindgen_object_drop_ref = function(arg0) {
         takeObject(arg0);
     };
@@ -685,10 +681,41 @@ function __wbg_get_imports() {
         const ret = false;
         return ret;
     };
+    imports.wbg.__wbg_tokenspan_new = function(arg0) {
+        const ret = TokenSpan.__wrap(arg0);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
         const ret = getStringFromWasm0(arg0, arg1);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
+        const obj = getObject(arg1);
+        const ret = typeof(obj) === 'string' ? obj : undefined;
+        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
+        var len1 = WASM_VECTOR_LEN;
+        getInt32Memory0()[arg0 / 4 + 1] = len1;
+        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
+    };
+    imports.wbg.__wbg_write_f6d68f54a7b41f92 = function(arg0, arg1) {
+        const ret = getObject(arg0).write(takeObject(arg1));
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_getWriter_6cdcca9cf3b715dc = function() { return handleError(function (arg0) {
+        const ret = getObject(arg0).getWriter();
+        return addHeapObject(ret);
+    }, arguments) };
+    imports.wbg.__wbg_ready_8f8565755a0b5d1f = function(arg0) {
+        const ret = getObject(arg0).ready;
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_close_ae487688d07f03b0 = function(arg0) {
+        const ret = getObject(arg0).close();
+        return addHeapObject(ret);
+    };
+    imports.wbg.__wbg_releaseLock_0d3bce87e07d43f6 = function(arg0) {
+        getObject(arg0).releaseLock();
+    };
     imports.wbg.__wbg_respond_f4778bef04e912a6 = function(arg0, arg1) {
         getObject(arg0).respond(arg1 >>> 0);
     };
@@ -702,17 +729,13 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).byobRequest;
         return isLikeNone(ret) ? 0 : addHeapObject(ret);
     };
+    imports.wbg.__wbg_close_045ed342139beb7d = function(arg0) {
+        getObject(arg0).close();
+    };
     imports.wbg.__wbg_view_d1a31268af734e5d = function(arg0) {
         const ret = getObject(arg0).view;
         return isLikeNone(ret) ? 0 : addHeapObject(ret);
     };
-    imports.wbg.__wbg_byteLength_1fef7842ca4200fa = function(arg0) {
-        const ret = getObject(arg0).byteLength;
-        return ret;
-    };
-    imports.wbg.__wbg_close_045ed342139beb7d = function(arg0) {
-        getObject(arg0).close();
-    };
     imports.wbg.__wbg_buffer_610b70c8fd30da2d = function(arg0) {
         const ret = getObject(arg0).buffer;
         return addHeapObject(ret);
@@ -721,41 +744,18 @@ function __wbg_get_imports() {
         const ret = getObject(arg0).byteOffset;
         return ret;
     };
-    imports.wbg.__wbindgen_string_get = function(arg0, arg1) {
-        const obj = getObject(arg1);
-        const ret = typeof(obj) === 'string' ? obj : undefined;
-        var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
-        var len1 = WASM_VECTOR_LEN;
-        getInt32Memory0()[arg0 / 4 + 1] = len1;
-        getInt32Memory0()[arg0 / 4 + 0] = ptr1;
-    };
-    imports.wbg.__wbg_getWriter_6cdcca9cf3b715dc = function() { return handleError(function (arg0) {
-        const ret = getObject(arg0).getWriter();
-        return addHeapObject(ret);
-    }, arguments) };
-    imports.wbg.__wbg_releaseLock_0d3bce87e07d43f6 = function(arg0) {
-        getObject(arg0).releaseLock();
-    };
-    imports.wbg.__wbg_bytesliteral_efe7d360639bf32b = function() {
-        const ret = bytes_literal();
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbg_ready_8f8565755a0b5d1f = function(arg0) {
-        const ret = getObject(arg0).ready;
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbg_close_ae487688d07f03b0 = function(arg0) {
-        const ret = getObject(arg0).close();
-        return addHeapObject(ret);
-    };
-    imports.wbg.__wbg_write_f6d68f54a7b41f92 = function(arg0, arg1) {
-        const ret = getObject(arg0).write(takeObject(arg1));
-        return addHeapObject(ret);
+    imports.wbg.__wbg_byteLength_1fef7842ca4200fa = function(arg0) {
+        const ret = getObject(arg0).byteLength;
+        return ret;
     };
     imports.wbg.__wbindgen_object_clone_ref = function(arg0) {
         const ret = getObject(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbg_bytesliteral_efe7d360639bf32b = function() {
+        const ret = bytes_literal();
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbg_new_abda76e883ba8a5f = function() {
         const ret = new Error();
         return addHeapObject(ret);
@@ -778,7 +778,7 @@ function __wbg_get_imports() {
             wasm.__wbindgen_free(deferred0_0, deferred0_1, 1);
         }
     };
-    imports.wbg.__wbg_log_a55c8bdc4457c57b = function(arg0) {
+    imports.wbg.__wbg_log_5bb5f88f245d7762 = function(arg0) {
         console.log(getObject(arg0));
     };
     imports.wbg.__wbindgen_is_object = function(arg0) {
@@ -786,31 +786,31 @@ function __wbg_get_imports() {
         const ret = typeof(val) === 'object' && val !== null;
         return ret;
     };
-    imports.wbg.__wbg_done_9591306adc68a5d4 = function(arg0) {
+    imports.wbg.__wbg_done_298b57d23c0fc80c = function(arg0) {
         const ret = getObject(arg0).done;
         return ret;
     };
-    imports.wbg.__wbg_value_f1012f37b799a431 = function(arg0) {
+    imports.wbg.__wbg_value_d93c65011f51a456 = function(arg0) {
         const ret = getObject(arg0).value;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_ddadd9d04e3295e5 = function(arg0, arg1) {
+    imports.wbg.__wbg_new_28c511d9baebfa89 = function(arg0, arg1) {
         const ret = new Error(getStringFromWasm0(arg0, arg1));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_call_0fc942c0cd058edc = function() { return handleError(function (arg0, arg1, arg2) {
+    imports.wbg.__wbg_call_b3ca7c6051f9bec1 = function() { return handleError(function (arg0, arg1, arg2) {
         const ret = getObject(arg0).call(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_next_3f98aa09fa1b493f = function() { return handleError(function (arg0) {
+    imports.wbg.__wbg_next_a1c35169a4db2ac1 = function() { return handleError(function (arg0) {
         const ret = getObject(arg0).next();
         return addHeapObject(ret);
     }, arguments) };
-    imports.wbg.__wbg_toString_42b76b67d8f363e4 = function(arg0) {
+    imports.wbg.__wbg_toString_c816a20ab859d0c1 = function(arg0) {
         const ret = getObject(arg0).toString();
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_2134106f4b1ad399 = function(arg0, arg1) {
+    imports.wbg.__wbg_new_81740750da40724f = function(arg0, arg1) {
         try {
             var state0 = {a: arg0, b: arg1};
             var cb0 = (arg0, arg1) => {
@@ -828,38 +828,38 @@ function __wbg_get_imports() {
             state0.a = state0.b = 0;
         }
     };
-    imports.wbg.__wbg_resolve_a51d109014ddd4b6 = function(arg0) {
+    imports.wbg.__wbg_resolve_b0083a7967828ec8 = function(arg0) {
         const ret = Promise.resolve(getObject(arg0));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_then_05f303b53865248d = function(arg0, arg1) {
+    imports.wbg.__wbg_then_0c86a60e8fcfe9f6 = function(arg0, arg1) {
         const ret = getObject(arg0).then(getObject(arg1));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_then_a1ad806b8eecb319 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbg_then_a73caa9a87991566 = function(arg0, arg1, arg2) {
         const ret = getObject(arg0).then(getObject(arg1), getObject(arg2));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_buffer_30b2c486550732a7 = function(arg0) {
+    imports.wbg.__wbg_buffer_12d079cc21e14bdb = function(arg0) {
         const ret = getObject(arg0).buffer;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_newwithbyteoffsetandlength_427fb921c3846521 = function(arg0, arg1, arg2) {
+    imports.wbg.__wbg_newwithbyteoffsetandlength_aa4a17c33a06e5cb = function(arg0, arg1, arg2) {
         const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0);
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_new_63a94ade1a1d1528 = function(arg0) {
+    imports.wbg.__wbg_new_63b92bc8671ed464 = function(arg0) {
         const ret = new Uint8Array(getObject(arg0));
         return addHeapObject(ret);
     };
-    imports.wbg.__wbg_set_e81b0a0252fa567d = function(arg0, arg1, arg2) {
+    imports.wbg.__wbg_set_a47bac70306a19a7 = function(arg0, arg1, arg2) {
         getObject(arg0).set(getObject(arg1), arg2 >>> 0);
     };
-    imports.wbg.__wbg_length_85c067384f946a25 = function(arg0) {
+    imports.wbg.__wbg_length_c20a40f15020d68a = function(arg0) {
         const ret = getObject(arg0).length;
         return ret;
     };
-    imports.wbg.__wbg_instanceof_Uint8Array_fd17ec67c77de602 = function(arg0) {
+    imports.wbg.__wbg_instanceof_Uint8Array_2b3bbecd033d19f6 = function(arg0) {
         let result;
         try {
             result = getObject(arg0) instanceof Uint8Array;
@@ -883,8 +883,8 @@ function __wbg_get_imports() {
         const ret = wasm.memory;
         return addHeapObject(ret);
     };
-    imports.wbg.__wbindgen_closure_wrapper4384 = function(arg0, arg1, arg2) {
-        const ret = makeMutClosure(arg0, arg1, 1476, __wbg_adapter_20);
+    imports.wbg.__wbindgen_closure_wrapper4516 = function(arg0, arg1, arg2) {
+        const ret = makeMutClosure(arg0, arg1, 1550, __wbg_adapter_20);
         return addHeapObject(ret);
     };
 

packages/app/assets/wasm/src_lsp_browser_bg.wasm.d.ts

@@ -17,14 +17,6 @@ export function __wbg_intounderlyingsink_free(a: number): void;
 export function intounderlyingsink_write(a: number, b: number): number;
 export function intounderlyingsink_close(a: number): number;
 export function intounderlyingsink_abort(a: number, b: number): number;
-export function __wbg_queuingstrategy_free(a: number): void;
-export function queuingstrategy_highWaterMark(a: number): number;
-export function __wbg_intounderlyingbytesource_free(a: number): void;
-export function intounderlyingbytesource_type(a: number): number;
-export function intounderlyingbytesource_autoAllocateChunkSize(a: number): number;
-export function intounderlyingbytesource_start(a: number, b: number): void;
-export function intounderlyingbytesource_pull(a: number, b: number): number;
-export function intounderlyingbytesource_cancel(a: number): void;
 export function __wbg_intounderlyingsource_free(a: number): void;
 export function intounderlyingsource_pull(a: number, b: number): number;
 export function intounderlyingsource_cancel(a: number): void;
@@ -35,11 +27,19 @@ export function pipeoptions_preventClose(a: number): number;
 export function pipeoptions_preventCancel(a: number): number;
 export function pipeoptions_preventAbort(a: number): number;
 export function pipeoptions_signal(a: number): number;
+export function __wbg_queuingstrategy_free(a: number): void;
+export function queuingstrategy_highWaterMark(a: number): number;
+export function __wbg_intounderlyingbytesource_free(a: number): void;
+export function intounderlyingbytesource_type(a: number): number;
+export function intounderlyingbytesource_autoAllocateChunkSize(a: number): number;
+export function intounderlyingbytesource_start(a: number, b: number): void;
+export function intounderlyingbytesource_pull(a: number, b: number): number;
+export function intounderlyingbytesource_cancel(a: number): void;
 export function __wbindgen_malloc(a: number, b: number): number;
 export function __wbindgen_realloc(a: number, b: number, c: number, d: number): number;
 export const __wbindgen_export_2: WebAssembly.Table;
-export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb27815019b215f9b(a: number, b: number, c: number): void;
+export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hef4ca354c23a4fc7(a: number, b: number, c: number): void;
 export function __wbindgen_add_to_stack_pointer(a: number): number;
 export function __wbindgen_free(a: number, b: number, c: number): void;
 export function __wbindgen_exn_store(a: number): void;
-export function wasm_bindgen__convert__closures__invoke2_mut__h46fcf022e9949c5e(a: number, b: number, c: number, d: number): void;
+export function wasm_bindgen__convert__closures__invoke2_mut__hd246805203d2bb11(a: number, b: number, c: number, d: number): void;

packages/app/build.sh

@@ -1,7 +1,16 @@
 #!/bin/sh
 # FILEPATH: /workspaces/libsrc/packages/app/build.sh
 cargo build --release -p src-lsp-browser --target wasm32-unknown-unknown;
-wasm-bindgen --out-dir assets/wasm --target web --typescript /scratch/cargo_target/wasm32-unknown-unknown/release/src_lsp_browser.wasm; 
+
+# if we'are in a docker container the output directory is /scratch/cargo_target
+# if we're not in a docker container the output directory is ../../target
+OUT_DIR="/scratch/cargo_target"
+if [ ! -d "$OUT_DIR" ]; then
+  OUT_DIR="../../target"
+fi
+
+
+wasm-bindgen --out-dir assets/wasm --target web --typescript ${OUT_DIR}/wasm32-unknown-unknown/release/src_lsp_browser.wasm; 
 webpack;
 mv ../../book/playground/*.wasm ../../book
 mv ../../book/playground/*.ttf ../../book