diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 3601155320..8ec83645af 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -218,7 +218,7 @@ async fn parse_project_route(configuration: Configuration, route: &str) -> Resul #[tauri::command] async fn read_dir_recursive(path: &str) -> Result { - kcl_lib::settings::utils::walk_dir(&Path::new(path).to_path_buf()) + kcl_lib::settings::utils::walk_dir(Path::new(path).to_path_buf()) .await .map_err(InvokeError::from_anyhow) } diff --git a/src/wasm-lib/Cargo.lock b/src/wasm-lib/Cargo.lock index 07d1344d26..524049e6cb 100644 --- a/src/wasm-lib/Cargo.lock +++ b/src/wasm-lib/Cargo.lock @@ -317,6 +317,12 @@ version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" +[[package]] +name = "bytecount" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce" + [[package]] name = "bytemuck" version = "1.15.0" @@ -1422,6 +1428,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "tabled", "thiserror", "tokio", "tokio-tungstenite", @@ -1754,6 +1761,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "papergrid" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ad43c07024ef767f9160710b3a6773976194758c7919b17e63b863db0bdf7fb" +dependencies = [ + "bytecount", + "fnv", + "unicode-width", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -2884,6 +2902,30 @@ dependencies = [ "libc", ] +[[package]] +name = "tabled" +version = "0.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c998b0c8b921495196a48aabaf1901ff28be0760136e31604f7967b0792050e" +dependencies = [ + "papergrid", + "tabled_derive", + "unicode-width", +] + +[[package]] +name = "tabled_derive" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c138f99377e5d653a371cdad263615634cfc8467685dfe8e73e2b8e98f44b17" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "tap" version = "1.0.1" @@ -2958,9 +3000,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -2979,9 +3021,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", diff --git a/src/wasm-lib/kcl/Cargo.toml b/src/wasm-lib/kcl/Cargo.toml index 01dee4b831..2b2c4ebc82 100644 --- a/src/wasm-lib/kcl/Cargo.toml +++ b/src/wasm-lib/kcl/Cargo.toml @@ -35,6 +35,7 @@ schemars = { version = "0.8.17", features = ["impl_json_schema", "url", "uuid1"] serde = { version = "1.0.204", features = ["derive"] } serde_json = "1.0.120" sha2 = "0.10.8" +tabled = { version = "0.15.0", optional = true } thiserror = "1.0.62" toml = "0.8.14" ts-rs = { version = "9.0.1", features = ["uuid-impl", "url-impl", "chrono-impl", "no-serde-warnings", "serde-json-impl"] } @@ -70,6 +71,8 @@ pyo3 = ["dep:pyo3"] # Helper functions also used in benchmarks. lsp-test-util = [] +tabled = ["dep:tabled"] + [profile.release] panic = "abort" debug = true diff --git a/src/wasm-lib/kcl/src/settings/utils.rs b/src/wasm-lib/kcl/src/settings/utils.rs index a7bd3e565d..7c44728171 100644 --- a/src/wasm-lib/kcl/src/settings/utils.rs +++ b/src/wasm-lib/kcl/src/settings/utils.rs @@ -64,9 +64,9 @@ where } if e.file_type().await?.is_dir() { - children.push(walk_dir(&e.path()).await?); + children.push(walk_dir(e.path()).await?); } else { - if !is_relevant_file(&e.path())? { + if !is_relevant_file(e.path())? { continue; } children.push(FileEntry {