Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove non-WASI code

Browse source
This commit is contained in:
Isaac Clayton 2022-06-06 11:00:05 +02:00
parent 805c86b781
commit 38d7321511
23 changed files with 211 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/json_language/Cargo.toml
View file

@ -5,6 +5,8 @@ edition = "2021"
[dependencies]
plugin = { path = "../../crates/plugin" }
serde = "1.0"
serde_json = "1.0"
[lib]
crate-type = ["cdylib"]
crate-type = ["cdylib"]

153
plugins/json_language/src/lib.rs
View file

@ -1,107 +1,108 @@
use plugin::prelude::*;
use serde_json::json;
use std::fs;
use std::path::PathBuf;
#[import]
fn command(string: String) -> Option<String>;
// import
// fn command(string: String) -> Option<String>;
#[bind]
pub fn name(_: ()) -> &'static str {
println!("huh, let me see...");
Command::new("sh")
.arg("-c")
.arg("echo hello")
.output()
.expect("failed to execute process");
pub fn name() -> &'static str {
"vscode-json-languageserver"
}
#[bind]
pub fn server_args(_: ()) -> Vec<String> {
pub fn server_args() -> Vec<String> {
vec!["--stdio".into()]
}
#[bind]
fn fetch_latest_server_version() -> Option<String> {
#[derive(Deserialize)]
struct NpmInfo {
versions: Vec<String>,
}
pub fn fetch_latest_server_version() -> Option<String> {
// #[derive(Deserialize)]
// struct NpmInfo {
// versions: Vec<String>,
// }
let output = command("npm info vscode-json-languageserver --json")?;
if !output.status.success() {
return None;
}
// let output = command("npm info vscode-json-languageserver --json")?;
// if !output.status.success() {
// return None;
// }
let mut info: NpmInfo = serde_json::from_slice(&output.stdout)?;
info.versions.pop()
// let mut info: NpmInfo = serde_json::from_slice(&output.stdout)?;
// info.versions.pop()
println!("fetching server version");
Some("1.3.4".into())
}
#[bind]
pub fn fetch_server_binary(version: String) -> Option<PathBuf> {
let version_dir = container_dir.join(version.as_str());
fs::create_dir_all(&version_dir)
.await
.context("failed to create version directory")?;
let binary_path = version_dir.join(Self::BIN_PATH);
// #[bind]
// pub fn fetch_server_binary(version: String) -> Option<PathBuf> {
// let version_dir = container_dir.join(version.as_str());
// fs::create_dir_all(&version_dir)
// .await
// .context("failed to create version directory")?;
// let binary_path = version_dir.join(Self::BIN_PATH);
if fs::metadata(&binary_path).await.is_err() {
let output = smol::process::Command::new("npm")
.current_dir(&version_dir)
.arg("install")
.arg(format!("vscode-json-languageserver@{}", version))
.output()
.await
.context("failed to run npm install")?;
if !output.status.success() {
Err(anyhow!("failed to install vscode-json-languageserver"))?;
}
// if fs::metadata(&binary_path).await.is_err() {
// let output = smol::process::Command::new("npm")
// .current_dir(&version_dir)
// .arg("install")
// .arg(format!("vscode-json-languageserver@{}", version))
// .output()
// .await
// .context("failed to run npm install")?;
// if !output.status.success() {
// Err(anyhow!("failed to install vscode-json-languageserver"))?;
// }
if let Some(mut entries) = fs::read_dir(&container_dir).await.log_err() {
while let Some(entry) = entries.next().await {
if let Some(entry) = entry.log_err() {
let entry_path = entry.path();
if entry_path.as_path() != version_dir {
fs::remove_dir_all(&entry_path).await.log_err();
}
}
}
}
}
// if let Some(mut entries) = fs::read_dir(&container_dir).await.log_err() {
// while let Some(entry) = entries.next().await {
// if let Some(entry) = entry.log_err() {
// let entry_path = entry.path();
// if entry_path.as_path() != version_dir {
// fs::remove_dir_all(&entry_path).await.log_err();
// }
// }
// }
// }
// }
Ok(binary_path)
}
// Ok(binary_path)
// }
const BIN_PATH: &'static str =
"node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
// #[bind]
// pub fn cached_server_binary(container_dir: PathBuf) -> Option<PathBuf> {
// println!("Finding cached server binary...");
// let mut last_version_dir = None;
// let mut entries = fs::read_dir(&container_dir).ok()?;
// println!("Read Entries...");
// while let Some(entry) = entries.next() {
// let entry = entry.ok()?;
// if entry.file_type().ok()?.is_dir() {
// last_version_dir = Some(entry.path());
// }
// }
// let last_version_dir = last_version_dir?;
// let bin_path = last_version_dir.join(BIN_PATH);
// if bin_path.exists() {
// println!("{}", bin_path.display());
// Some(bin_path)
// } else {
// None
// }
// }
#[bind]
pub fn cached_server_binary(container_dir: PathBuf) -> Option<PathBuf> {
let mut last_version_dir = None;
let mut entries = fs::read_dir(&container_dir).await?;
while let Some(entry) = entries.next().await {
let entry = entry?;
if entry.file_type().await?.is_dir() {
last_version_dir = Some(entry.path());
}
}
let last_version_dir = last_version_dir.ok_or_else(|| anyhow!("no cached binary"))?;
let bin_path = last_version_dir.join(Self::BIN_PATH);
if bin_path.exists() {
Ok(bin_path)
} else {
Err(anyhow!(
"missing executable in directory {:?}",
last_version_dir
))
}
}
#[bind]
pub fn initialization_options(_: ()) -> Option<serde_json::Value> {
pub fn initialization_options() -> Option<serde_json::Value> {
Some(json!({
"provideFormatter": true
}))
}
#[bind]
fn id_for_language(name: String) -> Option<String> {
pub fn id_for_language(name: String) -> Option<String> {
if name == "JSON" {
Some("jsonc".into())
} else {