Merge pull request #105 from Tim-Paik/master

fix compile errors

crates/rhai-common/Cargo.toml

@@ -33,4 +33,4 @@ glob = "0.3.0"
 atty = "0.2.14"
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-tokio = { version = "1.19.2" }
+tokio = { version = "1.19.2", features = ["io-util"]}

crates/rhai-lsp/Cargo.toml

@@ -22,7 +22,7 @@ glob = "0.3.0"
 globset = "0.4.9"
 indexmap = "1.9.1"
 itertools = "0.10.3"
-lsp-async-stub = { version = "0.6.0", features = ["tokio-stdio"] }
+lsp-async-stub = "0.6.0"
 lsp-types = "0.93.0"
 once_cell = "1.12.0"
 serde = { version = "1.0.137", features = ["derive"] }

crates/rhai-wasm/src/environment.rs

@@ -171,6 +171,7 @@ pub(crate) struct WasmEnvironment {
     js_on_stderr: Function,
     js_glob_files: Function,
     js_read_file: Function,
+    js_write_file: Function,
     js_sleep: Function,
     js_is_absolute: Function,
     js_cwd: Function,
@@ -203,6 +204,9 @@ impl From<JsValue> for WasmEnvironment {
             js_read_file: js_sys::Reflect::get(&val, &JsValue::from_str("js_read_file"))
                 .unwrap()
                 .into(),
+            js_write_file: js_sys::Reflect::get(&val, &JsValue::from_str("js_write_file"))
+                .unwrap()
+                .into(),
             js_is_absolute: js_sys::Reflect::get(&val, &JsValue::from_str("js_is_absolute"))
                 .unwrap()
                 .into(),
@@ -308,6 +312,18 @@ impl Environment for WasmEnvironment {
         Ok(Uint8Array::from(ret).to_vec())
     }
 
+    async fn write_file(&self, path: &Path, bytes: &[u8]) -> Result<(), anyhow::Error> {
+        let path_str = JsValue::from_str(&path.to_string_lossy());
+        let this = JsValue::null();
+        let data = JsValue::from(js_sys::Uint8Array::from(bytes));
+        let res: JsValue = self.js_write_file.call2(&this, &path_str, &data).unwrap();
+
+        JsFuture::from(Promise::from(res))
+            .await
+            .map(|_| ())
+            .map_err(|err| anyhow!("{:?}", err))
+    }
+
     fn is_absolute(&self, path: &Path) -> bool {
         let path_str = JsValue::from_str(&path.to_string_lossy());
         let this = JsValue::null();

editors/vscode/src/server.ts

@@ -31,6 +31,7 @@ process.on("message", async (d: RpcMessage) => {
         glob: p => glob.sync(p),
         isAbsolute: p => path.isAbsolute(p),
         readFile: path => fsPromise.readFile(path),
+        writeFile: (path, data) => fsPromise.writeFile(path, data),
         stderr: process.stderr,
         stdErrAtty: () => process.stderr.isTTY,
         stdin: process.stdin,

js/core/src/environment.ts

@@ -36,6 +36,10 @@ export interface Environment {
    * Read a file at the given path.
    */
   readFile: (path: string) => Promise<Uint8Array>;
+  /**
+   * Write a file at the given path.
+   */
+  writeFile: (path: string, data: Uint8Array) => Promise<void>;
   /**
    * Search a glob file pattern and return the matched files.
    */
@@ -93,6 +97,7 @@ export function convertEnv(env: Environment): any {
     js_url_to_file_path: env.urlToFilePath,
     js_sleep: env.sleep,
     js_read_file: env.readFile,
+    js_write_file: env.writeFile,
   };
 }