From 4f9f8101852aa8abc9da7e089c67f1078b375a66 Mon Sep 17 00:00:00 2001 From: Simon Klee Date: Wed, 18 Nov 2026 14:34:53 +0100 Subject: [PATCH] test(cli-rs): gate the dialog surface Luau rows on cfg(luau) win-x64-link compiles Luau out on x86_64 Windows MSVC behind cfg(luau), but plugin_surface's dialog rows still gated their Luau carrier on the luau feature, so the Windows x64 check could not find opencode_plugin::luau. They now use cfg(luau), as the other Luau rows do. --- .../cli-rs/crates/tui/tests/all/plugin_surface.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli-rs/crates/tui/tests/all/plugin_surface.rs b/packages/cli-rs/crates/tui/tests/all/plugin_surface.rs index 96e79f47f97..439d60b6ca6 100644 --- a/packages/cli-rs/crates/tui/tests/all/plugin_surface.rs +++ b/packages/cli-rs/crates/tui/tests/all/plugin_surface.rs @@ -1656,7 +1656,7 @@ thread_local! { #[derive(Clone, Copy, Debug, PartialEq)] enum DialogCarrier { Native(Carrier), - #[cfg(feature = "luau")] + #[cfg(luau)] Luau, } @@ -1664,7 +1664,7 @@ fn dialog_carriers() -> Vec { vec![ DialogCarrier::Native(Carrier::Linked), DialogCarrier::Native(Carrier::Abi), - #[cfg(feature = "luau")] + #[cfg(luau)] DialogCarrier::Luau, ] } @@ -1742,7 +1742,7 @@ fn dialog_probe(setup: &mut abi::Setup) -> Result<(), String> { } /// [`dialog_probe`] in Luau, which records in its storage. -#[cfg(feature = "luau")] +#[cfg(luau)] const DIALOG_LUAU: &str = r#"local plugin = require("@opencode/plugin") local function text(text) return { type = "text", spans = { { text = text } } } end local function record(host, line) @@ -1782,7 +1782,7 @@ fn dialog_open(carrier: DialogCarrier) -> Harness { let host = opencode_tui::plugins::host::host(&harness.tui); opencode_plugin::loader::native::loopback(&host, entries).unwrap().0 } - #[cfg(feature = "luau")] + #[cfg(luau)] DialogCarrier::Luau => { let sources = opencode_plugin::luau::Sources::from_files([ ("plugin.toml", "id = \"test.dlg\""), @@ -1806,11 +1806,11 @@ fn dialog_turns(harness: &Harness) { } /// What the probe's handler recorded. -#[cfg_attr(not(feature = "luau"), allow(unused_variables))] +#[cfg_attr(not(luau), allow(unused_variables))] fn dialog_seen(harness: &Harness, carrier: DialogCarrier) -> Vec { match carrier { DialogCarrier::Native(_) => DIALOG_SEEN.with_borrow(Vec::clone), - #[cfg(feature = "luau")] + #[cfg(luau)] DialogCarrier::Luau => { let stored = opencode_plugin::Host::storage_read(&*harness.tui, "plugin.test.dlg.seen"); stored.and_then(|json| serde_json::from_str(&json).ok()).unwrap_or_default()