Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ crate-type = ["cdylib", "rlib"]
# The same crates the CLI and the language server compose — by git rev, so the
# playground runs *that* code, not a re-implementation. Keep the `comline-core`
# rev identical across all of them (one `comline-core` in the tree).
comline-core = { git = "https://github.com/ComlineProject/core", rev = "1dc294ae97cc3649311e9f78c7eeac8c6f969c31" }
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "83162eac46c3689a4d4a681e3e4dc1be8bdbd856" }
comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "addca268903503f997a8f099e30261c2fff0c720" }
comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "40cab74beb727e293d1445cd3e9afa98e1ec380b" }
comline-core = { git = "https://github.com/ComlineProject/core", rev = "d11d82b95c5dfa0c72476eb0947772533b7ce7e5" }
comline-codegen = { git = "https://github.com/ComlineProject/generation", rev = "55d3fdc064ae3216f313975ce08071f3e5f32d3f" }
comline-codegen-rust = { git = "https://github.com/ComlineProject/comline-rust", rev = "be90c80b97266025c4a4b69588f26cff1ca51e06" }
comline-codegen-typescript = { git = "https://github.com/ComlineProject/comline-typescript", rev = "02ededc33c5473762c774757c69f5dfdef40626a" }
# The LSP's analysis layer (diagnostics / hover / completion / semantic tokens),
# without its `tower-lsp` server — builds for wasm32.
comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "0764367be56f18a6715cf7c385259debdbd9b6d2", default-features = false }
comline-language-server = { git = "https://github.com/ComlineProject/language-server", rev = "5c235fbdf5e9c451837248f0d061bcc46aa8e4c4", default-features = false }
lsp-types = "0.94"
rust-sitter = "0.4.5" # parse-error types

Expand Down
18 changes: 8 additions & 10 deletions wasm/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ use comline_codegen::versions::LangVersion;
use comline_codegen::{GenerateRequest, Mode, PackageMeta};

use comline_language_server::analysis::diagnostics::generate_diagnostics;
use comline_language_server::analysis::source::{apply_package_wire, declared_wire};
use comline_core::schema::ir::package_wire::apply_package_wire;
use comline_language_server::handlers::{completion, hover as hover_h, semantic_tokens};
use comline_language_server::parser;
use comline_language_server::util::byte_range_to_lsp_range;
Expand Down Expand Up @@ -649,18 +649,16 @@ fn interpret_project(files: &[FileInput]) -> Interpreted {
// The package's framing and handshake, into every protocol that doesn't
// write one: the handshake is one for the package, so all the files at
// once.
let mut frozen: Vec<(usize, (String, Vec<FrozenUnit>))> = frozen
let mut frozen: Vec<(usize, Vec<FrozenUnit>)> = frozen
.into_iter()
.enumerate()
.filter_map(|(i, units)| Some((i, (String::new(), units?))))
.filter_map(|(i, units)| Some((i, units?)))
.collect();
{
let mut all: Vec<(String, Vec<FrozenUnit>)> =
frozen.iter_mut().map(|(_, s)| std::mem::take(s)).collect();
apply_package_wire(&mut all, &declared_wire(CONGREGATION));
for ((_, slot), schema) in frozen.iter_mut().zip(all) {
*slot = schema;
}
let config = context.config_frozen.as_deref().unwrap_or(&[]);
let mut all: Vec<&mut [FrozenUnit]> =
frozen.iter_mut().map(|(_, units)| units.as_mut_slice()).collect();
apply_package_wire(&mut all, config);
}
let mut frozen = frozen.into_iter().peekable();

Expand All @@ -671,7 +669,7 @@ fn interpret_project(files: &[FileInput]) -> Interpreted {
let namespace = p.segments.join("::");

let units = match frozen.peek() {
Some((at, _)) if *at == i => frozen.next().map(|(_, (_, units))| units),
Some((at, _)) if *at == i => frozen.next().map(|(_, units)| units),
_ => None,
};
let Some(units) = units else {
Expand Down
Loading