дзеркало
https://github.com/l0ng-ai/openidea.git
синхронізовано 2026-11-22 09:30:46 +02:00
Порівняти коміти
| Автор | SHA1 | Дата | |
|---|---|---|---|
|
|
2aa46f21bf | ||
|
|
7310d0ab01 | ||
|
|
2c6329012a | ||
|
|
f40bcd747f | ||
|
|
c752f007be | ||
|
|
bcdff6886f | ||
|
|
b7e9276b0f | ||
|
|
6023e391bc | ||
|
|
3d80e661b7 | ||
|
|
b66439ceda | ||
|
|
899fe888b7 | ||
|
|
e7de2aaf6d | ||
|
|
9293b13737 | ||
|
|
d1f79d05b3 | ||
|
|
176c43c908 | ||
|
|
20b6b0aed5 | ||
|
|
101a0862e4 | ||
|
|
b48f0b6071 | ||
|
|
a9b16c3e06 | ||
|
|
abd55f88b5 | ||
|
|
dac4db0994 | ||
|
|
b0d0ea868b | ||
|
|
d86ff872af | ||
|
|
dbef3cdc96 | ||
|
|
c483c3b76f | ||
|
|
da79a73def | ||
|
|
2cc54b35f6 | ||
|
|
097221c1b3 | ||
|
|
1bb4ffe6b2 | ||
|
|
51e525336b | ||
|
|
1b47bc2c14 | ||
|
|
aa1326496b | ||
|
|
7850429174 | ||
|
|
3dd5c75fa0 | ||
|
|
36ecb53159 | ||
|
|
006405ca11 | ||
|
|
40b95650cf | ||
|
|
0a571c0b4d | ||
|
|
b1f88bf79c | ||
|
|
0a6b3d011f | ||
|
|
fd9b20fa05 | ||
|
|
4f5622d72c | ||
|
|
f4a7a7bafb | ||
|
|
737afc6a8d | ||
|
|
6bf75155b6 | ||
|
|
bbedf7e1f6 | ||
|
|
42fd0fa8e0 | ||
|
|
97a41ae983 | ||
|
|
f29903b698 | ||
|
|
610fe23f88 | ||
|
|
59376b9718 | ||
|
|
170fd735dd | ||
|
|
e0ae9e764c | ||
|
|
19c1b72650 | ||
|
|
06ff2e51c3 | ||
|
|
6ae31b8148 | ||
|
|
3783b601b5 | ||
|
|
37044dcd89 | ||
|
|
1a2adab237 | ||
|
|
9ed87d77a7 | ||
|
|
9f4731189d | ||
|
|
92ccfac192 | ||
|
|
60d335eec0 | ||
|
|
a679e8086f | ||
|
|
4c20aa5c8d | ||
|
|
d19d74120b |
No files matched your search
Створено
@@ -5017,6 +5017,7 @@ dependencies = [
|
||||
"ignore",
|
||||
"notify",
|
||||
"parking_lot",
|
||||
"rayon",
|
||||
"rustix",
|
||||
"serde",
|
||||
"serde_json",
|
||||
|
||||
@@ -51,7 +51,7 @@ async fn run_once(
|
||||
move || launch.resolve_for_launch_with_copilot_env(&root, strip_ambient)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| e.to_string())?;
|
||||
.map_err(|e| e.to_string())??;
|
||||
let cwd = dunce::canonicalize(&root).unwrap_or(root);
|
||||
let updates = Arc::new(DiscoveryUpdates { provider: spec.id.clone(), ..Default::default() });
|
||||
let client = Dialect::wrap(updates.clone());
|
||||
|
||||
@@ -132,6 +132,7 @@ pub type McpExecutableFn = dyn Fn() -> Option<PathBuf> + Send + Sync;
|
||||
#[derive(Clone, Debug, PartialEq, Eq, Hash)]
|
||||
struct CopilotBinaryKey {
|
||||
command: String,
|
||||
github_account: Option<String>,
|
||||
modified: Option<std::time::SystemTime>,
|
||||
len: Option<u64>,
|
||||
}
|
||||
@@ -193,6 +194,7 @@ impl Shared {
|
||||
let metadata = std::fs::metadata(&executable).ok();
|
||||
CopilotBinaryKey {
|
||||
command: executable.to_string_lossy().into_owned(),
|
||||
github_account: provider::copilot_github_account(&spec.env),
|
||||
modified: metadata.as_ref().and_then(|m| m.modified().ok()),
|
||||
len: metadata.as_ref().map(std::fs::Metadata::len),
|
||||
}
|
||||
@@ -1126,6 +1128,16 @@ impl AgentManager {
|
||||
/// Changes a session setting (model, mode…): right away when the agent runs, else when it next starts.
|
||||
pub async fn set_config(&self, id: &str, option: &str, value: String) -> IdeResult<()> {
|
||||
let task = self.task(id)?;
|
||||
let provider = task.state.lock().task.provider.clone();
|
||||
let discovered = self
|
||||
.shared
|
||||
.paths
|
||||
.catalogs
|
||||
.cached(&self.shared, &provider)
|
||||
.config
|
||||
.iter()
|
||||
.find(|o| o.id == option && o.category.as_deref() == Some("model"))
|
||||
.cloned();
|
||||
let (target, change) = {
|
||||
let mut s = task.state.lock();
|
||||
let busy = s.busy;
|
||||
@@ -1146,17 +1158,19 @@ impl AgentManager {
|
||||
task.emit_task();
|
||||
return Ok(());
|
||||
}
|
||||
let target = s
|
||||
.task
|
||||
.config
|
||||
.iter()
|
||||
.find(|o| o.id == option)
|
||||
.ok_or_else(|| IdeError::not_found("no such setting"))?
|
||||
.clone();
|
||||
let session_target = s.task.config.iter().find(|o| o.id == option).cloned();
|
||||
let recovered_model = session_target.is_none();
|
||||
let target = match session_target {
|
||||
Some(target) => target,
|
||||
None if discovered.is_some() => discovered.unwrap(),
|
||||
None => return Err(IdeError::not_found("no such setting")),
|
||||
};
|
||||
if s.pending_model.is_some() && config::is_per_model_option(&target) {
|
||||
return Err(IdeError::invalid("This setting is not available on the selected model"));
|
||||
}
|
||||
if !target.values.iter().any(|v| v.value == value) {
|
||||
if recovered_model {
|
||||
(target, None)
|
||||
} else if !target.values.iter().any(|v| v.value == value) {
|
||||
if target.category.as_deref() != Some("model") {
|
||||
return Err(IdeError::invalid(format!("{} has no value {value}", target.name)));
|
||||
}
|
||||
@@ -2799,9 +2813,12 @@ impl Task {
|
||||
pending_model: Option<&PendingModel>,
|
||||
) -> Result<Live, SessionOpenError> {
|
||||
let launch_cwd = cwd.to_path_buf();
|
||||
let mut spec = tokio::task::spawn_blocking(move || spec.resolve_for_launch(&launch_cwd))
|
||||
.await
|
||||
.map_err(|e| SessionOpenError { message: e.to_string(), allow_acp_fallback: false })?;
|
||||
let mut spec = tokio::task::spawn_blocking(move || {
|
||||
spec.resolve_for_launch_with_copilot_env(&launch_cwd, provider::prefer_stored_copilot_auth())
|
||||
})
|
||||
.await
|
||||
.map_err(|e| SessionOpenError { message: e.to_string(), allow_acp_fallback: false })?
|
||||
.map_err(|e| SessionOpenError { message: e, allow_acp_fallback: false })?;
|
||||
if spec.driver == provider::Driver::Acp && provider::is_copilot_provider(provider_id) {
|
||||
let mcp_overrides = self.state.lock().task.mcp_overrides.clone();
|
||||
for name in self.shared.mcp_servers_off_for_session(provider_id, &mcp_overrides) {
|
||||
|
||||
@@ -144,7 +144,8 @@ async fn discover_once(spec: ProviderSpec, cwd: PathBuf, strip_ambient: bool) ->
|
||||
move || spec.resolve_for_launch_with_copilot_env(&cwd, strip_ambient)
|
||||
})
|
||||
.await
|
||||
.map_err(|e| DiscoverError { message: e.to_string(), allow_acp_fallback: false })?;
|
||||
.map_err(|e| DiscoverError { message: e.to_string(), allow_acp_fallback: false })?
|
||||
.map_err(|e| DiscoverError { message: e, allow_acp_fallback: false })?;
|
||||
let cwd = dunce::canonicalize(&cwd).unwrap_or(cwd);
|
||||
let args = headless_args(&launch.args);
|
||||
let peer = Peer::spawn_framed(
|
||||
|
||||
@@ -312,7 +312,7 @@ impl Settings {
|
||||
}
|
||||
|
||||
/// Parses `models.list` + optional `models.listTokenPriceUnits` into catalog entries,
|
||||
/// prepending `"auto"` when not already in the list.
|
||||
/// prepending `"auto"` when direct models are present or Copilot advertises an enabled Auto tier.
|
||||
pub(super) fn parse_catalog(list: &Value, price_units: Option<&Value>) -> Vec<ModelEntry> {
|
||||
let units = parse_price_units(price_units);
|
||||
let raw = list
|
||||
@@ -322,7 +322,7 @@ pub(super) fn parse_catalog(list: &Value, price_units: Option<&Value>) -> Vec<Mo
|
||||
.map(Vec::as_slice)
|
||||
.unwrap_or_default();
|
||||
let mut out = Vec::new();
|
||||
if !raw.iter().any(|m| str_of(m, "id") == Some("auto")) && !raw.is_empty() {
|
||||
if !raw.iter().any(|m| str_of(m, "id") == Some("auto")) && (!raw.is_empty() || auto_model_available(list)) {
|
||||
out.push(ModelEntry {
|
||||
id: "auto".into(),
|
||||
name: "Auto".into(),
|
||||
@@ -344,6 +344,18 @@ pub(super) fn parse_catalog(list: &Value, price_units: Option<&Value>) -> Vec<Mo
|
||||
out
|
||||
}
|
||||
|
||||
fn auto_model_available(list: &Value) -> bool {
|
||||
let Some(auto) = list.get("auto") else { return false };
|
||||
if auto.get("enabled").or_else(|| auto.pointer("/status/enabled")).and_then(Value::as_bool) == Some(false) {
|
||||
return false;
|
||||
}
|
||||
let Some(tiers) = auto.get("tiers").and_then(Value::as_array) else { return auto.is_object() };
|
||||
tiers.is_empty()
|
||||
|| tiers.iter().any(|tier| {
|
||||
tier.get("enabled").or_else(|| tier.pointer("/status/enabled")).and_then(Value::as_bool) != Some(false)
|
||||
})
|
||||
}
|
||||
|
||||
fn parse_model(m: &Value, units: &HashMap<String, PriceUnit>) -> Option<ModelEntry> {
|
||||
let id = str_of(m, "id")?.to_owned();
|
||||
if m.get("model_picker_enabled").and_then(Value::as_bool) == Some(false)
|
||||
|
||||
@@ -110,6 +110,72 @@ fn sample_price_units() -> Value {
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_an_enabled_auto_only_catalog() {
|
||||
let list = json!({
|
||||
"models": [],
|
||||
"auto": {
|
||||
"defaultTier": "balance",
|
||||
"tiers": [
|
||||
{
|
||||
"id": "balance",
|
||||
"displayName": "Standard",
|
||||
"type": "auto",
|
||||
"fusionTier": "standard",
|
||||
"status": { "enabled": true, "pickerVisible": true }
|
||||
},
|
||||
{
|
||||
"id": "hydrafusion",
|
||||
"displayName": "High",
|
||||
"type": "fusion",
|
||||
"fusionTier": "high",
|
||||
"status": {
|
||||
"enabled": false,
|
||||
"pickerVisible": true,
|
||||
"reason": "user_not_eligible"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "fast",
|
||||
"displayName": "Fast",
|
||||
"type": "auto",
|
||||
"status": { "enabled": true, "pickerVisible": false }
|
||||
}
|
||||
],
|
||||
"providerId": "copilot"
|
||||
},
|
||||
"imageModels": []
|
||||
});
|
||||
|
||||
let catalog = models::parse_catalog(&list, None);
|
||||
assert_eq!(catalog.iter().map(|m| m.id.as_str()).collect::<Vec<_>>(), ["auto"]);
|
||||
assert_eq!(Settings::new(&catalog, &UserDefaults::default()).model, "auto");
|
||||
|
||||
let options =
|
||||
config::parse_options(&models::config_options(&catalog, &Settings::new(&catalog, &UserDefaults::default())));
|
||||
let model = options.iter().find(|option| option.id == MODEL).unwrap();
|
||||
assert_eq!(model.current.as_deref(), Some("auto"));
|
||||
assert_eq!(model.values.iter().map(|value| value.value.as_str()).collect::<Vec<_>>(), ["auto"]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_an_auto_only_catalog_when_every_tier_is_disabled() {
|
||||
let list = json!({
|
||||
"models": [],
|
||||
"auto": {
|
||||
"defaultTier": "balance",
|
||||
"tiers": [
|
||||
{
|
||||
"id": "balance",
|
||||
"status": { "enabled": false, "pickerVisible": true }
|
||||
}
|
||||
]
|
||||
}
|
||||
});
|
||||
|
||||
assert!(models::parse_catalog(&list, None).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parses_tiered_context_windows_pricing_and_uses_copilots_own_defaults() {
|
||||
let catalog = models::parse_catalog(&sample_models_list(), Some(&sample_price_units()));
|
||||
|
||||
@@ -9,6 +9,8 @@ use serde_json::Value;
|
||||
use std::collections::BTreeMap;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
pub(crate) const COPILOT_GITHUB_ACCOUNT_ENV: &str = "OPENIDEA_COPILOT_GITHUB_ACCOUNT";
|
||||
|
||||
/// The protocol an agent speaks. Native ones run behind an in-process ACP endpoint
|
||||
/// (`native`), so tasks see every agent as ACP and read features from its capabilities.
|
||||
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
|
||||
@@ -138,15 +140,31 @@ impl ProviderSpec {
|
||||
/// Resolve once before connecting, so authentication guidance names that same install.
|
||||
pub(crate) fn resolve_for_launch(self, cwd: &Path) -> Self {
|
||||
let strip = prefer_stored_copilot_auth();
|
||||
self.resolve_for_launch_with_copilot_env(cwd, strip)
|
||||
self.resolve_for_launch_base(cwd, strip)
|
||||
}
|
||||
|
||||
pub(crate) fn resolve_for_launch_with_copilot_env(mut self, cwd: &Path, strip_ambient_tokens: bool) -> Self {
|
||||
pub(crate) fn resolve_for_launch_with_copilot_env(
|
||||
self,
|
||||
cwd: &Path,
|
||||
strip_ambient_tokens: bool,
|
||||
) -> Result<Self, String> {
|
||||
let account = is_copilot_provider(&self.id).then(|| copilot_github_account(&self.env)).flatten();
|
||||
let mut resolved = self.resolve_for_launch_base(cwd, strip_ambient_tokens || account.is_some());
|
||||
if let Some(account) = account {
|
||||
let token = github_token_for_account(&account)?;
|
||||
resolved.env.retain(|(name, _)| !AMBIENT_COPILOT_AUTH_VARS.contains(&name.as_str()));
|
||||
resolved.env.push(("COPILOT_GITHUB_TOKEN".into(), token));
|
||||
}
|
||||
Ok(resolved)
|
||||
}
|
||||
|
||||
fn resolve_for_launch_base(mut self, cwd: &Path, strip_ambient_tokens: bool) -> Self {
|
||||
if self.driver != Driver::Acp {
|
||||
self.command = crate::native::newest_install(&self.command);
|
||||
}
|
||||
if is_copilot_provider(&self.id) {
|
||||
self.env = sanitized_copilot_env(&self.env, strip_ambient_tokens);
|
||||
self.env.retain(|(name, _)| name != COPILOT_GITHUB_ACCOUNT_ENV);
|
||||
}
|
||||
let program = ide_jsonrpc::resolve_spawn_program(&self.command, &self.env);
|
||||
self.command =
|
||||
@@ -164,6 +182,50 @@ pub(crate) fn is_copilot_provider(id: &str) -> bool {
|
||||
id == "copilot" || id.starts_with("copilot-")
|
||||
}
|
||||
|
||||
pub(crate) fn copilot_github_account(env: &[(String, String)]) -> Option<String> {
|
||||
env.iter()
|
||||
.rev()
|
||||
.find(|(name, _)| name == COPILOT_GITHUB_ACCOUNT_ENV)
|
||||
.map(|(_, value)| value.trim())
|
||||
.filter(|value| !value.is_empty())
|
||||
.map(str::to_owned)
|
||||
}
|
||||
|
||||
fn github_token_for_account(account: &str) -> Result<String, String> {
|
||||
let path = ide_core::process::shell_env()
|
||||
.find(|(name, _)| name == "PATH")
|
||||
.map(|(_, value)| value)
|
||||
.or_else(|| ide_core::process::host_var_os("PATH"));
|
||||
let program = path
|
||||
.as_deref()
|
||||
.and_then(|path| ide_core::process::find_executable("gh", path))
|
||||
.ok_or_else(|| "GitHub CLI (`gh`) is required to select a Copilot GitHub account".to_owned())?;
|
||||
let mut command = std::process::Command::new(program);
|
||||
command.args(["auth", "token", "--hostname", "github.com", "--user", account]).envs(ide_core::process::shell_env());
|
||||
for name in AMBIENT_COPILOT_AUTH_VARS {
|
||||
command.env_remove(name);
|
||||
}
|
||||
let output = command
|
||||
.output()
|
||||
.map_err(|error| format!("Couldn't read GitHub authentication for account {account}: {error}"))?;
|
||||
if !output.status.success() {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr);
|
||||
let detail = stderr.trim();
|
||||
return Err(if detail.is_empty() {
|
||||
format!("GitHub CLI has no authenticated account named {account}")
|
||||
} else {
|
||||
format!("Couldn't use GitHub account {account}: {detail}")
|
||||
});
|
||||
}
|
||||
let token = String::from_utf8(output.stdout)
|
||||
.map_err(|_| format!("GitHub CLI returned a non-text token for account {account}"))?;
|
||||
let token = token.trim();
|
||||
if token.is_empty() {
|
||||
return Err(format!("GitHub CLI returned no token for account {account}"));
|
||||
}
|
||||
Ok(token.to_owned())
|
||||
}
|
||||
|
||||
pub(crate) fn prefer_stored_copilot_auth() -> bool {
|
||||
PREFER_STORED_COPILOT_AUTH.load(std::sync::atomic::Ordering::Acquire)
|
||||
}
|
||||
@@ -339,6 +401,31 @@ pub(crate) fn set_builtin_env(
|
||||
id: &str,
|
||||
env: BTreeMap<String, String>,
|
||||
) -> IdeResult<()> {
|
||||
if id == "copilot" {
|
||||
let file = custom_dir.join("copilot.toml");
|
||||
if file.try_exists()?
|
||||
&& let mut agent = CustomAgent::read_with(&file, id, secrets).map_err(IdeError::invalid)?
|
||||
&& agent.registry.is_some()
|
||||
{
|
||||
let existing = agent.env.clone();
|
||||
let mut existing_launch_env = existing.clone();
|
||||
let mut next_launch_env = env.clone();
|
||||
existing_launch_env.remove(COPILOT_GITHUB_ACCOUNT_ENV);
|
||||
next_launch_env.remove(COPILOT_GITHUB_ACCOUNT_ENV);
|
||||
if existing_launch_env != next_launch_env {
|
||||
return Err(IdeError::invalid(format!("{id} is installed from the ACP Registry")));
|
||||
}
|
||||
match env.get(COPILOT_GITHUB_ACCOUNT_ENV).filter(|value| !value.trim().is_empty()) {
|
||||
Some(account) => {
|
||||
agent.env.insert(COPILOT_GITHUB_ACCOUNT_ENV.into(), account.trim().into());
|
||||
}
|
||||
None => {
|
||||
agent.env.remove(COPILOT_GITHUB_ACCOUNT_ENV);
|
||||
}
|
||||
}
|
||||
return agent.write(&file).map_err(Into::into);
|
||||
}
|
||||
}
|
||||
update_builtin(custom_dir, secrets, id, |agent, _| agent.env = env)
|
||||
}
|
||||
|
||||
@@ -955,6 +1042,46 @@ mod tests {
|
||||
set_builtin_env(dir.path(), None, "not-a-builtin", env).unwrap_err();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn registry_copilot_allows_only_the_github_account_override() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
let file = dir.path().join("copilot.toml");
|
||||
CustomAgent {
|
||||
name: Some("GitHub Copilot".into()),
|
||||
driver: Driver::Acp,
|
||||
command: "/tools/copilot".into(),
|
||||
args: vec!["--acp".into()],
|
||||
env: BTreeMap::from([("REGISTRY_SETTING".into(), "kept".into())]),
|
||||
registry: Some(RegistryRef { id: "copilot".into(), version: "1.0.0".into() }),
|
||||
}
|
||||
.write(&file)
|
||||
.unwrap();
|
||||
|
||||
set_builtin_env(
|
||||
dir.path(),
|
||||
None,
|
||||
"copilot",
|
||||
BTreeMap::from([
|
||||
("REGISTRY_SETTING".into(), "kept".into()),
|
||||
(COPILOT_GITHUB_ACCOUNT_ENV.into(), "dengliu_microsoft".into()),
|
||||
]),
|
||||
)
|
||||
.unwrap();
|
||||
let spec = load(Some(dir.path()), None).into_iter().find(|spec| spec.id == "copilot").unwrap();
|
||||
assert_eq!(copilot_github_account(&spec.env).as_deref(), Some("dengliu_microsoft"));
|
||||
|
||||
set_builtin_env(dir.path(), None, "copilot", BTreeMap::from([("REGISTRY_SETTING".into(), "changed".into())]))
|
||||
.unwrap_err();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn launch_metadata_never_passes_the_github_account_control_to_copilot() {
|
||||
let mut spec = builtin_spec("copilot").unwrap();
|
||||
spec.env.push((COPILOT_GITHUB_ACCOUNT_ENV.into(), "dengliu_microsoft".into()));
|
||||
let resolved = spec.resolve_for_launch(Path::new("."));
|
||||
assert!(resolved.env.iter().all(|(name, _)| name != COPILOT_GITHUB_ACCOUNT_ENV));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn acp_adapters_of_native_agents_are_unlisted_until_customized() {
|
||||
let dir = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -537,6 +537,14 @@ fn install_entry_with(
|
||||
return Err(e);
|
||||
}
|
||||
};
|
||||
let github_account = (entry.id == "copilot")
|
||||
.then(|| CustomAgent::read(&file).ok())
|
||||
.flatten()
|
||||
.and_then(|agent| agent.env.get(provider::COPILOT_GITHUB_ACCOUNT_ENV).cloned());
|
||||
let mut env = env;
|
||||
if let Some(account) = github_account {
|
||||
env.insert(provider::COPILOT_GITHUB_ACCOUNT_ENV.into(), account);
|
||||
}
|
||||
let agent = CustomAgent {
|
||||
name: Some(entry.name.clone()),
|
||||
driver: Driver::Acp,
|
||||
|
||||
@@ -2333,6 +2333,56 @@ async fn idle_model_switches_discover_controls_and_no_control_models_without_ano
|
||||
restored.shutdown();
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn session_without_a_model_option_can_select_from_a_recovered_catalog() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
let agent = Arc::new(FakeAgent::default());
|
||||
*agent.model_options.lock() = HashMap::from([
|
||||
("big".into(), effort_options(&["low", "high"], "high")),
|
||||
("small".into(), effort_options(&["minimal", "medium"], "minimal")),
|
||||
]);
|
||||
let mgr = manager(tmp.path(), agent);
|
||||
let task = mgr
|
||||
.create(NewAgentTask {
|
||||
prompt: text("again"),
|
||||
provider: "claude-acp".into(),
|
||||
isolation: Isolation::Local,
|
||||
..Default::default()
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
wait_for(&mgr, &task.id, AgentStatus::Ready).await;
|
||||
|
||||
let spec = mgr.shared.spec("claude-acp").unwrap();
|
||||
let (_, flight) = mgr.shared.paths.catalogs.request(&mgr.shared, spec, true, None);
|
||||
if let Some(mut ready) = flight {
|
||||
tokio::time::timeout(Duration::from_secs(5), async {
|
||||
while !*ready.borrow_and_update() {
|
||||
ready.changed().await.unwrap();
|
||||
}
|
||||
})
|
||||
.await
|
||||
.unwrap();
|
||||
}
|
||||
{
|
||||
let task = mgr.task(&task.id).unwrap();
|
||||
let mut state = task.state.lock();
|
||||
state.task.config.retain(|option| option.category.as_deref() != Some("model"));
|
||||
state.task.model = Some("stale-model".into());
|
||||
}
|
||||
|
||||
mgr.set_config(&task.id, "model", "small".into()).await.unwrap();
|
||||
let task = mgr.task(&task.id).unwrap();
|
||||
{
|
||||
let state = task.state.lock();
|
||||
assert_eq!(state.task.model.as_deref(), Some("small"));
|
||||
let model = state.task.config.iter().find(|option| option.category.as_deref() == Some("model")).unwrap();
|
||||
assert_eq!(model.current.as_deref(), Some("small"));
|
||||
assert!(model.values.iter().any(|value| value.value == "small"));
|
||||
}
|
||||
mgr.shutdown();
|
||||
}
|
||||
|
||||
#[tokio::test(flavor = "multi_thread")]
|
||||
async fn idle_model_discovery_failure_restores_the_previous_choice_without_claiming_no_controls() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -2020,11 +2020,25 @@ fn property_target(text: &str, path: &Path, name: &str, local_repo: Option<PathB
|
||||
label: name.clone(),
|
||||
});
|
||||
}
|
||||
// Built-in coordinates: the POM's own element, else the first ancestor declaring one.
|
||||
if let Some(key) = name.strip_prefix("project.") {
|
||||
if !matches!(key, "groupId" | "artifactId" | "version" | "packaging" | "name") {
|
||||
return None; // `project.basedir`, `project.build.directory`… have no element.
|
||||
// Built-in coordinates (`project.artifactId`, and the bare `@artifactId@`
|
||||
// shorthand resource filtering resolves the same way): the POM's own element,
|
||||
// else the first ancestor declaring one. Any other name under `project.` is a
|
||||
// custom property (`project.port`, `project.servlet.path`), which the
|
||||
// `<properties>` lookup below resolves.
|
||||
let built_in = match name.strip_prefix("project.") {
|
||||
Some(key) if matches!(key, "groupId" | "artifactId" | "version" | "packaging" | "name") => Some(key),
|
||||
// `project.basedir`, `project.build.directory`… have no element of their own.
|
||||
Some(_) => None,
|
||||
None if matches!(name.as_str(), "groupId" | "artifactId" | "version" | "packaging" | "name") => {
|
||||
// The bare shorthand of a built-in; a custom property of that name wins.
|
||||
if let Some(found) = properties_target(&chain, &name, &resolver) {
|
||||
return Some(found);
|
||||
}
|
||||
Some(name.as_str())
|
||||
}
|
||||
None => None,
|
||||
};
|
||||
if let Some(key) = built_in {
|
||||
for (p, text) in &chain {
|
||||
let Some(root) = xml::parse(text).filter(|e| e.name == "project") else { continue };
|
||||
let Some(e) = root.child(key).filter(|e| !e.text.trim().is_empty()) else { continue };
|
||||
@@ -2037,30 +2051,34 @@ fn property_target(text: &str, path: &Path, name: &str, local_repo: Option<PathB
|
||||
}
|
||||
return None;
|
||||
}
|
||||
// A property of `<properties>`: the first POM of the chain (child-first) that
|
||||
// declares it, at project level or in an active profile.
|
||||
for (p, text) in &chain {
|
||||
properties_target(&chain, &name, &resolver)
|
||||
}
|
||||
|
||||
/// A property of `<properties>`: the first POM of the chain (child-first) that
|
||||
/// declares it, at project level or in an active profile.
|
||||
fn properties_target(chain: &[(PathBuf, String)], name: &str, resolver: &Resolver) -> Option<PomGoto> {
|
||||
for (p, text) in chain {
|
||||
let Some(root) = xml::parse(text).filter(|e| e.name == "project") else { continue };
|
||||
let active: Vec<String> = parse_pom(text)
|
||||
.map(|pom| resolver.active(&pom.profiles).map(|pr| pr.id.clone()).collect())
|
||||
.unwrap_or_default();
|
||||
// Project level first, then the first active profile declaring the property.
|
||||
let e = root.child("properties").and_then(|props| props.child(&name)).or_else(|| {
|
||||
let e = root.child("properties").and_then(|props| props.child(name)).or_else(|| {
|
||||
root.list("profiles", "profile")
|
||||
.into_iter()
|
||||
.find(|profile| {
|
||||
active.contains(&profile.child("id").map(|id| id.text.trim().to_owned()).unwrap_or_default())
|
||||
&& profile.child("properties").and_then(|props| props.child(&name)).is_some()
|
||||
&& profile.child("properties").and_then(|props| props.child(name)).is_some()
|
||||
})?
|
||||
.child("properties")?
|
||||
.child(&name)
|
||||
.child(name)
|
||||
});
|
||||
if let Some(e) = e {
|
||||
return Some(PomGoto {
|
||||
path: p.clone(),
|
||||
range: range_of(text, e),
|
||||
kind: PomGotoKind::Property,
|
||||
label: name.clone(),
|
||||
label: name.to_owned(),
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -3086,6 +3104,65 @@ mod tests {
|
||||
assert_eq!(goto.range, Range::new(pos_at(&text, from), pos_at(&text, to)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_custom_project_property_is_found_like_a_plain_one() {
|
||||
let text = format!(
|
||||
r#"{CHILD_HEADER}<properties>
|
||||
<project.port>8001</project.port>
|
||||
</properties>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
<version>${{project.port}}</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>"#
|
||||
);
|
||||
let path = Path::new("/tmp/pom.xml");
|
||||
let goto = goto_declaration(&text, path, at(&text, "${project.port}"), None).unwrap();
|
||||
assert_eq!(goto.kind, PomGotoKind::Property);
|
||||
assert_eq!(goto.label, "project.port");
|
||||
assert_eq!(goto.path, path);
|
||||
let from = text.find("<project.port>").unwrap();
|
||||
let to = text.find("</project.port>").unwrap() + "</project.port>".len();
|
||||
assert_eq!(goto.range, Range::new(pos_at(&text, from), pos_at(&text, to)));
|
||||
// `${project.basedir}` has no element and no custom property: still nothing.
|
||||
let basedir = text.replace("${project.port}", "${project.basedir}");
|
||||
assert_eq!(goto_declaration(&basedir, path, at(&basedir, "${project.basedir}"), None), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn the_bare_builtin_shorthand_resolves_to_the_coordinate_and_a_custom_property_wins() {
|
||||
let text = format!(
|
||||
r#"{CHILD_HEADER}<artifactId>app</artifactId>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.example</groupId>
|
||||
<artifactId>lib</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
<properties>
|
||||
<groupId>custom</groupId>
|
||||
</properties>
|
||||
<description>${{artifactId}}-${{groupId}} docs</description>
|
||||
</project>"#
|
||||
);
|
||||
let path = Path::new("/tmp/pom.xml");
|
||||
// `@artifactId@` in a filtered resource resolves to the own coordinate.
|
||||
let goto = goto_declaration(&text, path, at(&text, "${artifactId}"), None).unwrap();
|
||||
assert_eq!(goto.label, "artifactId");
|
||||
let from = text.find("<artifactId>app").unwrap();
|
||||
assert_eq!(goto.range.start, pos_at(&text, from));
|
||||
// A custom property of the bare name wins over the shorthand. The click
|
||||
// sits inside the reference: the second one's `$` is behind the first's
|
||||
// closing `}`, which `property_ref_at` does not take for the `$` itself.
|
||||
let goto = goto_declaration(&text, path, at(&text, "groupId} docs"), None).unwrap();
|
||||
assert_eq!(goto.label, "groupId");
|
||||
let from = text.find("<groupId>custom").unwrap();
|
||||
assert_eq!(goto.range.start, pos_at(&text, from));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn an_inherited_property_reference_finds_its_definition_in_the_parent_pom() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -100,16 +100,6 @@ pub struct AgentSettings {
|
||||
pub smooth_text: bool,
|
||||
/// Conversations and the composer expand to the full width of the pane instead of staying in a centred column.
|
||||
pub fit_window_width: bool,
|
||||
/// While the agent works, playful words fill the pauses in what it reports.
|
||||
pub playful_status: bool,
|
||||
/// Seconds the agent reports nothing new before the playful words take over; 0 shows them
|
||||
/// from the start.
|
||||
pub playful_after_seconds: u32,
|
||||
/// The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
|
||||
/// the built-in ones of that activity; an empty list keeps its status factual.
|
||||
#[serde(deserialize_with = "or_default")]
|
||||
#[specta(type = BTreeMap<String, Vec<String>>)]
|
||||
pub playful_words: BTreeMap<String, Vec<String>>,
|
||||
#[serde(deserialize_with = "or_default")]
|
||||
#[specta(type = ThinkingDisplay)]
|
||||
pub thinking: ThinkingDisplay,
|
||||
@@ -152,9 +142,6 @@ impl Default for AgentSettings {
|
||||
fold_turns: true,
|
||||
smooth_text: true,
|
||||
fit_window_width: false,
|
||||
playful_status: false,
|
||||
playful_after_seconds: 0,
|
||||
playful_words: BTreeMap::new(),
|
||||
thinking: ThinkingDisplay::Auto,
|
||||
tool_calls: ToolCallDisplay::Grouped,
|
||||
expand_tool_output: false,
|
||||
|
||||
@@ -176,6 +176,8 @@ pub struct CommitSettings {
|
||||
pub agent_model: String,
|
||||
/// That model's thinking level for commit messages; empty keeps the agent's.
|
||||
pub agent_effort: String,
|
||||
/// Show the Generate Commit Message with Agent button above the commit message.
|
||||
pub agent_button: bool,
|
||||
}
|
||||
|
||||
impl Default for CommitSettings {
|
||||
@@ -201,6 +203,7 @@ impl Default for CommitSettings {
|
||||
agent: String::new(),
|
||||
agent_model: String::new(),
|
||||
agent_effort: String::new(),
|
||||
agent_button: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -217,7 +217,8 @@ impl ManageConnection for MssqlConnectionManager {
|
||||
let row = client.simple_query("SELECT DB_NAME()").await?.into_row().await?;
|
||||
let default = row
|
||||
.and_then(|r| r.get::<&str, _>(0).map(str::to_owned))
|
||||
.and_then(|db| crate::sql::use_schema(DbDriver::SqlServer, &db));
|
||||
// Statements that `USE` another database must not move the pooled connection for good.
|
||||
.map(|db| format!("USE {}", crate::sql::quote_ident(DbDriver::SqlServer, &db)));
|
||||
Ok(MssqlConnection(Some(client), Context::new(default)))
|
||||
}
|
||||
|
||||
@@ -748,6 +749,14 @@ impl Pool {
|
||||
}
|
||||
|
||||
/// The keep-alive ping (Oracle needs a FROM clause).
|
||||
/// Keep-alive: one cheap round trip on the session.
|
||||
pub async fn ping(&self) -> IdeResult<()> {
|
||||
match self {
|
||||
Pool::Jdbc(p) => p.ping().await,
|
||||
_ => self.rows(self.ping_sql(), 1).await.map(|_| ()),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ping_sql(&self) -> &'static str {
|
||||
match self {
|
||||
Pool::Oracle(_) => "SELECT 1 FROM DUAL",
|
||||
|
||||
@@ -5,6 +5,7 @@ use crate::{DataSource, DbManager, QueryResult, ResultColumn};
|
||||
use ide_core::{CancellationToken, IdeError, IdeResult};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
use std::collections::HashMap;
|
||||
use std::io::{Cursor, Read};
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::Stdio;
|
||||
@@ -458,6 +459,44 @@ impl JdbcPool {
|
||||
}
|
||||
|
||||
async fn request(&self, fields: &[&str], sql: &str, cancel: &CancellationToken) -> IdeResult<QueryResult> {
|
||||
let result = self.exchange_once(fields, sql, cancel).await;
|
||||
if let Err(e) = &result
|
||||
&& fields.first() != Some(&"open")
|
||||
&& e.kind != ide_core::error::ErrorKind::Cancelled
|
||||
&& !self.is_closed()
|
||||
&& !self.session_valid().await
|
||||
{
|
||||
// The session is gone (a proxy or tunnel dropped the idle TCP connection): close the
|
||||
// pool so the next statement or Connect starts a new one instead of failing forever.
|
||||
self.close().await;
|
||||
}
|
||||
result
|
||||
}
|
||||
|
||||
/// Keep-alive: checks the session (any SQL would be dialect-specific) and closes a dead one.
|
||||
pub(crate) async fn ping(&self) -> IdeResult<()> {
|
||||
if self.session_valid().await {
|
||||
return Ok(());
|
||||
}
|
||||
self.close().await;
|
||||
Err(IdeError::new(ide_core::error::ErrorKind::Io, "JDBC connection was lost"))
|
||||
}
|
||||
|
||||
/// Whether the JDBC session still works, asked after a failed statement.
|
||||
async fn session_valid(&self) -> bool {
|
||||
if self.bridge.lock().await.is_none() {
|
||||
return false;
|
||||
}
|
||||
let cancel = CancellationToken::new();
|
||||
match tokio::time::timeout(Duration::from_secs(10), self.exchange_once(&["valid"], "", &cancel)).await {
|
||||
Ok(Ok(result)) => {
|
||||
result.rows.first().and_then(|row| row.first()).cloned().flatten().as_deref() != Some("false")
|
||||
}
|
||||
Ok(Err(_)) | Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
||||
async fn exchange_once(&self, fields: &[&str], sql: &str, cancel: &CancellationToken) -> IdeResult<QueryResult> {
|
||||
let mut slot = tokio::select! {
|
||||
biased;
|
||||
() = cancel.cancelled() => return Err(IdeError::cancelled()),
|
||||
@@ -562,14 +601,26 @@ fn decode(data: &[u8], sql: &str, elapsed_ms: f64) -> IdeResult<QueryResult> {
|
||||
impl DbManager {
|
||||
pub(crate) async fn jdbc_completion(&self, id: &str, pool: &JdbcPool) -> IdeResult<crate::CompletionModel> {
|
||||
let mut tables = vec![];
|
||||
let mut column_count = 0;
|
||||
let schemas = self.schemas(id).await?;
|
||||
for schema in &schemas {
|
||||
// Columns of the whole namespace in one call; a driver that refuses it still completes tables.
|
||||
let mut columns = if column_count < crate::MAX_META_ROWS {
|
||||
pool.metadata(&["schemaColumns", schema]).await.map(schema_columns).unwrap_or_else(|e| {
|
||||
tracing::warn!("JDBC columns of {schema}: {}", e.message);
|
||||
HashMap::new()
|
||||
})
|
||||
} else {
|
||||
HashMap::new()
|
||||
};
|
||||
for table in self.tables(id, schema).await? {
|
||||
let columns = columns.remove(&table.name).unwrap_or_default();
|
||||
column_count += columns.len();
|
||||
tables.push(crate::CompletionTable {
|
||||
schema: schema.clone(),
|
||||
name: table.name,
|
||||
kind: table.kind,
|
||||
columns: vec![],
|
||||
columns,
|
||||
});
|
||||
if tables.len() >= crate::MAX_META_ROWS {
|
||||
break;
|
||||
@@ -594,10 +645,49 @@ impl DbManager {
|
||||
}
|
||||
}
|
||||
|
||||
/// The bridge's `schemaColumns` rows (table, name, type, nullable, default) by table.
|
||||
fn schema_columns(rows: Vec<Vec<Option<String>>>) -> HashMap<String, Vec<crate::CompletionColumn>> {
|
||||
let mut by_table: HashMap<String, Vec<crate::CompletionColumn>> = HashMap::new();
|
||||
for row in rows {
|
||||
let mut it = row.into_iter();
|
||||
let (Some(Some(table)), Some(Some(name))) = (it.next(), it.next()) else { continue };
|
||||
let data_type = it.next().flatten().unwrap_or_default();
|
||||
let nullable = it.next().flatten().as_deref() != Some("0");
|
||||
let has_default = it.next().flatten().is_some();
|
||||
by_table.entry(table).or_default().push(crate::CompletionColumn {
|
||||
name,
|
||||
data_type,
|
||||
nullable,
|
||||
primary_key: false,
|
||||
has_default,
|
||||
});
|
||||
}
|
||||
by_table
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn schema_columns_group_by_table() {
|
||||
let row = |t: &str, n: &str, null: &str, def: Option<&str>| {
|
||||
vec![Some(t.into()), Some(n.into()), Some("INT".into()), Some(null.into()), def.map(Into::into)]
|
||||
};
|
||||
let by_table = schema_columns(vec![
|
||||
row("orders", "id", "0", None),
|
||||
row("orders", "note", "1", Some("'none'")),
|
||||
row("items", "sku", "1", None),
|
||||
vec![None, Some("orphan".into())],
|
||||
]);
|
||||
let orders = &by_table["orders"];
|
||||
assert_eq!(orders.iter().map(|c| c.name.as_str()).collect::<Vec<_>>(), ["id", "note"]);
|
||||
assert_eq!((orders[0].nullable, orders[0].has_default), (false, false));
|
||||
assert_eq!((orders[1].nullable, orders[1].has_default), (true, true));
|
||||
assert_eq!(by_table["items"].len(), 1);
|
||||
assert_eq!(by_table.len(), 2);
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn frame_codec_checks_both_16_mib_boundaries() {
|
||||
assert_eq!(encode(7, &["a"]).unwrap(), [0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 1, 0, 0, 0, 1, b'a']);
|
||||
|
||||
@@ -379,8 +379,8 @@ pub(crate) fn keep_alive(pool: &Arc<Pool>, every: Duration) {
|
||||
loop {
|
||||
tick.tick().await;
|
||||
let Some(p) = pool.upgrade().filter(|p| !p.is_closed()) else { break };
|
||||
if let Err(e) = p.rows(p.ping_sql(), 1).await {
|
||||
tracing::debug!("keep-alive: {}", e.message);
|
||||
if let Err(e) = p.ping().await {
|
||||
tracing::info!("keep-alive: {}", e.message);
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -847,12 +847,12 @@ impl DbManager {
|
||||
}
|
||||
|
||||
pub fn is_connected(&self, id: &str) -> bool {
|
||||
self.pools.lock().contains_key(id)
|
||||
self.pools.lock().get(id).is_some_and(|p| !p.is_closed())
|
||||
}
|
||||
|
||||
/// Connected targets (data source ids, `<id>:<database>`).
|
||||
pub fn connected(&self) -> Vec<String> {
|
||||
self.pools.lock().keys().cloned().collect()
|
||||
self.pools.lock().iter().filter(|(_, p)| !p.is_closed()).map(|(id, _)| id.clone()).collect()
|
||||
}
|
||||
|
||||
/// The pool of target `id`, connecting first if needed.
|
||||
@@ -862,8 +862,13 @@ impl DbManager {
|
||||
if self.tunnels.lock().get(source_id).is_some_and(|t| t.is_closed()) {
|
||||
self.disconnect_source(source_id).await;
|
||||
}
|
||||
if let Some(p) = self.pools.lock().get(id) {
|
||||
return Ok(p.clone());
|
||||
let cached = self.pools.lock().get(id).cloned();
|
||||
if let Some(p) = cached {
|
||||
if !p.is_closed() {
|
||||
return Ok(p);
|
||||
}
|
||||
// The connection broke (a custom JDBC session whose TCP connection was dropped): reconnect.
|
||||
self.disconnect(id).await;
|
||||
}
|
||||
let source = self.source(id)?;
|
||||
let password = self.password(&source).await;
|
||||
@@ -917,7 +922,7 @@ impl DbManager {
|
||||
|
||||
/// Disconnects every database of data source `id`.
|
||||
pub async fn disconnect_source(&self, id: &str) {
|
||||
let targets: Vec<String> = self.connected().into_iter().filter(|t| split_target(t).0 == id).collect();
|
||||
let targets: Vec<String> = self.pools.lock().keys().filter(|t| split_target(t).0 == id).cloned().collect();
|
||||
for t in targets {
|
||||
self.disconnect(&t).await;
|
||||
}
|
||||
|
||||
@@ -442,7 +442,8 @@ pub fn current_schema(driver: DbDriver) -> Option<&'static str> {
|
||||
DbDriver::Sqlite | DbDriver::Jdbc => None,
|
||||
DbDriver::Postgres => Some("SELECT current_schema()"),
|
||||
DbDriver::Mysql => Some("SELECT DATABASE()"),
|
||||
DbDriver::SqlServer => Some("SELECT DB_NAME()"),
|
||||
// The login's default schema; the database is the console's target (IDEA's `database.schema`).
|
||||
DbDriver::SqlServer => Some("SELECT SCHEMA_NAME()"),
|
||||
DbDriver::Oracle => Some("SELECT SYS_CONTEXT('USERENV', 'CURRENT_SCHEMA') FROM DUAL"),
|
||||
DbDriver::Snowflake => Some("SELECT CURRENT_SCHEMA()"),
|
||||
}
|
||||
@@ -450,12 +451,13 @@ pub fn current_schema(driver: DbDriver) -> Option<&'static str> {
|
||||
|
||||
/// The statement that makes unqualified names resolve in `schema` on the
|
||||
/// connection that runs it (a query console's active schema; `None`: the driver
|
||||
/// has no schema to switch — SQLite's `main`, ClickHouse's `USE` differs).
|
||||
/// has no schema to switch — SQLite's `main`, ClickHouse's `USE` differs, and SQL Server
|
||||
/// cannot change a session's default schema, so its console schema only scopes resolution).
|
||||
pub fn use_schema(driver: DbDriver, schema: &str) -> Option<String> {
|
||||
match driver {
|
||||
DbDriver::Sqlite | DbDriver::Clickhouse | DbDriver::Jdbc => None,
|
||||
DbDriver::Sqlite | DbDriver::Clickhouse | DbDriver::Jdbc | DbDriver::SqlServer => None,
|
||||
DbDriver::Postgres => Some(format!("SET search_path TO {}", quote_ident(driver, schema))),
|
||||
DbDriver::Mysql | DbDriver::SqlServer => Some(format!("USE {}", quote_ident(driver, schema))),
|
||||
DbDriver::Mysql => Some(format!("USE {}", quote_ident(driver, schema))),
|
||||
DbDriver::Oracle => Some(format!("ALTER SESSION SET CURRENT_SCHEMA = {}", quote_ident(driver, schema))),
|
||||
DbDriver::Snowflake => Some(format!("USE SCHEMA {}", quote_ident(driver, schema))),
|
||||
}
|
||||
@@ -1030,7 +1032,7 @@ mod tests {
|
||||
assert_eq!(quote_ident(DbDriver::SqlServer, "a]b"), "[a]]b]");
|
||||
assert_eq!(qualified(DbDriver::SqlServer, "dbo", "t"), "[dbo].[t]");
|
||||
assert_eq!(qualified(DbDriver::SqlServer, "", "t"), "[t]");
|
||||
assert_eq!(current_schema(DbDriver::SqlServer), Some("SELECT DB_NAME()"));
|
||||
assert_eq!(current_schema(DbDriver::SqlServer), Some("SELECT SCHEMA_NAME()"));
|
||||
assert_eq!(crate::conn::begin_statement(DbDriver::SqlServer), "BEGIN TRAN");
|
||||
assert_eq!(
|
||||
schemas(DbDriver::SqlServer, true),
|
||||
@@ -1149,7 +1151,7 @@ mod tests {
|
||||
fn schema_switch_statement_per_dialect() {
|
||||
assert_eq!(use_schema(DbDriver::Postgres, "app data"), Some("SET search_path TO \"app data\"".into()));
|
||||
assert_eq!(use_schema(DbDriver::Mysql, "a`b"), Some("USE `a``b`".into()));
|
||||
assert_eq!(use_schema(DbDriver::SqlServer, "app] data"), Some("USE [app]] data]".into()));
|
||||
assert_eq!(use_schema(DbDriver::SqlServer, "dbo"), None);
|
||||
assert_eq!(use_schema(DbDriver::Postgres, "a\"b"), Some("SET search_path TO \"a\"\"b\"".into()));
|
||||
assert_eq!(use_schema(DbDriver::Oracle, "a\"b"), Some("ALTER SESSION SET CURRENT_SCHEMA = \"a\"\"b\"".into()));
|
||||
assert!(sqlserver_databases().contains("state = 0 AND HAS_DBACCESS(name) = 1"));
|
||||
|
||||
@@ -90,7 +90,10 @@ async fn duckdb_custom_driver_through_database_manager() -> IdeResult<()> {
|
||||
assert!(result.has_more);
|
||||
assert_eq!(result.rows, vec![vec![Some("1".into()), None]]);
|
||||
assert_eq!(result.columns[1].name, "label");
|
||||
assert_eq!(db.completion("test").await?.default_schema, "main");
|
||||
let completion = db.completion("test").await?;
|
||||
assert_eq!(completion.default_schema, "main");
|
||||
let items = completion.tables.iter().find(|t| t.schema == "main" && t.name == "items").expect("items");
|
||||
assert_eq!(items.columns.iter().map(|c| c.name.as_str()).collect::<Vec<_>>(), ["id", "label"]);
|
||||
db.execute("test", "create temporary table session_marker as select 42 as id", 1, &c).await?;
|
||||
let stop = CancellationToken::new();
|
||||
let (cancelled, ()) =
|
||||
@@ -213,3 +216,36 @@ async fn unresponsive_driver_closes_before_reconnect() -> IdeResult<()> {
|
||||
db.disconnect("test").await;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
#[ignore = "requires JDBC_FIXTURE_JAR (java/jdbc-bridge/build.py --test --out fixture.jar) and Java 17+"]
|
||||
async fn a_lost_session_reconnects_on_the_next_statement() -> IdeResult<()> {
|
||||
let tmp = tempfile::tempdir()?;
|
||||
let db = manager(tmp.path());
|
||||
db.save_jdbc_driver(DbJdbcDriver {
|
||||
id: "fixture".into(),
|
||||
name: "Fixture".into(),
|
||||
jars: vec![std::env::var("JDBC_FIXTURE_JAR").unwrap()],
|
||||
class_name: "ai.openidea.jdbc.SelfTest$Fixture".into(),
|
||||
url_template: String::new(),
|
||||
})?;
|
||||
let source = DataSource {
|
||||
id: "test".into(),
|
||||
name: "Fixture".into(),
|
||||
driver: DbDriver::Jdbc,
|
||||
global: true,
|
||||
jdbc_driver: "fixture".into(),
|
||||
url: "jdbc:fixture:".into(),
|
||||
..Default::default()
|
||||
};
|
||||
db.save_sources(vec![source]).await?;
|
||||
let cancel = CancellationToken::new();
|
||||
db.execute("test", "first", 1, &cancel).await?;
|
||||
// The fixture's session reports itself invalid after "drop", like a connection a proxy reset.
|
||||
assert!(db.execute("test", "drop", 1, &cancel).await.unwrap_err().message.contains("connection reset"));
|
||||
assert!(!db.is_connected("test"), "a lost session is no longer listed as connected");
|
||||
assert_eq!(db.execute("test", "after reconnect", 1, &cancel).await?.affected, Some(1.0));
|
||||
assert!(db.is_connected("test"));
|
||||
db.disconnect("test").await;
|
||||
Ok(())
|
||||
}
|
||||
@@ -7,9 +7,10 @@
|
||||
|
||||
use crate::{
|
||||
COMPOSE_DIR, COMPOSE_FILES, COMPOSE_PROJECT, COMPOSE_SERVICE, ContainerOp, DockerAvailability, DockerContainer,
|
||||
DockerEndpoint, DockerImage, DockerNetwork, DockerObject, DockerSnapshot, DockerVolume, split_csv,
|
||||
DockerEndpoint, DockerImage, DockerImageLayer, DockerLogLine, DockerNetwork, DockerObject, DockerProcessList,
|
||||
DockerSnapshot, DockerVolume, split_csv,
|
||||
};
|
||||
use ide_core::{IdeError, IdeResult};
|
||||
use ide_core::{CancellationToken, IdeError, IdeResult};
|
||||
use serde::Deserialize;
|
||||
use std::collections::BTreeMap;
|
||||
use std::io::{Read, Write};
|
||||
@@ -193,9 +194,15 @@ fn request(addr: &Address, method: &str, path: &str, timeout: Duration) -> IdeRe
|
||||
read_response(&mut conn)
|
||||
}
|
||||
|
||||
/// Reads an HTTP/1.1 response: head until `\r\n\r\n`, then the body per its
|
||||
/// framing (chunked, `Content-Length`, or until the connection closes).
|
||||
fn read_response(stream: &mut impl Read) -> IdeResult<Response> {
|
||||
/// A response's status line and body framing.
|
||||
struct Head {
|
||||
status: u16,
|
||||
chunked: bool,
|
||||
length: Option<usize>,
|
||||
}
|
||||
|
||||
/// Reads an HTTP/1.1 response head until `\r\n\r\n`.
|
||||
fn read_head(stream: &mut impl Read) -> IdeResult<Head> {
|
||||
let mut head: Vec<u8> = Vec::new();
|
||||
let mut byte = [0u8; 1];
|
||||
loop {
|
||||
@@ -228,16 +235,27 @@ fn read_response(stream: &mut impl Read) -> IdeResult<Response> {
|
||||
length = value.parse().ok();
|
||||
}
|
||||
}
|
||||
let body = if chunked {
|
||||
Ok(Head { status, chunked, length })
|
||||
}
|
||||
|
||||
/// Reads an HTTP/1.1 response: its head, then the body per its framing
|
||||
/// (chunked, `Content-Length`, or until the connection closes).
|
||||
fn read_response(stream: &mut impl Read) -> IdeResult<Response> {
|
||||
let head = read_head(stream)?;
|
||||
let body = read_body(stream, &head)?;
|
||||
Ok(Response { status: head.status, body })
|
||||
}
|
||||
|
||||
fn read_body(stream: &mut impl Read, head: &Head) -> IdeResult<Vec<u8>> {
|
||||
Ok(if head.chunked {
|
||||
read_chunked(stream)?
|
||||
} else if let Some(n) = length {
|
||||
} else if let Some(n) = head.length {
|
||||
read_exact_n(stream, n)?
|
||||
} else {
|
||||
let mut body = Vec::new();
|
||||
stream.read_to_end(&mut body)?;
|
||||
body
|
||||
};
|
||||
Ok(Response { status, body })
|
||||
})
|
||||
}
|
||||
|
||||
/// Reads one `\n`-terminated line (returned without it).
|
||||
@@ -482,6 +500,292 @@ pub(crate) fn inspect(
|
||||
})())
|
||||
}
|
||||
|
||||
/// The processes running in a container (`docker top`).
|
||||
pub(crate) fn container_top(ep: &DockerEndpoint, id: &str, timeout: Duration) -> Option<IdeResult<DockerProcessList>> {
|
||||
let addr = address(ep)?;
|
||||
Some((|| {
|
||||
let body = check(request(&addr, "GET", &format!("/containers/{}/top", path_segment(id)), timeout)?)?;
|
||||
serde_json::from_str::<ApiTop>(&body)
|
||||
.map(|t| DockerProcessList { titles: t.titles, processes: t.processes })
|
||||
.map_err(|e| IdeError::internal(format!("the Docker daemon's process list is not JSON: {e}")))
|
||||
})())
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Default)]
|
||||
#[serde(rename_all = "PascalCase", default)]
|
||||
struct ApiTop {
|
||||
titles: Vec<String>,
|
||||
processes: Vec<Vec<String>>,
|
||||
}
|
||||
|
||||
/// An image's layers, newest first (`docker image history`).
|
||||
pub(crate) fn image_history(
|
||||
ep: &DockerEndpoint,
|
||||
id: &str,
|
||||
timeout: Duration,
|
||||
) -> Option<IdeResult<Vec<DockerImageLayer>>> {
|
||||
let addr = address(ep)?;
|
||||
Some((|| {
|
||||
let body = check(request(&addr, "GET", &format!("/images/{}/history", path_segment(id)), timeout)?)?;
|
||||
let layers = serde_json::from_str::<Vec<ApiLayer>>(&body)
|
||||
.map_err(|e| IdeError::internal(format!("the Docker daemon's image history is not JSON: {e}")))?;
|
||||
Ok(map_layers(layers, unix_now()))
|
||||
})())
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Default)]
|
||||
#[serde(rename_all = "PascalCase", default)]
|
||||
struct ApiLayer {
|
||||
id: String,
|
||||
created: i64,
|
||||
created_by: String,
|
||||
size: i64,
|
||||
comment: String,
|
||||
}
|
||||
|
||||
fn map_layers(layers: Vec<ApiLayer>, now: i64) -> Vec<DockerImageLayer> {
|
||||
layers
|
||||
.into_iter()
|
||||
.map(|l| DockerImageLayer {
|
||||
id: l.id,
|
||||
created_by: l.created_by,
|
||||
size: human_size(l.size),
|
||||
created_since: human_duration((now - l.created).max(0)),
|
||||
created_at: unix_utc(l.created),
|
||||
comment: l.comment,
|
||||
})
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn unix_now() -> i64 {
|
||||
std::time::SystemTime::now().duration_since(std::time::UNIX_EPOCH).map(|d| d.as_secs() as i64).unwrap_or(0)
|
||||
}
|
||||
|
||||
/// How often a log stream that has nothing to read checks for cancellation.
|
||||
const LOG_POLL: Duration = Duration::from_millis(200);
|
||||
|
||||
#[derive(Deserialize, Default)]
|
||||
#[serde(rename_all = "PascalCase", default)]
|
||||
struct ApiContainerInspect {
|
||||
config: ApiContainerConfig,
|
||||
}
|
||||
|
||||
#[derive(Deserialize, Default)]
|
||||
#[serde(rename_all = "PascalCase", default)]
|
||||
struct ApiContainerConfig {
|
||||
tty: bool,
|
||||
}
|
||||
|
||||
/// Streams a container's logs (`tail` last lines, then follows while `follow`)
|
||||
/// from `ep`'s daemon until they end or `cancel` fires.
|
||||
#[allow(clippy::too_many_arguments)]
|
||||
pub(crate) fn logs(
|
||||
ep: &DockerEndpoint,
|
||||
id: &str,
|
||||
tail: u32,
|
||||
follow: bool,
|
||||
timestamps: bool,
|
||||
timeout: Duration,
|
||||
cancel: &CancellationToken,
|
||||
on_line: &dyn Fn(DockerLogLine),
|
||||
) -> Option<IdeResult<()>> {
|
||||
let addr = address(ep)?;
|
||||
Some((|| {
|
||||
// A TTY container's log is one raw stream; otherwise it is framed per stream.
|
||||
let body = check(request(&addr, "GET", &format!("/containers/{}/json", path_segment(id)), timeout)?)?;
|
||||
let tty = serde_json::from_str::<ApiContainerInspect>(&body).map(|c| c.config.tty).unwrap_or(false);
|
||||
let path = format!(
|
||||
"/containers/{}/logs?stdout=1&stderr=1&tail={tail}&follow={}×tamps={}",
|
||||
path_segment(id),
|
||||
u8::from(follow),
|
||||
u8::from(timestamps),
|
||||
);
|
||||
let mut conn = Conn::connect(&addr, timeout)?;
|
||||
conn.write_all(
|
||||
format!("GET {path} HTTP/1.1\r\nHost: docker\r\nUser-Agent: openidea\r\nConnection: close\r\n\r\n")
|
||||
.as_bytes(),
|
||||
)?;
|
||||
let head = read_head(&mut conn)?;
|
||||
if !(200..300).contains(&head.status) {
|
||||
let body = read_body(&mut conn, &head)?;
|
||||
check(Response { status: head.status, body })?;
|
||||
}
|
||||
conn.set_timeouts(LOG_POLL);
|
||||
let mut decoder = LogDecoder::new(&head, tty);
|
||||
let mut buf = [0u8; 8192];
|
||||
while !decoder.done() {
|
||||
if cancel.is_cancelled() {
|
||||
return Err(IdeError::cancelled());
|
||||
}
|
||||
match conn.read(&mut buf) {
|
||||
Ok(0) => break,
|
||||
Ok(n) => decoder.feed(&buf[..n], &mut |line| on_line(line))?,
|
||||
Err(e)
|
||||
if matches!(
|
||||
e.kind(),
|
||||
std::io::ErrorKind::WouldBlock | std::io::ErrorKind::TimedOut | std::io::ErrorKind::Interrupted
|
||||
) => {}
|
||||
Err(e) => return Err(e.into()),
|
||||
}
|
||||
}
|
||||
decoder.finish(&mut |line| on_line(line));
|
||||
Ok(())
|
||||
})())
|
||||
}
|
||||
|
||||
/// Turns a log response body, as it arrives, into lines: undoes the chunked
|
||||
/// transfer encoding, then the per-stream frames (8-byte header: stream, 3 zero
|
||||
/// bytes, big-endian length) unless the container has a TTY.
|
||||
struct LogDecoder {
|
||||
body: BodyFraming,
|
||||
tty: bool,
|
||||
header: Vec<u8>,
|
||||
frame_left: usize,
|
||||
frame_stderr: bool,
|
||||
/// Partial lines of stdout and stderr.
|
||||
partial: [Vec<u8>; 2],
|
||||
}
|
||||
|
||||
enum BodyFraming {
|
||||
Chunked { state: ChunkState, line: Vec<u8> },
|
||||
Length(usize),
|
||||
Close,
|
||||
}
|
||||
|
||||
#[derive(Clone, Copy, PartialEq)]
|
||||
enum ChunkState {
|
||||
Size,
|
||||
Data(usize),
|
||||
DataEnd,
|
||||
Trailer,
|
||||
Done,
|
||||
}
|
||||
|
||||
impl LogDecoder {
|
||||
fn new(head: &Head, tty: bool) -> Self {
|
||||
let body = if head.chunked {
|
||||
BodyFraming::Chunked { state: ChunkState::Size, line: Vec::new() }
|
||||
} else if let Some(n) = head.length {
|
||||
BodyFraming::Length(n)
|
||||
} else {
|
||||
BodyFraming::Close
|
||||
};
|
||||
Self { body, tty, header: Vec::new(), frame_left: 0, frame_stderr: false, partial: [Vec::new(), Vec::new()] }
|
||||
}
|
||||
|
||||
fn done(&self) -> bool {
|
||||
matches!(self.body, BodyFraming::Chunked { state: ChunkState::Done, .. } | BodyFraming::Length(0))
|
||||
}
|
||||
|
||||
fn feed(&mut self, mut bytes: &[u8], emit: &mut dyn FnMut(DockerLogLine)) -> IdeResult<()> {
|
||||
let mut payload = Vec::new();
|
||||
match &mut self.body {
|
||||
BodyFraming::Close => payload.extend_from_slice(bytes),
|
||||
BodyFraming::Length(left) => {
|
||||
let take = (*left).min(bytes.len());
|
||||
payload.extend_from_slice(&bytes[..take]);
|
||||
*left -= take;
|
||||
}
|
||||
BodyFraming::Chunked { state, line } => {
|
||||
while !bytes.is_empty() {
|
||||
match *state {
|
||||
ChunkState::Done => break,
|
||||
ChunkState::Data(n) => {
|
||||
let take = n.min(bytes.len());
|
||||
payload.extend_from_slice(&bytes[..take]);
|
||||
bytes = &bytes[take..];
|
||||
*state = if take == n { ChunkState::DataEnd } else { ChunkState::Data(n - take) };
|
||||
}
|
||||
_ => {
|
||||
let b = bytes[0];
|
||||
bytes = &bytes[1..];
|
||||
if b != b'\n' {
|
||||
if b != b'\r' {
|
||||
line.push(b);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let text = String::from_utf8_lossy(line).into_owned();
|
||||
line.clear();
|
||||
*state = match *state {
|
||||
ChunkState::Size => {
|
||||
let size = text.split(';').next().unwrap_or_default().trim();
|
||||
match usize::from_str_radix(size, 16) {
|
||||
Ok(0) => ChunkState::Trailer,
|
||||
Ok(n) => ChunkState::Data(n),
|
||||
Err(_) => {
|
||||
return Err(IdeError::internal(
|
||||
"the Docker daemon answered with a malformed chunked response",
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
ChunkState::DataEnd => ChunkState::Size,
|
||||
_ if text.is_empty() => ChunkState::Done,
|
||||
other => other,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
self.frames(&payload, emit);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn frames(&mut self, mut bytes: &[u8], emit: &mut dyn FnMut(DockerLogLine)) {
|
||||
if self.tty {
|
||||
self.lines(false, bytes, emit);
|
||||
return;
|
||||
}
|
||||
while !bytes.is_empty() {
|
||||
if self.frame_left == 0 {
|
||||
let take = (8 - self.header.len()).min(bytes.len());
|
||||
self.header.extend_from_slice(&bytes[..take]);
|
||||
bytes = &bytes[take..];
|
||||
if self.header.len() == 8 {
|
||||
self.frame_stderr = self.header[0] == 2;
|
||||
self.frame_left =
|
||||
u32::from_be_bytes([self.header[4], self.header[5], self.header[6], self.header[7]]) as usize;
|
||||
self.header.clear();
|
||||
}
|
||||
continue;
|
||||
}
|
||||
let take = self.frame_left.min(bytes.len());
|
||||
self.lines(self.frame_stderr, &bytes[..take], emit);
|
||||
self.frame_left -= take;
|
||||
bytes = &bytes[take..];
|
||||
}
|
||||
}
|
||||
|
||||
fn lines(&mut self, stderr: bool, bytes: &[u8], emit: &mut dyn FnMut(DockerLogLine)) {
|
||||
let partial = &mut self.partial[usize::from(stderr)];
|
||||
for &b in bytes {
|
||||
if b == b'\n' {
|
||||
emit(DockerLogLine { stderr, text: line_text(partial) });
|
||||
partial.clear();
|
||||
} else {
|
||||
partial.push(b);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Emits the last lines that ended without a newline.
|
||||
fn finish(&mut self, emit: &mut dyn FnMut(DockerLogLine)) {
|
||||
for stderr in [false, true] {
|
||||
let partial = &mut self.partial[usize::from(stderr)];
|
||||
if !partial.is_empty() {
|
||||
emit(DockerLogLine { stderr, text: line_text(partial) });
|
||||
partial.clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn line_text(bytes: &[u8]) -> String {
|
||||
String::from_utf8_lossy(bytes.strip_suffix(b"\r").unwrap_or(bytes)).into_owned()
|
||||
}
|
||||
|
||||
/// One URL path segment, percent-encoded so an id cannot change the path.
|
||||
fn path_segment(id: &str) -> String {
|
||||
let mut out = String::with_capacity(id.len());
|
||||
@@ -817,6 +1121,75 @@ mod tests {
|
||||
assert!(read_response(&mut &garbage[..]).is_err());
|
||||
}
|
||||
|
||||
/// Feeds `body` one byte at a time, as a slow connection delivers it.
|
||||
fn decode(head: Head, tty: bool, body: &[u8]) -> (Vec<(bool, String)>, bool) {
|
||||
let mut lines = Vec::new();
|
||||
let mut decoder = LogDecoder::new(&head, tty);
|
||||
for b in body {
|
||||
decoder.feed(std::slice::from_ref(b), &mut |l| lines.push((l.stderr, l.text))).unwrap();
|
||||
}
|
||||
let done = decoder.done();
|
||||
decoder.finish(&mut |l| lines.push((l.stderr, l.text)));
|
||||
(lines, done)
|
||||
}
|
||||
|
||||
fn frame(stream: u8, text: &str) -> Vec<u8> {
|
||||
let mut f = vec![stream, 0, 0, 0];
|
||||
f.extend((text.len() as u32).to_be_bytes());
|
||||
f.extend(text.as_bytes());
|
||||
f
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn engine_image_history_reads_like_the_cli() {
|
||||
let layers: Vec<ApiLayer> = serde_json::from_str(
|
||||
r#"[{"Id":"sha256:abc","Created":1000,"CreatedBy":"CMD [\"python3\"]","Size":20500,"Comment":"buildkit","Tags":["py:3"]},
|
||||
{"Id":"<missing>","Created":940,"CreatedBy":"RUN x","Size":0,"Comment":""}]"#,
|
||||
)
|
||||
.unwrap();
|
||||
let rows = map_layers(layers, 1000 + 2 * 7 * 86_400);
|
||||
assert_eq!(
|
||||
rows.iter().map(|l| (l.id.as_str(), l.size.as_str(), l.created_since.as_str())).collect::<Vec<_>>(),
|
||||
[("sha256:abc", "20.5kB", "2 weeks ago"), ("<missing>", "0B", "2 weeks ago")]
|
||||
);
|
||||
assert_eq!(rows[0].created_by, "CMD [\"python3\"]");
|
||||
let top: ApiTop = serde_json::from_str(r#"{"Titles":["PID","CMD"],"Processes":[["1","sh"]]}"#).unwrap();
|
||||
assert_eq!(
|
||||
(top.titles, top.processes),
|
||||
(vec!["PID".to_owned(), "CMD".to_owned()], vec![vec!["1".to_owned(), "sh".to_owned()]])
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn container_logs_split_into_stream_lines_across_chunks_and_frames() {
|
||||
// Frames split mid-line, a CRLF line, and a stderr line between stdout parts.
|
||||
let mut framed = frame(1, "tick 1\r\ntick");
|
||||
framed.extend(frame(2, "oops\n"));
|
||||
framed.extend(frame(1, " 2\nlast"));
|
||||
let mut chunked = Vec::new();
|
||||
for part in framed.chunks(7) {
|
||||
chunked.extend(format!("{:x}\r\n", part.len()).as_bytes());
|
||||
chunked.extend(part);
|
||||
chunked.extend(b"\r\n");
|
||||
}
|
||||
chunked.extend(b"0\r\n\r\n");
|
||||
let (lines, done) = decode(Head { status: 200, chunked: true, length: None }, false, &chunked);
|
||||
assert!(done);
|
||||
let expected = [(false, "tick 1"), (true, "oops"), (false, "tick 2"), (false, "last")];
|
||||
assert_eq!(lines, expected.map(|(e, t)| (e, t.to_owned())));
|
||||
|
||||
// A TTY container's log is one raw stream; the body may end with the connection.
|
||||
let (lines, done) = decode(Head { status: 200, chunked: false, length: None }, true, b"a\r\nb\n");
|
||||
assert!(!done);
|
||||
assert_eq!(lines, [(false, "a".to_owned()), (false, "b".to_owned())]);
|
||||
|
||||
// A Content-Length body ends after its length.
|
||||
let body = frame(1, "one\n");
|
||||
let (lines, done) = decode(Head { status: 200, chunked: false, length: Some(body.len()) }, false, &body);
|
||||
assert!(done);
|
||||
assert_eq!(lines, [(false, "one".to_owned())]);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn daemon_errors_carry_their_message() {
|
||||
let resp = Response { status: 404, body: br#"{"message":"No such container: missing"}"#.to_vec() };
|
||||
|
||||
@@ -287,6 +287,11 @@ fn check_id(id: &str) -> IdeResult<&str> {
|
||||
/// `docker image history --no-trunc --format '{{json .}}'` of one image.
|
||||
pub fn image_history(ep: &DockerEndpoint, id: &str) -> IdeResult<Vec<DockerImageLayer>> {
|
||||
let id = check_id(id)?;
|
||||
if docker_executable().is_none()
|
||||
&& let Some(layers) = engine::image_history(ep, id, QUICK)
|
||||
{
|
||||
return layers;
|
||||
}
|
||||
let out = run(ep, &["image", "history", "--no-trunc", "--format", "{{json .}}", id], QUICK)?;
|
||||
Ok(parse_image_history(&out))
|
||||
}
|
||||
@@ -294,6 +299,11 @@ pub fn image_history(ep: &DockerEndpoint, id: &str) -> IdeResult<Vec<DockerImage
|
||||
/// `docker top <id>` of a running container.
|
||||
pub fn container_top(ep: &DockerEndpoint, id: &str) -> IdeResult<DockerProcessList> {
|
||||
let id = check_id(id)?;
|
||||
if docker_executable().is_none()
|
||||
&& let Some(processes) = engine::container_top(ep, id, QUICK)
|
||||
{
|
||||
return processes;
|
||||
}
|
||||
let out = run(ep, &["top", id], QUICK)?;
|
||||
Ok(parse_container_top(&out))
|
||||
}
|
||||
@@ -316,6 +326,11 @@ pub fn logs(
|
||||
cancel: &CancellationToken,
|
||||
on_line: &dyn Fn(DockerLogLine),
|
||||
) -> IdeResult<()> {
|
||||
if docker_executable().is_none()
|
||||
&& let Some(streamed) = engine::logs(ep, id, tail, follow, timestamps, QUICK, cancel, on_line)
|
||||
{
|
||||
return streamed;
|
||||
}
|
||||
let tail = tail.to_string();
|
||||
let mut args = vec!["logs", "--tail", &tail];
|
||||
if follow {
|
||||
|
||||
@@ -84,7 +84,7 @@ pub fn project_libraries_stream(
|
||||
cancel: &CancellationToken,
|
||||
on_groups: &(dyn Fn(Vec<LibraryGroup>) + Sync),
|
||||
) -> Vec<LibraryGroup> {
|
||||
type Detect = fn(&Path, &Settings, &CancellationToken) -> Vec<LibraryGroup>;
|
||||
type Detect = fn(&Path, &Path, &Settings, &CancellationToken) -> Vec<LibraryGroup>;
|
||||
let detectors: [Detect; 6] = [python_groups, jdk_groups, node_groups, go_groups, ruby_groups, zig_groups];
|
||||
let roots = library_project_roots(root, cancel);
|
||||
let settings = module_settings(root, settings);
|
||||
@@ -99,7 +99,7 @@ pub fn project_libraries_stream(
|
||||
if cancel.is_cancelled() {
|
||||
break;
|
||||
}
|
||||
let batch = d(dir, settings, cancel);
|
||||
let batch = d(dir, root, settings, cancel);
|
||||
if !cancel.is_cancelled() && !batch.is_empty() {
|
||||
on_groups(batch.clone());
|
||||
groups.extend(batch);
|
||||
@@ -384,7 +384,7 @@ fn tool(bin: Option<PathBuf>, name: &str) -> Option<PathBuf> {
|
||||
|
||||
// ------------------------------------------------------------------ python
|
||||
|
||||
fn python_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn python_groups(root: &Path, _project: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
let Some(python) = crate::apply::python_interpreter(root, s) else { return Vec::new() };
|
||||
let mut files = vec![python.clone()];
|
||||
files.extend(crate::venv_of(&python).map(|v| v.join("pyvenv.cfg")));
|
||||
@@ -436,7 +436,7 @@ pub(crate) fn named_roots(roots: Vec<(String, PathBuf)>) -> Vec<LibraryRoot> {
|
||||
|
||||
// ------------------------------------------------------------------ ruby
|
||||
|
||||
fn ruby_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn ruby_groups(root: &Path, _project: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
let Some(files) = manifests(root, RUBY_MANIFESTS) else { return Vec::new() };
|
||||
if !root.join("Gemfile").is_file() && !root.join(".ruby-version").is_file() {
|
||||
return Vec::new();
|
||||
@@ -454,7 +454,7 @@ fn ruby_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<Lib
|
||||
|
||||
// ------------------------------------------------------------------ jdk
|
||||
|
||||
fn jdk_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn jdk_groups(root: &Path, _project: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
// Java modules without a build manifest carry `.classpath` / `.project` /
|
||||
// `.idea` instead; a configured JDK or declared source roots mark one too.
|
||||
let files = match manifests(root, JAVA_MANIFESTS) {
|
||||
@@ -731,7 +731,7 @@ pub(crate) fn gradle_jar(home: &Path, d: &BuildDependency) -> Option<PathBuf> {
|
||||
|
||||
// ------------------------------------------------------------------ node
|
||||
|
||||
fn node_groups(root: &Path, s: &Settings, _cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn node_groups(root: &Path, _project: &Path, s: &Settings, _cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
if !root.join("package.json").is_file() {
|
||||
return Vec::new();
|
||||
}
|
||||
@@ -907,7 +907,7 @@ pub(crate) fn parse_cargo_metadata(json: &str) -> Option<Vec<(String, PathBuf)>>
|
||||
|
||||
// ------------------------------------------------------------------ go
|
||||
|
||||
fn go_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn go_groups(root: &Path, project: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
let Some(mut files) = manifests(root, GO_MANIFESTS) else { return Vec::new() };
|
||||
if !root.join("go.mod").is_file() && !root.join("go.work").is_file() {
|
||||
return Vec::new();
|
||||
@@ -958,7 +958,7 @@ fn go_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<Libra
|
||||
} else if let Some(text) =
|
||||
query_in_cancellable(&go, &["list", "-m", "-e", "-json", "all"], root, &env, GRAPH_TIMEOUT, cancel)
|
||||
{
|
||||
out.extend(group("Go Modules", "goModules", named_roots(parse_go_modules(&text))));
|
||||
out.extend(group("Go Modules", "goModules", named_roots(parse_go_modules(&text, project))));
|
||||
}
|
||||
out
|
||||
})
|
||||
@@ -978,8 +978,19 @@ fn vendor_roots(vendor: &Path, text: &str) -> Vec<(String, PathBuf)> {
|
||||
.collect()
|
||||
}
|
||||
|
||||
/// `(path@version, dir)` of the downloaded non-main modules in `go list -m -json` output.
|
||||
pub(crate) fn parse_go_modules(text: &str) -> Vec<(String, PathBuf)> {
|
||||
/// True when `path` is source the user owns: inside `project` and not a `vendor` copy.
|
||||
fn is_project_source(project: &Path, path: &Path) -> bool {
|
||||
let project = project.canonicalize().unwrap_or_else(|_| project.to_path_buf());
|
||||
let path = path.canonicalize().unwrap_or_else(|_| path.to_path_buf());
|
||||
let Ok(relative) = path.strip_prefix(&project) else { return false };
|
||||
!relative.components().any(|component| component.as_os_str() == "vendor")
|
||||
}
|
||||
|
||||
/// `(path@version, dir)` of the modules that are libraries: everything whose source is
|
||||
/// outside the opened project. Source inside it is the user's own code — the target of a
|
||||
/// `replace`, say — and stays editable; a `vendor` copy is the exception, checked in and
|
||||
/// kept read-only.
|
||||
pub(crate) fn parse_go_modules(text: &str, project: &Path) -> Vec<(String, PathBuf)> {
|
||||
#[derive(Deserialize)]
|
||||
#[serde(rename_all = "PascalCase")]
|
||||
struct Module {
|
||||
@@ -993,6 +1004,8 @@ pub(crate) fn parse_go_modules(text: &str) -> Vec<(String, PathBuf)> {
|
||||
.into_iter::<Module>()
|
||||
.map_while(Result::ok)
|
||||
.filter(|m| !m.main)
|
||||
// A module whose source sits in the project is the user's own code, not a library.
|
||||
.filter(|m| m.dir.as_deref().is_none_or(|dir| !is_project_source(project, dir)))
|
||||
.filter_map(|m| {
|
||||
let name = match &m.version {
|
||||
Some(v) => format!("{}@{v}", m.path),
|
||||
@@ -1005,7 +1018,7 @@ pub(crate) fn parse_go_modules(text: &str) -> Vec<(String, PathBuf)> {
|
||||
|
||||
// ------------------------------------------------------------------ zig
|
||||
|
||||
fn zig_groups(root: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
fn zig_groups(root: &Path, _project: &Path, s: &Settings, cancel: &CancellationToken) -> Vec<LibraryGroup> {
|
||||
let Some(files) = manifests(root, ZIG_MANIFESTS) else { return Vec::new() };
|
||||
let Some(zig) = tool(crate::apply::zig_bin(root, s), "zig") else { return Vec::new() };
|
||||
cached_cancellable(root, "zig", zig.display().to_string(), &files, cancel, || {
|
||||
@@ -1574,7 +1587,7 @@ mod zig_tests {
|
||||
std::fs::set_permissions(&zig, std::fs::Permissions::from_mode(0o755)).unwrap();
|
||||
let mut settings = Settings::default();
|
||||
settings.languages.zig.zig = "tools".into();
|
||||
let groups = zig_groups(root, &settings, &CancellationToken::new());
|
||||
let groups = zig_groups(root, root, &settings, &CancellationToken::new());
|
||||
let summary: Vec<(&str, &str, Vec<&str>)> = groups
|
||||
.iter()
|
||||
.map(|g| (g.name.as_str(), g.kind.as_str(), g.roots.iter().map(|r| r.name.as_str()).collect()))
|
||||
|
||||
@@ -1875,7 +1875,7 @@ fn go_modules_skip_the_main_module_and_missing_downloads() {
|
||||
{"Path":"golang.org/x/text","Version":"v0.14.0","Dir":"/gopath/pkg/mod/golang.org/x/[email protected]"}
|
||||
{"Path":"example.com/missing","Version":"v1.0.0","Error":{"Err":"module lookup disabled"}}"#;
|
||||
assert_eq!(
|
||||
crate::libraries::parse_go_modules(out),
|
||||
crate::libraries::parse_go_modules(out, std::path::Path::new("/p")),
|
||||
[(
|
||||
"golang.org/x/[email protected]".to_owned(),
|
||||
std::path::PathBuf::from("/gopath/pkg/mod/golang.org/x/[email protected]")
|
||||
@@ -1883,6 +1883,35 @@ fn go_modules_skip_the_main_module_and_missing_downloads() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn go_modules_skip_module_sources_inside_the_project() {
|
||||
let out = r#"{"Path":"example.com/app","Main":true,"Dir":"/p/app"}
|
||||
{"Path":"example.com/local","Version":"v0.0.0","Dir":"/p/local"}
|
||||
{"Path":"example.com/vendored","Version":"v0.0.0","Dir":"/p/vendor/vendored"}
|
||||
{"Path":"example.com/outside","Version":"v1.0.0","Dir":"/other/outside"}
|
||||
{"Path":"golang.org/x/text","Version":"v0.14.0","Dir":"/gopath/pkg/mod/golang.org/x/[email protected]"}"#;
|
||||
assert_eq!(
|
||||
crate::libraries::parse_go_modules(out, std::path::Path::new("/p")),
|
||||
[
|
||||
("example.com/[email protected]".to_owned(), std::path::PathBuf::from("/p/vendor/vendored")),
|
||||
("example.com/[email protected]".to_owned(), std::path::PathBuf::from("/other/outside")),
|
||||
(
|
||||
"golang.org/x/[email protected]".to_owned(),
|
||||
std::path::PathBuf::from("/gopath/pkg/mod/golang.org/x/[email protected]")
|
||||
),
|
||||
]
|
||||
);
|
||||
// Opened from a root that does not contain it: the same folder is a library again.
|
||||
assert!(
|
||||
crate::libraries::parse_go_modules(
|
||||
r#"{"Path":"example.com/local","Version":"v0.0.0","Dir":"/p/local"}"#,
|
||||
std::path::Path::new("/p/app")
|
||||
)
|
||||
.iter()
|
||||
.any(|(name, _)| name == "example.com/[email protected]")
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn build_zig_zon_dependencies_are_parsed() {
|
||||
let zon = r#"// the manifest is a Zig struct literal
|
||||
|
||||
@@ -22,6 +22,7 @@ parking_lot.workspace = true
|
||||
zip.workspace = true
|
||||
flate2.workspace = true
|
||||
tar.workspace = true
|
||||
rayon.workspace = true
|
||||
|
||||
[dev-dependencies]
|
||||
tempfile.workspace = true
|
||||
|
||||
@@ -10,6 +10,7 @@ mod rules;
|
||||
mod watch;
|
||||
|
||||
use ide_core::{IdeError, IdeResult};
|
||||
use rayon::prelude::*;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use specta::Type;
|
||||
use std::cmp::Ordering;
|
||||
@@ -133,51 +134,57 @@ pub fn read_dir(dir: &Path, excludes: &[String]) -> IdeResult<Vec<FileEntry>> {
|
||||
let base = gitignore.repo_root().unwrap_or(dir).to_path_buf();
|
||||
let excludes = ExcludeMatcher::new(excludes);
|
||||
|
||||
let mut entries: Vec<(bool, FileEntry)> = Vec::new();
|
||||
for entry in fs::read_dir(dir)? {
|
||||
let entry = match entry {
|
||||
Ok(e) => e,
|
||||
let paths: Vec<PathBuf> = fs::read_dir(dir)?
|
||||
.filter_map(|entry| match entry {
|
||||
Ok(e) => Some(e.path()),
|
||||
Err(e) => {
|
||||
tracing::debug!("read_dir {}: {e}", dir.display());
|
||||
continue;
|
||||
None
|
||||
}
|
||||
};
|
||||
let path = entry.path();
|
||||
let name = entry.file_name().to_string_lossy().into_owned();
|
||||
let Ok(lmeta) = fs::symlink_metadata(&path) else { continue };
|
||||
let (kind, meta, target_kind) = if lmeta.file_type().is_symlink() {
|
||||
match fs::metadata(&path) {
|
||||
Ok(m) => {
|
||||
let target = if m.is_dir() { EntryKind::Dir } else { EntryKind::File };
|
||||
(EntryKind::Symlink, m, Some(target))
|
||||
})
|
||||
.collect();
|
||||
// One stat per entry dominates a large folder (and every stat is a round trip on a network
|
||||
// share): stat in parallel; small folders stay on this thread.
|
||||
let mut entries: Vec<(bool, FileEntry)> = paths
|
||||
.into_par_iter()
|
||||
.with_min_len(256)
|
||||
.filter_map(|path| {
|
||||
let name = path.file_name()?.to_string_lossy().into_owned();
|
||||
let lmeta = fs::symlink_metadata(&path).ok()?;
|
||||
let (kind, meta, target_kind) = if lmeta.file_type().is_symlink() {
|
||||
match fs::metadata(&path) {
|
||||
Ok(m) => {
|
||||
let target = if m.is_dir() { EntryKind::Dir } else { EntryKind::File };
|
||||
(EntryKind::Symlink, m, Some(target))
|
||||
}
|
||||
Err(_) => (EntryKind::Symlink, lmeta, None),
|
||||
}
|
||||
Err(_) => (EntryKind::Symlink, lmeta, None),
|
||||
}
|
||||
} else if lmeta.is_dir() {
|
||||
(EntryKind::Dir, lmeta, None)
|
||||
} else {
|
||||
(EntryKind::File, lmeta, None)
|
||||
};
|
||||
let is_dir = meta.is_dir();
|
||||
let rel = path.strip_prefix(&base).unwrap_or(&path);
|
||||
let excluded = excludes.is_excluded(rel);
|
||||
let ignored = excluded || gitignore.is_ignored(&path, is_dir);
|
||||
entries.push((
|
||||
is_dir,
|
||||
FileEntry {
|
||||
hidden: name.starts_with('.'),
|
||||
size: if is_dir { 0 } else { meta.len() },
|
||||
mtime_ms: mtime_ms(&meta),
|
||||
name,
|
||||
path: path.into(),
|
||||
kind,
|
||||
ignored,
|
||||
excluded,
|
||||
target_kind,
|
||||
},
|
||||
));
|
||||
}
|
||||
entries.sort_by(|(da, a), (db, b)| db.cmp(da).then_with(|| natural_cmp(&a.name, &b.name)));
|
||||
} else if lmeta.is_dir() {
|
||||
(EntryKind::Dir, lmeta, None)
|
||||
} else {
|
||||
(EntryKind::File, lmeta, None)
|
||||
};
|
||||
let is_dir = meta.is_dir();
|
||||
let rel = path.strip_prefix(&base).unwrap_or(&path);
|
||||
let excluded = excludes.is_excluded(rel);
|
||||
let ignored = excluded || gitignore.is_ignored(&path, is_dir);
|
||||
Some((
|
||||
is_dir,
|
||||
FileEntry {
|
||||
hidden: name.starts_with('.'),
|
||||
size: if is_dir { 0 } else { meta.len() },
|
||||
mtime_ms: mtime_ms(&meta),
|
||||
name,
|
||||
path: path.into(),
|
||||
kind,
|
||||
ignored,
|
||||
excluded,
|
||||
target_kind,
|
||||
},
|
||||
))
|
||||
})
|
||||
.collect();
|
||||
entries.par_sort_by(|(da, a), (db, b)| db.cmp(da).then_with(|| natural_cmp(&a.name, &b.name)));
|
||||
Ok(entries.into_iter().map(|(_, e)| e).collect())
|
||||
}
|
||||
|
||||
|
||||
@@ -850,6 +850,7 @@ mod tests {
|
||||
"agent": "",
|
||||
"agentModel": "",
|
||||
"agentEffort": "",
|
||||
"agentButton": true,
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
@@ -55,7 +55,9 @@ Codex keeps its own project trust decision. If it disables the current project's
|
||||
<Step title="Pick the agent and its settings">
|
||||
Choose the agent, and its model, mode and other options when it offers them. Cached models appear immediately; the selected agent's catalog refreshes in the background when it is more than 15 minutes old, without sending a prompt or attaching project MCP servers.
|
||||
|
||||
Model-specific effort levels and context options are looked up when you select a model whose settings are not cached, even before its first task. **Loading model settings…** appears beside the model during this short-lived lookup; no prompt is sent and existing tasks are not changed. Each model keeps its own choices, and models that report no effort control do not borrow another model's levels.
|
||||
Click the model name to switch models, or click the settings beside it (for example **High · 1M**) to change effort or context size directly. In the model list, use the arrow on a model's row to see its settings without selecting it. Changing a setting selects that model; going back without an edit keeps the previous selection. These controls are also available in an existing chat.
|
||||
|
||||
If settings aren't cached, OpenIDEA looks them up when you select or inspect the model. No prompt is sent. Each model keeps its own draft choices, and models that report no effort control do not borrow another model's levels.
|
||||
|
||||
After changing the agent CLI or account, open the model picker and choose **Refresh models**. Refreshes share one lookup and have a 30-second cooldown after completion, including failures. Selecting an uncached model's settings does not wait for another model's cooldown. Cached choices remain usable while refreshing or after a failure; use **Refresh models** to retry a failed lookup after its cooldown.
|
||||
|
||||
@@ -137,7 +139,7 @@ Tasks are saved per project and survive restarts. When the agent supports resumi
|
||||
- **Agent Configs**: discovers servers already configured in `~/.copilot/mcp-config.json` (and installed Copilot CLI plugins), `~/.claude.json`, `~/.codex/config.toml`, `~/.cursor/mcp.json`, `~/.gemini/settings.json`, `~/.jetbrains/mcp/mcp.json`, `.mcp.json`, and `.vscode/mcp.json` so you can import them into Global or Project settings with one click. You can also add or edit servers via structured fields or raw `mcpServers` JSON (**Add from JSON**), and run **Test Connection** to inspect the tools a server advertises.
|
||||
- **Per-session (`MCP` / `/mcp`)**: in both **New Agent Task** and active task conversations, open **MCP** in the composer toolbar (or run `/mcp`) to enable or disable individual servers—including the built-in `openidea` server—for that task only, or click **Reset** to return to the inherited defaults.
|
||||
|
||||
While the agent works, the line under the conversation says what it is doing: thinking, reading, editing, running a command, writing its reply. **Settings › Agents › Working Status** can show playful words for what it does there instead; they are off by default. Once turned on, they take turns from the moment the work changes, or only after the agent reports nothing new for a number of seconds (0 to 600, 0 by default); screen readers still hear what the agent is doing. Each word stays eight seconds while the agent keeps at the same work, and at least three when it moves on, so the line doesn't flicker. The same page replaces the words: pick what the status says (**Reading…**, **Running a command…**…) and add or remove its words. **Restore Built-in Words** brings back OpenIDEA's; an activity left without words keeps its plain status.
|
||||
While the agent works, the line under the conversation says what it is doing: thinking, reading, editing, running a command, writing its reply.
|
||||
|
||||
## Add a custom agent
|
||||
|
||||
|
||||
@@ -123,7 +123,7 @@ These commands are in the **Run** menu and on the Debug tool window toolbar.
|
||||
While the program is suspended:
|
||||
|
||||
- The **Variables** view shows the variables of the selected frame. Right-click a value for **Set Value…** (`F2`), **Copy Value**, **Copy Name**, **Jump to Source** (`F4`) and **Add to Watches**.
|
||||
- **Watches** appear at the top of the Variables view and are re-evaluated on every stop and frame change. Add one with **Add to Watches**; remove it with **Remove Watch**.
|
||||
- **Watches** appear at the top of the Variables view and are re-evaluated on every stop and frame change. Add one with **Add to Watches**; remove it with **Remove Watch**, or all of them with **Remove All Watches**.
|
||||
- Hovering a variable in the editor shows its value. `⌥`-click (`Alt`-click) or **Quick Evaluate Expression** (`⌘⌥F8` / `Ctrl+Alt+F8`) evaluates the expression under the mouse or the selection.
|
||||
- Values of local variables are shown inline after the lines that use them.
|
||||
- **Evaluate Expression…** (`⌥F8` / `Alt+F8`) opens a dialog that evaluates any expression in the selected frame, keeps a history, and can add the expression to watches.
|
||||
|
||||
@@ -160,7 +160,7 @@ A **Compound** configuration starts several configurations at once. Run it to st
|
||||
Each launch opens a tab in the **Run** tool window (bottom). The toolbar has **Rerun**, **Debug**, **Rerun Failed Tests** (for test runs), **Update Application**, **Find…**, **Scroll to End**, **Soft-Wrap**, **Clear All** and **Edit Configurations…**.
|
||||
|
||||
- File paths and stack trace frames in the output are links.
|
||||
- Repeated lines can be folded; configure the patterns in **Settings › Build, Execution, Deployment › Console**, along with the buffer size and the console encoding.
|
||||
- Repeated lines can be folded; configure the patterns in **Settings › Build, Execution, Deployment › Console**, along with the buffer size and the console encoding. **Fold Lines Like This** in the console's context menu opens that page with the selected text (or the clicked line) added as a pattern.
|
||||
- Log lines can take the colour of their level (`ERROR`, `WARN`, `INFO`, `DEBUG`, `TRACE`); colours the program prints itself are kept. Turn it on and pick the colours in **Settings › Build, Execution, Deployment › Console**.
|
||||
- For test runs the tab shows a test tree next to the output. See [Testing](/en/guide/testing).
|
||||
|
||||
|
||||
@@ -206,6 +206,7 @@ Limits: interactive rebase doesn't support ranges with merge commits, and **Undo
|
||||
|
||||
- **Shelve Changes…** lets you pick files and a name; the changes are then reverted.
|
||||
- **Unshelve…** applies a shelf (or one file of it) with a three-way merge, into a changelist you choose.
|
||||
- **Shelve Silently** (`⇧⌘H` / `Ctrl+Shift+H`, also on the Changes toolbar) shelves the selected changes, or the active changelist, without the dialog: one shelf per changelist, named after it. **Unshelve Silently** (`⌥⌘U` / `Ctrl+Alt+U` in the Shelf) applies the selected shelf or file into the changelist with the shelf's name, else the active one.
|
||||
- The **Shelf** tab shows shelves with diff, compare with local, patch export, rename and delete.
|
||||
|
||||
Turn on **Combine stashes and shelves in one tab** in the Git settings to show both in one tab.
|
||||
|
||||
@@ -55,7 +55,9 @@ Codex 有自己的项目信任设置。如果它禁用了当前项目的 `.codex
|
||||
<Step title="选择 agent 及其设置">
|
||||
选择 agent,以及它提供的模型、模式等选项。缓存的模型会立即显示;所选 agent 的模型列表超过 15 分钟未更新时,会在后台刷新,不发送提示词,也不接入项目 MCP 服务器。
|
||||
|
||||
选择尚未缓存设置的模型时,会按需查询该模型的思考强度和上下文选项,无需先运行任务。短暂查询期间,模型旁会显示**正在加载模型设置…**;查询不发送提示词,也不更改现有任务。每个模型分别保留你选择的设置;明确不提供思考强度的模型不会沿用其他模型的强度选项。
|
||||
点击模型名称可切换模型;点击旁边的设置(如 **High · 1M**)可直接调整思考强度或上下文大小。在模型列表中,点击一行右侧的箭头可以先查看该模型的设置。修改设置时才会选中该模型,直接返回则保留原来的选择。在已有对话中也可以这样操作。
|
||||
|
||||
选择模型或查看其设置时,如果还没有缓存,OpenIDEA 会按需查询,无需发送提示词。草稿分别保留各模型的选择;未提供思考强度的模型不会沿用其他模型的选项。
|
||||
|
||||
更改 agent CLI 或账号后,打开模型选择器并单击 **刷新模型**。并发刷新会共用一次查询;每次查询完成后(包括失败)都有 30 秒冷却时间。查询其他未缓存模型的设置无需等待前一个模型的冷却时间。刷新中或刷新失败后,缓存选项仍可使用;查询失败后,可在冷却结束后用**刷新模型**重试。
|
||||
|
||||
@@ -137,7 +139,7 @@ agent 运行过一个任务后,新任务会以它自动批准所有操作的
|
||||
- **智能体配置**:自动发现 `~/.copilot/mcp-config.json`(及已安装的 Copilot CLI 插件)、`~/.claude.json`、`~/.codex/config.toml`、`~/.cursor/mcp.json`、`~/.gemini/settings.json`、`~/.jetbrains/mcp/mcp.json`、`.mcp.json` 和 `.vscode/mcp.json` 中已配置的服务器,可一键导入到全局或项目设置。添加或编辑服务器时既可使用表单,也可直接粘贴 `mcpServers` JSON(**从 JSON 添加**),并可通过 **测试连接** 查看服务器声明的工具列表。
|
||||
- **按会话覆盖(`MCP` / `/mcp`)**:在 **新建 Agent 任务** 和进行中的任务对话中,单击输入框工具栏的 **MCP**(或输入 `/mcp`),即可仅针对当前任务开启或关闭任意服务器(包括内置的 `openidea` 服务器),或点击 **重置** 恢复继承的默认状态。
|
||||
|
||||
agent 工作时,对话下方的状态行显示它正在做什么:思考、读取、编辑、运行命令、输出回复。在 **设置 › 智能体 › 工作状态** 中可以让这里改为显示与当前工作相关的趣味文字,默认关闭。开启后,工作一变化就轮换显示,也可以设置在 agent 无新进展多少秒后才显示(0 到 600,默认 0);屏幕阅读器读出的仍是 agent 实际在做的事。agent 持续做同一类工作时,每条文字停留八秒;转向其他工作时也至少停留三秒,状态行不会频繁跳动。同一页面还可以替换这些文字:选择状态(**正在读取…**、**正在运行命令…**…),再添加或移除对应的文字。**恢复内置文字** 会换回 OpenIDEA 自带的文字;没有任何文字的状态只显示实际进展。
|
||||
agent 工作时,对话下方的状态行显示它正在做什么:思考、读取、编辑、运行命令、输出回复。
|
||||
|
||||
## 添加自定义 agent
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@ C 和 C++ 的配置也可以改用 GDB 14 及以上版本(`gdb -i dap`):
|
||||
程序挂起时:
|
||||
|
||||
- **变量** 视图显示选中帧的变量。右键点击某个值,可以 **设置值…**(`F2`)、**复制值**、**复制名称**、**跳转到源代码**(`F4`)和 **添加到监视**。
|
||||
- 监视表达式显示在变量视图顶部,每次停下或切换帧时重新计算。用 **添加到监视** 添加,用 **移除监视** 删除。
|
||||
- 监视表达式显示在变量视图顶部,每次停下或切换帧时重新计算。用 **添加到监视** 添加,用 **移除监视** 删除,用 **移除所有监视** 一次全部删除。
|
||||
- 在编辑器里悬停变量会显示它的值。`⌥` 点击(`Alt` 点击)或 **快速计算表达式**(`⌘⌥F8` / `Ctrl+Alt+F8`)计算鼠标下的表达式或选中的内容。
|
||||
- 局部变量的值会内联显示在使用它们的行尾。
|
||||
- **计算表达式…**(`⌥F8` / `Alt+F8`)打开对话框,在选中帧里计算任意表达式,带历史记录,也能把表达式加入监视。
|
||||
|
||||
@@ -156,7 +156,7 @@ Maven 模块在 **自动** 和 **构建(Make)** 时由 jdtls(ECJ)构建
|
||||
每次启动都会在底部的 **运行** 工具窗口里开一个标签页。工具栏有 **重新运行**、**调试**、**重新运行失败的测试**(测试运行时)、**更新应用**、**查找…**、**滚动到末尾**、**软换行**、**全部清除** 和 **编辑配置…**。
|
||||
|
||||
- 输出里的文件路径和堆栈帧都可以点击跳转。
|
||||
- 重复的行可以折叠。折叠规则、缓冲区大小和控制台编码在 **设置 › 构建、执行、部署 › 控制台** 中配置。
|
||||
- 重复的行可以折叠。折叠规则、缓冲区大小和控制台编码在 **设置 › 构建、执行、部署 › 控制台** 中配置。控制台右键菜单中的 **折叠与此类似的行** 会打开该页面,并把选中的文本(或右键所在的行)添加为折叠规则。
|
||||
- 日志行可按级别着色(`ERROR`、`WARN`、`INFO`、`DEBUG`、`TRACE`);程序自行输出的颜色保持不变。默认关闭,可在 **设置 › 构建、执行、部署 › 控制台** 开启并修改颜色。
|
||||
- 测试运行时,标签页会在输出旁显示测试树,参见[测试](/zh/guide/testing)。
|
||||
|
||||
|
||||
@@ -204,6 +204,7 @@ Git 工具窗口的 **日志** 标签页显示提交图。
|
||||
|
||||
- **搁置更改…**:选择文件并命名,之后这些更改会被还原。
|
||||
- **取消搁置…**:以三方合并的方式把搁置(或其中某个文件)应用到你选择的更改列表。
|
||||
- **静默搁置**(`⇧⌘H` / `Ctrl+Shift+H`,也在更改工具栏上)不弹对话框,直接搁置选中的更改(未选中时为活动更改列表):每个更改列表一个搁置,以列表名命名。**静默取消搁置**(在搁置中按 `⌥⌘U` / `Ctrl+Alt+U`)把选中的搁置或文件应用到与搁置同名的更改列表,没有则应用到活动更改列表。
|
||||
- **搁置** 标签页列出所有搁置,支持查看差异、与本地比较、导出补丁、重命名和删除。
|
||||
|
||||
在 Git 设置中打开 **在同一个标签页中合并显示贮藏和搁置**,两者会显示在同一个标签页里。
|
||||
|
||||
@@ -109,6 +109,7 @@ async function seed(
|
||||
model = "atlas",
|
||||
status: AgentTask["status"] = "ready",
|
||||
catalogOnly = false,
|
||||
offered = provider,
|
||||
) {
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
@@ -218,7 +219,7 @@ async function seed(
|
||||
if (surface === "new") store.openHome();
|
||||
else store.openTask(firstTask.id);
|
||||
},
|
||||
{ placement, surface, provider, firstTask, secondTask, subagent, model, status, modelId, catalogOnly },
|
||||
{ placement, surface, provider: offered, firstTask, secondTask, subagent, model, status, modelId, catalogOnly },
|
||||
);
|
||||
await expect(box(page)).toBeVisible();
|
||||
await page.evaluate(() => document.fonts.ready);
|
||||
@@ -233,9 +234,8 @@ function history(page: Page) {
|
||||
function modelButton(page: Page) {
|
||||
return page.getByRole("button", { name: "Model", exact: true }).filter({ visible: true });
|
||||
}
|
||||
/** The effort is shown on the model button, after the model's name. */
|
||||
function effortLabel(page: Page) {
|
||||
return modelButton(page).locator("[class*='modelDetail']");
|
||||
return page.getByRole("button", { name: /^Model settings:/ }).filter({ visible: true });
|
||||
}
|
||||
async function expectEffort(page: Page, name: string) {
|
||||
await expect(effortLabel(page)).toHaveText(name);
|
||||
@@ -284,6 +284,50 @@ async function expectNoSubmission(page: Page) {
|
||||
expect(await ipcCalls(page, "agent_create")).toEqual([]);
|
||||
}
|
||||
|
||||
for (const surface of ["new", "task"] as const) {
|
||||
test(`${surface}: configure another model from its row, then edit its context from the composer`, async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
const context = option(
|
||||
"context_tier",
|
||||
"model_config",
|
||||
[
|
||||
["default", "200K"],
|
||||
["long_context", "1M"],
|
||||
],
|
||||
"default",
|
||||
);
|
||||
const offered = {
|
||||
...provider,
|
||||
thoughtLevels: { ...provider.thoughtLevels, atlas: [atlas, context], swift: [swift, context] },
|
||||
};
|
||||
await seed(page, "editor", surface, "atlas", "ready", false, offered);
|
||||
await box(page).fill("Review the project structure");
|
||||
await modelButton(page).click();
|
||||
const row = page.getByRole("option", { name: /^Swift\b/ });
|
||||
await row.hover();
|
||||
const configure = row.getByRole("button", { name: "Configure Swift…" });
|
||||
if (surface === "task") await configure.press("Enter");
|
||||
else await configure.click();
|
||||
await expect(modelButton(page)).toHaveText("Atlas");
|
||||
await expect(page.getByRole("radio", { name: "Gentle" })).toHaveCount(0);
|
||||
await page.getByRole("radio", { name: "Thorough" }).click();
|
||||
await expect(modelButton(page)).toHaveText("Swift");
|
||||
await expect(page.getByRole("radio", { name: "Thorough" })).toBeChecked();
|
||||
await page.keyboard.press("Escape");
|
||||
const settings = page.getByRole("button", { name: /^Model settings:/ });
|
||||
await expect(settings).toHaveText("Thorough · 200K");
|
||||
await settings.click();
|
||||
await page.getByRole("radio", { name: "1M" }).click();
|
||||
await expect(settings).toHaveText("Thorough · 1M");
|
||||
await page.getByRole("button", { name: "Back to models" }).click();
|
||||
await expect(page.getByRole("listbox", { name: "Model", exact: true })).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(box(page)).toHaveText("Review the project structure");
|
||||
await expectNoSubmission(page);
|
||||
});
|
||||
}
|
||||
|
||||
for (const placement of ["editor", "toolWindow"] as const) {
|
||||
test(`${placement}: existing task cycles advertised values and wraps without editing, moving focus or scrolling`, async ({
|
||||
workbench: page,
|
||||
@@ -379,7 +423,7 @@ test("Settings and effort popup exclude the agent shortcut", async ({ workbench:
|
||||
await expect(search).toBeFocused();
|
||||
await expect(search).toHaveValue("keymap");
|
||||
await settings.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
await modelButton(page).click();
|
||||
await effortLabel(page).click();
|
||||
const popup = page.getByRole("radiogroup", { name: "Effort Level", exact: true });
|
||||
await expect(popup).toBeVisible();
|
||||
await page.keyboard.press("Alt+t");
|
||||
@@ -603,7 +647,7 @@ test("New Task discovers uncached model effort before the first prompt", async (
|
||||
await page.screenshot({ path: testInfo.outputPath("model-settings-loading.png") });
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:model-settings-ready")));
|
||||
await expectEffort(page, "Quick");
|
||||
await modelButton(page).click();
|
||||
await effortLabel(page).click();
|
||||
const efforts = page.getByRole("radiogroup", { name: "Effort Level", exact: true });
|
||||
await expect(efforts.getByRole("radio", { name: "Quick", exact: true })).toBeVisible();
|
||||
await expect(efforts.getByRole("radio", { name: "Thorough", exact: true })).toBeVisible();
|
||||
@@ -636,7 +680,7 @@ test("an existing chat can choose effort for a refreshed model before sending",
|
||||
await expect(loading).toHaveCount(0);
|
||||
await expect(modelButton(page)).toHaveAttribute("title", /^Model: Swift\b/);
|
||||
await expectEffort(page, "Quick");
|
||||
await modelButton(page).click();
|
||||
await effortLabel(page).click();
|
||||
const efforts = page.getByRole("radiogroup", { name: "Effort Level", exact: true });
|
||||
await expect(efforts.getByRole("radio", { name: "Gentle", exact: true })).toHaveCount(0);
|
||||
await efforts.getByRole("radio", { name: "Thorough", exact: true }).click();
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("line bookmarks keep their code or description readable in the dock", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 880, height: 640 });
|
||||
const name = "QuarterlySettlementReconciliationCoordinator.ts";
|
||||
const path = `/dev/acme-api/${name}`;
|
||||
const code = "reconcileCheckoutOrders();";
|
||||
const description = "Review settlement totals";
|
||||
await page.evaluate(
|
||||
async ({ path, code }) => {
|
||||
const backendModule = "/src/editor/core/backend.ts";
|
||||
const { docBackend } = await import(/* @vite-ignore */ backendModule);
|
||||
docBackend().files.set(path, [...Array(27).fill("// Settlement rules"), code, "verifyTotals();", ""].join("\n"));
|
||||
const services = "/src/workbench/contributions.ts";
|
||||
const { editorService } = await import(/* @vite-ignore */ services);
|
||||
await editorService().openFile(path);
|
||||
},
|
||||
{ path, code },
|
||||
);
|
||||
await expect(page.locator(".cm-content")).toContainText(code);
|
||||
await page.evaluate(
|
||||
async ({ path, description }) => {
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("navigate.toggleBookmark", { path, line: 27 });
|
||||
await executeAction("navigate.toggleBookmark", { path, line: 29 });
|
||||
const bookmarkModule = "/src/features/search/bookmarks/store.ts";
|
||||
const { assignMnemonic, updateBookmarks } = await import(/* @vite-ignore */ bookmarkModule);
|
||||
updateBookmarks((items: unknown[]) => assignMnemonic(items, path, 28, "verifyTotals();", "4", description));
|
||||
await executeAction("toolwindow.bookmarks");
|
||||
const layoutModule = "/src/workbench/toolwindows/store.ts";
|
||||
const { setToolWindowSize } = await import(/* @vite-ignore */ layoutModule);
|
||||
setToolWindowSize("left", 240);
|
||||
},
|
||||
{ path, description },
|
||||
);
|
||||
|
||||
const tree = page.getByRole("tree", { name: "Bookmarks" });
|
||||
await expect(tree.getByText(name, { exact: true })).toBeVisible();
|
||||
const snippet = tree.getByText(code, { exact: true });
|
||||
await expect.poll(() => snippet.evaluate((el) => el.clientWidth)).toBeGreaterThanOrEqual(105);
|
||||
await expect(tree.getByText("28:", { exact: true })).toBeVisible();
|
||||
await expect(tree.getByText("29:", { exact: true })).toBeVisible();
|
||||
await expect(tree.getByText(description, { exact: true })).toBeVisible();
|
||||
await expect(tree.getByText("(empty line)", { exact: true })).toBeVisible();
|
||||
expect(await tree.evaluate((el) => el.scrollWidth - el.clientWidth)).toBe(0);
|
||||
|
||||
const row = tree.getByRole("treeitem").filter({ hasText: code });
|
||||
await row.click();
|
||||
await page.keyboard.press("Enter");
|
||||
await expect
|
||||
.poll(() =>
|
||||
page.evaluate(async () => {
|
||||
const module = "/src/workbench/contributions.ts";
|
||||
const { editorService } = await import(/* @vite-ignore */ module);
|
||||
const cursor = editorService().activeCursor();
|
||||
return { path: cursor?.path, line: cursor?.line };
|
||||
}),
|
||||
)
|
||||
.toEqual({ path, line: 27 });
|
||||
});
|
||||
@@ -0,0 +1,71 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Branch comparison keeps both commit ranges and the diff action visible", async ({ workbench: page }) => {
|
||||
const branch = "feature/settlement-reconciliation-and-international-ledger-reporting";
|
||||
const current = "feature/review-quarterly-settlement-audit";
|
||||
const incomingSubject = "Keep regional settlement references stable during the report export";
|
||||
const outgoingSubject = "Preserve the audit trail for settlement retries";
|
||||
await page.setViewportSize({ width: 1120, height: 760 });
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ branch, current, incomingSubject, outgoingSubject }) => {
|
||||
const root = "/dev/acme-api";
|
||||
const branchInfo = {
|
||||
head: current,
|
||||
headCommit: "b".repeat(40),
|
||||
upstream: null,
|
||||
ahead: 0,
|
||||
behind: 0,
|
||||
operation: null,
|
||||
};
|
||||
const entry = (letter: string, summary: string) => ({
|
||||
id: letter.repeat(40),
|
||||
shortId: letter.repeat(8),
|
||||
parents: ["a".repeat(40)],
|
||||
refs: [],
|
||||
summary,
|
||||
message: summary + "\n\nUpdate the audit report context.",
|
||||
author: "Sam Rivera",
|
||||
email: "[email protected]",
|
||||
timeMs: 1795100000000,
|
||||
});
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_roots = () => [{ root, ...branchInfo }];
|
||||
h.vcs_branch_info = () => branchInfo;
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_log = ({ query }) =>
|
||||
(query as { range: string }).range === `HEAD..${branch}`
|
||||
? [entry("c", incomingSubject)]
|
||||
: [entry("b", outgoingSubject)];
|
||||
h.window_open_comparison = () => null;
|
||||
const store = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ store);
|
||||
useVcs.setState({ available: true, root, repo: root, roots: [root], branch: branchInfo });
|
||||
const path = "/src/features/vcs/CompareBranches.tsx";
|
||||
(await import(/* @vite-ignore */ path)).showCompareBranches(branch);
|
||||
},
|
||||
{ branch, current, incomingSubject, outgoingSubject },
|
||||
);
|
||||
const dialog = page.getByRole("dialog", { name: new RegExp(`Compare ${current}`) });
|
||||
await expect(dialog.getByRole("listbox")).toHaveCount(2);
|
||||
const incoming = dialog.getByRole("listbox", { name: `In ${branch}, not in ${current}` });
|
||||
const outgoing = dialog.getByRole("listbox", { name: `In ${current}, not in ${branch}` });
|
||||
await expect(incoming.getByText(incomingSubject, { exact: true })).toBeVisible();
|
||||
await expect(outgoing.getByText(outgoingSubject, { exact: true })).toBeVisible();
|
||||
const divider = dialog.getByRole("separator", { name: "Resize branch comparison panes" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
const start = (await divider.boundingBox())!.y;
|
||||
await divider.focus();
|
||||
await page.keyboard.press("ArrowDown");
|
||||
await expect.poll(async () => (await divider.boundingBox())!.y).toBeGreaterThan(start + 1);
|
||||
|
||||
await page.setViewportSize({ width: 440, height: 660 });
|
||||
const heading = dialog.getByRole("heading", { name: new RegExp(`In ${branch}`) });
|
||||
await expect.poll(() => heading.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await expect(incoming.getByRole("option")).toBeVisible();
|
||||
await expect(outgoing.getByRole("option")).toBeVisible();
|
||||
await dialog.getByRole("button", { name: "Show Diff", exact: true }).click();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "window_open_comparison"))
|
||||
.toMatchObject([{ comparison: { from: { rev: branch }, to: { rev: "HEAD" }, repo: "/dev/acme-api" } }]);
|
||||
});
|
||||
@@ -0,0 +1,50 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("keeps breakpoint details editable when the dialog gets narrow", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 500, height: 480 });
|
||||
await page.evaluate(async () => {
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const storeModule = "/src/features/debugger/breakpoints/store.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
const { addBreakpoint } = await import(/* @vite-ignore */ storeModule);
|
||||
addBreakpoint("/dev/acme-api/CheckInternationalSettlementBeforeDispatch.java", 7, {
|
||||
condition: "amount > 100",
|
||||
});
|
||||
addBreakpoint("/dev/acme-api/Receipt.java", 4);
|
||||
await executeAction("debug.viewBreakpoints");
|
||||
});
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Breakpoints" });
|
||||
const list = dialog.getByRole("listbox", { name: "All breakpoints" });
|
||||
const condition = dialog.locator('input[aria-label="Condition"]');
|
||||
await expect(condition).toHaveValue("amount > 100");
|
||||
await expect.poll(async () => (await condition.boundingBox())?.width ?? 0).toBeGreaterThanOrEqual(240);
|
||||
await expect(dialog.getByRole("button", { name: "Done", exact: true })).toBeInViewport({ ratio: 1 });
|
||||
await condition.fill("amount > 250");
|
||||
await dialog.getByRole("checkbox", { name: "Evaluate and log", exact: true }).check();
|
||||
await dialog.getByRole("textbox", { name: "Evaluate and log", exact: true }).fill("total: {amount}");
|
||||
const first = list.getByRole("option", { name: /CheckInternationalSettlementBeforeDispatch\.java:8/ });
|
||||
await expect(first.getByText(":8", { exact: true })).toBeInViewport({ ratio: 1 });
|
||||
await list.getByRole("option", { name: /Receipt\.java:5/ }).click();
|
||||
await expect(condition).toHaveValue("");
|
||||
await first.click();
|
||||
await expect(condition).toHaveValue("amount > 250");
|
||||
await expect(dialog.getByRole("textbox", { name: "Evaluate and log", exact: true })).toHaveValue("total: {amount}");
|
||||
|
||||
await page.setViewportSize({ width: 1080, height: 760 });
|
||||
const divider = dialog.locator('[data-separator][aria-orientation="vertical"]');
|
||||
await expect(divider).toBeInViewport();
|
||||
const oldWidth = (await list.boundingBox())!.width;
|
||||
const handle = (await divider.boundingBox())!;
|
||||
await page.mouse.move(handle.x + handle.width / 2, handle.y + handle.height / 2);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(handle.x + 60, handle.y + handle.height / 2, { steps: 4 });
|
||||
await page.mouse.up();
|
||||
await expect.poll(async () => (await list.boundingBox())?.width ?? 0).toBeGreaterThan(oldWidth + 20);
|
||||
await expect(condition).toHaveValue("amount > 250");
|
||||
const request = dialog.getByRole("textbox", { name: "Part of a request URL" });
|
||||
await request.scrollIntoViewIfNeeded();
|
||||
await expect(request).toBeInViewport({ ratio: 1 });
|
||||
await dialog.getByRole("button", { name: "Done", exact: true }).click();
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,75 @@
|
||||
import type { MethodSignature } from "../src/bindings";
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const signature: MethodSignature = {
|
||||
methodIdentifier: "invoice",
|
||||
modifier: "",
|
||||
returnType: "Invoice",
|
||||
methodName: "prepareInvoiceForInternationalSettlement",
|
||||
parameters: [
|
||||
["Order", "order"],
|
||||
["String", "billingCurrency"],
|
||||
["BigDecimal", "amountBeforeDiscount"],
|
||||
["Map<String, BigDecimal>", "taxRatesByJurisdiction"],
|
||||
["List<Adjustment>", "settlementAdjustments"],
|
||||
["RoundingMode", "roundingMode"],
|
||||
["LocalDate", "scheduledSettlementDate"],
|
||||
["boolean", "includeTaxBreakdown"],
|
||||
].map(([type, name], originalIndex) => ({ type: type!, name: name!, originalIndex, defaultValue: "" })),
|
||||
exceptions: [],
|
||||
};
|
||||
|
||||
test("keeps parameter rows and a long signature preview usable in a short dialog", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 490, height: 520 });
|
||||
await page.evaluate(async () => {
|
||||
const workbench = "/src/workbench/contributions.ts";
|
||||
const { editorService } = await import(/* @vite-ignore */ workbench);
|
||||
await editorService().openFile("/dev/acme-api/InvoiceService.java");
|
||||
});
|
||||
const editor = page.locator(".cm-editor .cm-content");
|
||||
await expect(editor).toBeVisible();
|
||||
await stubDesktop(page);
|
||||
const fontSize = await editor.evaluate(async (content, signature) => {
|
||||
window.__ipc.handlers.lsp_signature_info = () => signature;
|
||||
const viewModule = "/node_modules/.vite/deps/@codemirror_view.js";
|
||||
const prefsModule = "/src/editor/core/cm/prefs.ts";
|
||||
const { EditorView } = await import(/* @vite-ignore */ viewModule);
|
||||
const { stepFontZoom } = await import(/* @vite-ignore */ prefsModule);
|
||||
const base = Number.parseFloat(getComputedStyle(content).fontSize);
|
||||
const view = EditorView.findFromDOM(content as HTMLElement)!;
|
||||
stepFontZoom(view, 4);
|
||||
view.focus();
|
||||
return `${base + 4}px`;
|
||||
}, signature);
|
||||
await expect(editor).toHaveCSS("font-size", fontSize);
|
||||
await page.keyboard.press("Meta+F6");
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Change Signature" });
|
||||
const table = dialog.getByRole("table", { name: "Parameters" });
|
||||
const names = table.getByRole("textbox", { name: "Name", exact: true });
|
||||
await expect(names.first()).toBeInViewport({ ratio: 1 });
|
||||
const defaults = table.getByRole("columnheader", { name: "Default value", exact: true });
|
||||
await expect(defaults).toHaveCount(0);
|
||||
const preview = dialog.locator("pre");
|
||||
await expect(preview).toBeInViewport({ ratio: 1 });
|
||||
await expect(preview).toHaveCSS("font-size", fontSize);
|
||||
await expect(names.first()).toHaveCSS("font-size", fontSize);
|
||||
expect(
|
||||
await preview.evaluate((el) => el.scrollHeight > el.clientHeight && el.scrollWidth <= el.clientWidth + 1),
|
||||
).toBe(true);
|
||||
await expect(dialog.getByRole("button", { name: "Cancel" })).toBeInViewport({ ratio: 1 });
|
||||
|
||||
await dialog.getByRole("button", { name: "Add", exact: true }).click();
|
||||
await expect(defaults).toBeInViewport({ ratio: 1 });
|
||||
const addedType = table.getByRole("textbox", { name: "Type", exact: true }).last();
|
||||
await expect(addedType).toBeInViewport({ ratio: 1 });
|
||||
await addedType.fill("boolean");
|
||||
await names.last().fill("attachReceipt");
|
||||
await table.getByRole("textbox", { name: "Default value", exact: true }).last().fill("false");
|
||||
await dialog.getByRole("button", { name: "Move Up", exact: true }).click();
|
||||
await expect(names.nth(7)).toHaveValue("attachReceipt");
|
||||
await expect(preview).toContainText("boolean attachReceipt");
|
||||
await expect(dialog.getByRole("button", { name: "Preview", exact: true })).toBeEnabled();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const REPO = "https://example.test/team/billing-service.git";
|
||||
|
||||
test("Clone Repository keeps URL, directory, and depth usable when the dialog narrows", async ({ workbench: page }) => {
|
||||
await stubDesktop(page);
|
||||
await page.setViewportSize({ width: 440, height: 620 });
|
||||
await page.evaluate(async (repo) => {
|
||||
window.__ipc.handlers["plugin:dialog|open"] = () => "/dev/workspaces";
|
||||
window.__ipc.handlers.vcs_clone = () => new Promise(() => {});
|
||||
const contributionsPath = "/src/workbench/contributions.ts";
|
||||
const { registerCloneSource } = await import(/* @vite-ignore */ contributionsPath);
|
||||
registerCloneSource({ id: "team", label: "Team repositories", icon: "branch", component: () => null });
|
||||
const actionsPath = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsPath);
|
||||
await executeAction("vcs.clone", repo);
|
||||
}, REPO);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Clone Repository" });
|
||||
const sources = dialog.getByRole("complementary", { name: "Clone source" });
|
||||
const url = dialog.getByRole("textbox", { name: "URL:" });
|
||||
await expect(url).toHaveValue(REPO);
|
||||
await expect.poll(async () => (await url.boundingBox())!.width).toBeGreaterThan(180);
|
||||
|
||||
const form = dialog.locator("form");
|
||||
const position = () =>
|
||||
form.evaluate((el) => {
|
||||
const source = el.parentElement!.querySelector("aside")!.getBoundingClientRect();
|
||||
const body = el.getBoundingClientRect();
|
||||
return { below: body.top >= source.bottom, beside: body.left >= source.right };
|
||||
});
|
||||
await expect.poll(async () => (await position()).below).toBe(true);
|
||||
expect(await form.evaluate((el) => el.scrollWidth === el.clientWidth)).toBe(true);
|
||||
|
||||
await dialog.getByRole("button", { name: "Browse…" }).click();
|
||||
const directory = dialog.getByRole("textbox", { name: "Directory:" });
|
||||
await expect(directory).toHaveValue("/dev/workspaces/billing-service");
|
||||
|
||||
const shallow = dialog.getByRole("checkbox", { name: /^Shallow clone/ });
|
||||
const depth = dialog.getByRole("spinbutton", { name: "Clone depth" });
|
||||
await expect(depth).toBeDisabled();
|
||||
await shallow.check();
|
||||
await depth.fill("0");
|
||||
const clone = dialog.getByRole("button", { name: "Clone", exact: true });
|
||||
await expect(clone).toBeDisabled();
|
||||
await depth.fill("3");
|
||||
|
||||
await page.setViewportSize({ width: 1050, height: 750 });
|
||||
await expect.poll(async () => (await position()).beside).toBe(true);
|
||||
await sources.getByRole("button", { name: "Team repositories" }).click();
|
||||
await expect(url).toBeHidden();
|
||||
await sources.getByRole("button", { name: "Repository URL" }).click();
|
||||
await expect(url).toHaveValue(REPO);
|
||||
await expect(directory).toHaveValue("/dev/workspaces/billing-service");
|
||||
await expect(depth).toHaveValue("3");
|
||||
|
||||
await page.setViewportSize({ width: 440, height: 620 });
|
||||
await clone.click();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "vcs_clone"))
|
||||
.toEqual([expect.objectContaining({ url: REPO, dest: "/dev/workspaces/billing-service", depth: 3 })]);
|
||||
});
|
||||
@@ -0,0 +1,53 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Code Style keeps settings reachable by tab, keyboard, and search in a narrow pane", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 620, height: 720 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const dialog = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await expect(dialog).toBeVisible();
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(async () => {
|
||||
window.__ipc.handlers.languages = () => [
|
||||
{ id: "typescript", name: "TypeScript", indent: { tabSize: 2, insertSpaces: true }, lineComment: "//" },
|
||||
];
|
||||
const languageList = "/src/platform/languageList.ts";
|
||||
(await import(/* @vite-ignore */ languageList)).languageListChanged();
|
||||
});
|
||||
|
||||
const search = dialog.getByRole("textbox", { name: "Search settings" });
|
||||
await search.fill("typescript");
|
||||
await dialog.getByRole("treeitem", { name: "TypeScript", exact: true, level: 3 }).click();
|
||||
await search.clear();
|
||||
|
||||
const tabs = dialog.getByRole("tablist", { name: "Code Style" });
|
||||
const indents = tabs.getByRole("tab", { name: "Tabs and Indents" });
|
||||
const wrapping = tabs.getByRole("tab", { name: "Wrapping", exact: true });
|
||||
const comments = tabs.getByRole("tab", { name: "Comment Code" });
|
||||
await expect(indents).toHaveAttribute("aria-selected", "true");
|
||||
const size = dialog.getByRole("textbox", { name: "Tab size", exact: true });
|
||||
const indent = dialog.getByRole("textbox", { name: "Indent", exact: true });
|
||||
await expect(indent).toBeVisible();
|
||||
expect((await indent.boundingBox())!.x).toBeCloseTo((await size.boundingBox())!.x, 0);
|
||||
await size.fill("6");
|
||||
await indents.press("ArrowRight");
|
||||
await expect(wrapping).toBeFocused();
|
||||
await expect(dialog.getByRole("textbox", { name: "Hard wrap at", exact: true })).toBeVisible();
|
||||
await expect(size).toBeHidden();
|
||||
|
||||
await search.fill("TypeScript line comment at first column");
|
||||
await expect(comments).toHaveAttribute("aria-selected", "true");
|
||||
await expect(dialog.getByRole("checkbox", { name: "Line comment at first column" })).toBeVisible();
|
||||
await indents.click();
|
||||
await expect(size).toHaveValue("6");
|
||||
await page.setViewportSize({ width: 520, height: 720 });
|
||||
const body = dialog.locator("[class*='pageBody']");
|
||||
await expect.poll(() => body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await expect(dialog.getByRole("button", { name: "Copy to Project", exact: true })).toBeVisible();
|
||||
|
||||
await search.fill("do not format");
|
||||
await dialog.getByRole("treeitem", { name: "Code Style", exact: true, level: 2 }).click();
|
||||
await expect(dialog.getByRole("tab", { name: "Formatter", exact: true })).toHaveAttribute("aria-selected", "true");
|
||||
await expect(dialog.getByRole("listbox", { name: "Do not format" })).toBeVisible();
|
||||
});
|
||||
@@ -0,0 +1,40 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Color Scheme keeps the preview visible while editing an attribute in narrow Settings", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 1120, height: 760 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
const search = settings.getByRole("textbox", { name: "Search settings" });
|
||||
await search.fill("Language Defaults");
|
||||
await settings.getByRole("treeitem", { name: "Language Defaults", exact: true }).click();
|
||||
await search.clear();
|
||||
|
||||
const divider = settings.getByRole("separator", { name: "Resize color scheme preview", exact: true });
|
||||
const tree = settings.getByRole("tree", { name: "Color scheme attributes", exact: true });
|
||||
const options = settings.getByRole("region", { name: "Color scheme options", exact: true });
|
||||
const preview = settings.getByLabel("Color scheme preview", { exact: true });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
expect((await tree.boundingBox())!.x).toBeLessThan((await options.boundingBox())!.x);
|
||||
|
||||
await page.setViewportSize({ width: 520, height: 660 });
|
||||
await expect.poll(async () => (await tree.boundingBox())!.y).toBeLessThan((await options.boundingBox())!.y);
|
||||
const previewTop = (await preview.boundingBox())!.y;
|
||||
const token = preview.getByText("class", { exact: true }).first();
|
||||
await token.click();
|
||||
await expect(tree.getByRole("treeitem", { name: "Keyword", exact: true, selected: true })).toBeVisible();
|
||||
await options.getByRole("textbox", { name: "Foreground hex", exact: true }).fill("#118899");
|
||||
await expect(token).toHaveCSS("color", "rgb(17, 136, 153)");
|
||||
await expect(preview).toBeInViewport();
|
||||
expect((await preview.boundingBox())!.y).toBeCloseTo(previewTop, 0);
|
||||
await expect
|
||||
.poll(() => settings.locator("[class*='pageBody']").evaluate((el) => el.scrollWidth - el.clientWidth))
|
||||
.toBeLessThanOrEqual(1);
|
||||
await options.getByRole("checkbox", { name: "Semantic highlighting" }).scrollIntoViewIfNeeded();
|
||||
expect((await preview.boundingBox())!.y).toBeCloseTo(previewTop, 0);
|
||||
|
||||
const before = (await divider.boundingBox())!.y;
|
||||
await divider.press("ArrowUp");
|
||||
await expect.poll(async () => (await divider.boundingBox())!.y).toBeLessThan(before - 1);
|
||||
});
|
||||
@@ -0,0 +1,75 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const functionName = "calculateRegionalSettlementFromExternalOrderBeforeReconciliation";
|
||||
const sourcePath = "/dev/acme-api/build.gradle.kts";
|
||||
|
||||
test("keeps frame sources and the keyboard selection visible in a narrow debug dock", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1120, height: 540 });
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ functionName, sourcePath }) => {
|
||||
const debugModule = "/src/features/debugger/state.ts";
|
||||
const layoutModule = "/src/workbench/toolwindows/store.ts";
|
||||
const servicesModule = "/src/workbench/contributions.ts";
|
||||
const { adoptSession } = await import(/* @vite-ignore */ debugModule);
|
||||
const { moveToolWindow, setToolWindowSize } = await import(/* @vite-ignore */ layoutModule);
|
||||
const { toolWindowService } = await import(/* @vite-ignore */ servicesModule);
|
||||
const workerFrame = {
|
||||
id: 51,
|
||||
name: "processOrder",
|
||||
path: sourcePath,
|
||||
line: 5,
|
||||
column: 0,
|
||||
presentationHint: null,
|
||||
};
|
||||
window.__ipc.handlers.debug_scopes = () => [];
|
||||
window.__ipc.handlers.debug_stack_trace = () => [workerFrame];
|
||||
adoptSession(91, {
|
||||
name: "Reconciliation",
|
||||
adapter: "debugpy",
|
||||
status: "paused",
|
||||
stoppedThread: 1,
|
||||
selectedThread: 1,
|
||||
threads: [
|
||||
{ id: 1, name: "MainThread" },
|
||||
{ id: 2, name: "Order worker" },
|
||||
],
|
||||
selectedFrame: 1,
|
||||
frames: Array.from({ length: 32 }, (_, index) => ({
|
||||
id: index + 1,
|
||||
name: index === 0 ? functionName : index === 1 ? "runBatch" : `reconcile(${index})`,
|
||||
path: sourcePath,
|
||||
line: index === 0 ? 41 : index,
|
||||
column: 0,
|
||||
presentationHint: null,
|
||||
})),
|
||||
});
|
||||
moveToolWindow("debug", "right");
|
||||
setToolWindowSize("right", 420);
|
||||
toolWindowService().show("debug", true);
|
||||
},
|
||||
{ functionName, sourcePath },
|
||||
);
|
||||
const debug = page.getByRole("region", { name: "Debug", exact: true });
|
||||
await debug.getByRole("tab", { name: "Threads & Variables", exact: true }).click();
|
||||
const thread = debug.getByRole("button", { name: "Thread", exact: true });
|
||||
const frames = debug.getByRole("listbox", { name: "Frames", exact: true });
|
||||
const first = frames.getByRole("option", { selected: true });
|
||||
await expect(first.getByText(functionName, { exact: true })).toBeVisible();
|
||||
expect(await frames.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await expect(first.getByText(":42", { exact: true })).toBeInViewport({ ratio: 1 });
|
||||
expect(await first.getByText(/build\.gradle\.kts/).evaluate((el) => el.clientWidth)).toBeGreaterThan(25);
|
||||
const shortName = frames.getByText("runBatch", { exact: true });
|
||||
expect(await shortName.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
await frames.focus();
|
||||
for (let i = 0; i < 25; i++) await page.keyboard.press("ArrowDown");
|
||||
const selected = frames.getByRole("option", { selected: true });
|
||||
await expect(selected.getByText("reconcile(25)", { exact: true })).toBeInViewport({ ratio: 0.95 });
|
||||
expect(await frames.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
|
||||
|
||||
await thread.click();
|
||||
await page.getByRole("option", { name: "Order worker", exact: true }).click();
|
||||
await expect(thread).toContainText("Order worker");
|
||||
await expect(frames.getByRole("option", { selected: true })).toContainText("processOrder");
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Editor Font keeps the preview in view while editing and resizing the controls", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1200, height: 760 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
const search = settings.getByRole("textbox", { name: "Search settings" });
|
||||
await search.fill("Show only monospaced fonts");
|
||||
await settings.getByRole("treeitem", { name: "Font", exact: true, level: 2 }).click();
|
||||
await search.clear();
|
||||
|
||||
const divider = settings.getByRole("separator", { name: "Resize font preview" });
|
||||
const options = settings.getByRole("region", { name: "Font options", exact: true });
|
||||
const preview = settings.getByRole("textbox", { name: "Font preview", exact: true });
|
||||
const font = options.getByRole("combobox", { name: "Font", exact: true });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
expect((await font.boundingBox())!.x).toBeLessThan((await preview.boundingBox())!.x);
|
||||
await expect.poll(() => preview.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
await preview.fill("function main() { return 42; }");
|
||||
await options.getByRole("textbox", { name: "Size", exact: true }).fill("18");
|
||||
await options.getByRole("textbox", { name: "Line height", exact: true }).fill("25");
|
||||
await expect(preview).toHaveCSS("font-size", "18px");
|
||||
await expect(preview).toHaveCSS("line-height", "25px");
|
||||
|
||||
await page.setViewportSize({ width: 520, height: 620 });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
expect((await font.boundingBox())!.y).toBeLessThan((await preview.boundingBox())!.y);
|
||||
await expect(preview).toHaveValue("function main() { return 42; }");
|
||||
const y = (await divider.boundingBox())!.y;
|
||||
await divider.press("ArrowDown");
|
||||
await expect.poll(async () => (await divider.boundingBox())!.y).toBeGreaterThan(y + 1);
|
||||
|
||||
await search.fill("Fallback font");
|
||||
const fallback = options.getByRole("combobox", { name: "Fallback font", exact: true });
|
||||
await fallback.scrollIntoViewIfNeeded();
|
||||
await expect(fallback).toBeInViewport();
|
||||
await fallback.fill("Consolas");
|
||||
await expect(preview).toHaveCSS("font-family", /Consolas/);
|
||||
await expect(preview).toBeInViewport();
|
||||
await expect.poll(() => options.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
});
|
||||
@@ -64,3 +64,15 @@ test("editor Git submenu keeps repository actions disabled without Git", async (
|
||||
}
|
||||
await expect(page.getByRole("menuitem", { name: "Clone…", exact: true })).toBeEnabled();
|
||||
});
|
||||
|
||||
test("Project view Git submenu ends with Manage Remotes and Clone", async ({ workbench: page }) => {
|
||||
await page.getByRole("treeitem", { name: /README\.md/ }).click({ button: "right" });
|
||||
await page.getByRole("menuitem", { name: "Git", exact: true }).hover();
|
||||
const git = page.getByRole("menu").filter({ has: page.getByRole("menuitem", { name: "Clone…", exact: true }) });
|
||||
const items = git.locator('[role="menuitem"], [role="menuitemcheckbox"]');
|
||||
await expect(items.nth(-3)).toHaveText(/Unstash Changes…/);
|
||||
await expect(items.nth(-2)).toHaveText(/Manage Remotes…/);
|
||||
await expect(items.nth(-1)).toHaveText(/Clone…/);
|
||||
await git.getByRole("menuitem", { name: "Manage Remotes…", exact: true }).click();
|
||||
await expect(page.getByRole("dialog", { name: "Git Remotes" })).toBeVisible();
|
||||
});
|
||||
@@ -0,0 +1,90 @@
|
||||
import type { Locator, Page } from "@playwright/test";
|
||||
import { expect, openFromTree, test } from "./fixtures";
|
||||
|
||||
async function setTabs(page: Page, tabs: Record<string, unknown>) {
|
||||
await page.evaluate(async (tabs) => {
|
||||
const projectModule = "/src/platform/project.ts";
|
||||
const { useProject } = await import(/* @vite-ignore */ projectModule);
|
||||
const { settings } = useProject.getState();
|
||||
useProject.setState({
|
||||
settings: { ...settings, editor: { ...settings?.editor, tabs: { ...settings?.editor?.tabs, ...tabs } } },
|
||||
});
|
||||
}, tabs);
|
||||
}
|
||||
|
||||
const box = async (locator: Locator) => (await locator.boundingBox())!;
|
||||
const closeOf = (tab: Locator) => tab.locator("..").getByRole("button", { name: "Close Tab", exact: true });
|
||||
|
||||
test("a close button on the right keeps a narrow slot on every tab", async ({ workbench: page }) => {
|
||||
await openFromTree(page, "README.md");
|
||||
await openFromTree(page, "build.gradle.kts");
|
||||
const strip = page.getByRole("tablist", { name: "Editor tabs" });
|
||||
const idle = strip.getByRole("tab", { name: "README.md" });
|
||||
const label = await box(idle.locator(":scope > span"));
|
||||
const idleTab = await box(idle.locator(".."));
|
||||
expect(idleTab.x + idleTab.width - (label.x + label.width)).toBeCloseTo(18, 0);
|
||||
|
||||
const selected = strip.getByRole("tab", { name: "build.gradle.kts" });
|
||||
const close = await box(closeOf(selected));
|
||||
const tab = await box(selected.locator(".."));
|
||||
const text = await box(selected.locator(":scope > span"));
|
||||
expect(close.x).toBeGreaterThanOrEqual(text.x + text.width - 0.5);
|
||||
expect(close.x + close.width).toBeLessThanOrEqual(tab.x + tab.width + 0.5);
|
||||
expect(tab.x - (idleTab.x + idleTab.width)).toBeCloseTo(4, 0);
|
||||
});
|
||||
|
||||
for (const closeButtonPosition of ["right", "left"]) {
|
||||
test(`a dragged tab's ghost keeps the tab's layout, close button ${closeButtonPosition}`, async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await openFromTree(page, "README.md");
|
||||
await openFromTree(page, "build.gradle.kts");
|
||||
await setTabs(page, { closeButtonPosition });
|
||||
const selected = page.getByRole("tablist", { name: "Editor tabs" }).getByRole("tab", { name: "build.gradle.kts" });
|
||||
const tab = await box(selected.locator(".."));
|
||||
const close = await box(closeOf(selected));
|
||||
await page.mouse.move(tab.x + tab.width / 2, tab.y + tab.height / 2);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(tab.x + tab.width / 2, tab.y + tab.height / 2 + 40, { steps: 4 });
|
||||
const ghost = page.locator('[aria-hidden="true"]:has([data-tab-close])');
|
||||
const copy = await box(ghost);
|
||||
const copyClose = await box(ghost.locator("[data-tab-close] button"));
|
||||
expect(copy.width).toBeCloseTo(tab.width, 0);
|
||||
expect(copyClose.x - copy.x).toBeCloseTo(close.x - tab.x, 0);
|
||||
expect(copyClose.x + copyClose.width).toBeLessThanOrEqual(copy.x + copy.width + 0.5);
|
||||
await page.keyboard.press("Escape");
|
||||
await page.mouse.up();
|
||||
await expect(ghost).toHaveCount(0);
|
||||
});
|
||||
}
|
||||
|
||||
test("a close button on the left keeps a narrow slot before the icon", async ({ workbench: page }) => {
|
||||
await openFromTree(page, "README.md");
|
||||
await openFromTree(page, "build.gradle.kts");
|
||||
await setTabs(page, { closeButtonPosition: "left" });
|
||||
const strip = page.getByRole("tablist", { name: "Editor tabs" });
|
||||
|
||||
// The selected and the hovered tab show their button in an 18px slot before the icon, which stays visible.
|
||||
const selected = strip.getByRole("tab", { name: "build.gradle.kts" });
|
||||
const other = strip.getByRole("tab", { name: "README.md" });
|
||||
await other.hover();
|
||||
for (const tab of [selected, other]) {
|
||||
const icon = tab.locator(":scope > :first-child");
|
||||
await expect(icon).toHaveCSS("opacity", "1");
|
||||
await expect(closeOf(tab)).toHaveCSS("opacity", "1");
|
||||
const slot = await box(tab.locator(".."));
|
||||
const close = await box(closeOf(tab));
|
||||
const glyph = await box(icon);
|
||||
const label = await box(tab.locator(":scope > span"));
|
||||
expect(close.x + close.width).toBeLessThanOrEqual(glyph.x + 0.5);
|
||||
expect(glyph.x - slot.x).toBeCloseTo(18, 0);
|
||||
expect(slot.x + slot.width - (label.x + label.width)).toBeCloseTo(8, 0);
|
||||
}
|
||||
|
||||
// Without file icons the close button keeps its own place before the label.
|
||||
await setTabs(page, { showFileIcon: false });
|
||||
await expect(selected.locator("svg, img")).toHaveCount(0);
|
||||
const label = await box(selected.locator(":scope > span"));
|
||||
const slot = await box(closeOf(selected));
|
||||
expect(slot.x + slot.width).toBeLessThanOrEqual(label.x + 0.5);
|
||||
});
|
||||
@@ -0,0 +1,86 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const root = "/dev/acme-api";
|
||||
const name = `InternationalSettlement${"Reconciliation".repeat(10)}.txt`;
|
||||
const destination = `archive/Approved${"Settlement".repeat(11)}`;
|
||||
|
||||
test("keeps a long source name and destination readable while moving a file", async ({ workbench: page }) => {
|
||||
await page.evaluate(
|
||||
async ({ root, name, destination }) => {
|
||||
const fsModule = "/src/features/project-tree/fs.ts";
|
||||
const { projectFs } = await import(/* @vite-ignore */ fsModule);
|
||||
const storeModule = "/src/features/project-tree/store.ts";
|
||||
const { loadDir } = await import(/* @vite-ignore */ storeModule);
|
||||
const fs = projectFs(root);
|
||||
await fs.createFile(`${root}/${name}`);
|
||||
await fs.createDir(`${root}/archive`);
|
||||
await fs.createDir(`${root}/${destination}`);
|
||||
await loadDir(root, true);
|
||||
},
|
||||
{ root, name, destination },
|
||||
);
|
||||
await page.getByRole("treeitem", { name, exact: true }).click();
|
||||
await page.keyboard.press("F6");
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Move", exact: true });
|
||||
const field = dialog.getByRole("textbox", { name: "Target directory" });
|
||||
await expect(field).toBeFocused();
|
||||
await page.setViewportSize({ width: 470, height: 480 });
|
||||
await expect
|
||||
.poll(() => dialog.locator("[data-dialog-body]").evaluate((el) => el.scrollWidth - el.clientWidth))
|
||||
.toBeLessThanOrEqual(1);
|
||||
expect(
|
||||
await field.evaluate((el: HTMLInputElement) => el.value.slice(el.selectionStart ?? 0, el.selectionEnd ?? 0)),
|
||||
).toBe("acme-api");
|
||||
const submit = dialog.getByRole("button", { name: "Refactor", exact: true });
|
||||
await expect(submit).toBeDisabled();
|
||||
await field.fill(destination);
|
||||
await expect(dialog.getByText(destination, { exact: true })).toBeVisible();
|
||||
await expect(submit).toBeInViewport({ ratio: 1 });
|
||||
await dialog.getByRole("checkbox", { name: "Search for references" }).uncheck();
|
||||
await dialog.getByRole("checkbox", { name: "Search in comments and strings" }).uncheck();
|
||||
await submit.click();
|
||||
await expect(dialog).toBeHidden();
|
||||
await expect
|
||||
.poll(() =>
|
||||
page.evaluate(
|
||||
async ({ root, destination }) => {
|
||||
const fsModule = "/src/features/project-tree/fs.ts";
|
||||
const { projectFs } = await import(/* @vite-ignore */ fsModule);
|
||||
return (await projectFs(root).readDir(`${root}/${destination}`)).map((entry: { name: string }) => entry.name);
|
||||
},
|
||||
{ root, destination },
|
||||
),
|
||||
)
|
||||
.toEqual([name]);
|
||||
});
|
||||
|
||||
test("browses for a destination and keeps the current path on cancel", async ({ workbench: page }) => {
|
||||
await page.getByRole("treeitem", { name: "README.md", exact: true }).click();
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(() => {
|
||||
window.__ipc.handlers.file_dialog_needs_gtk = () => false;
|
||||
let chosen: string | null = null;
|
||||
window.__ipc.handlers["plugin:dialog|open"] = () => {
|
||||
const result = chosen;
|
||||
chosen = "C:\\Projects\\Invoice Archive";
|
||||
return result;
|
||||
};
|
||||
});
|
||||
await page.keyboard.press("F6");
|
||||
const dialog = page.getByRole("dialog", { name: "Move", exact: true });
|
||||
const field = dialog.getByRole("textbox", { name: "Target directory" });
|
||||
const browse = dialog.getByRole("button", { name: "Browse for target directory", exact: true });
|
||||
await browse.click();
|
||||
await expect.poll(() => ipcCalls(page, "plugin:dialog|open")).toHaveLength(1);
|
||||
await expect(field).toHaveValue(root);
|
||||
await browse.click();
|
||||
await expect(field).toHaveValue("C:/Projects/Invoice Archive");
|
||||
await expect(dialog.getByRole("button", { name: "Refactor", exact: true })).toBeEnabled();
|
||||
await field.fill("C:/");
|
||||
await expect(dialog.getByText("C:/", { exact: true })).toBeVisible();
|
||||
await field.fill("/");
|
||||
await expect(dialog.getByText("/", { exact: true })).toBeVisible();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("File Types keeps association editors usable and opens ignored rules from search", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1120, height: 760 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await expect(settings).toBeVisible();
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(() => {
|
||||
window.__ipc.handlers.languages = () => [
|
||||
{ id: "javascript", name: "JavaScript", extensions: ["js"] },
|
||||
{ id: "python", name: "Python", extensions: ["py", "pyi", "pyw"], filenames: ["SConstruct", "SConscript"] },
|
||||
];
|
||||
});
|
||||
const search = settings.getByRole("textbox", { name: "Search settings" });
|
||||
await search.fill("File Types");
|
||||
await settings.getByRole("treeitem", { name: "File Types", exact: true }).click();
|
||||
await search.clear();
|
||||
|
||||
const tabs = settings.getByRole("tablist", { name: "File Types" });
|
||||
const recognized = tabs.getByRole("tab", { name: "Recognized File Types" });
|
||||
const ignored = tabs.getByRole("tab", { name: "Ignored Files and Folders" });
|
||||
await expect(recognized).toHaveAttribute("aria-selected", "true");
|
||||
const divider = settings.getByRole("separator", { name: "Resize file type panes" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
|
||||
await page.setViewportSize({ width: 520, height: 660 });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
const types = settings.getByRole("listbox", { name: "Recognized file types", exact: true });
|
||||
await types.getByRole("option", { name: "Python", exact: true }).click();
|
||||
const patterns = settings.getByRole("listbox", { name: "File name patterns of Python" });
|
||||
const hashbangLabel = settings.getByText("Hashbang patterns", { exact: true });
|
||||
await expect
|
||||
.poll(async () => {
|
||||
const nameList = await patterns.boundingBox();
|
||||
const hashbangHeading = await hashbangLabel.boundingBox();
|
||||
return nameList && hashbangHeading ? hashbangHeading.y - (nameList.y + nameList.height) : -1;
|
||||
})
|
||||
.toBeGreaterThan(0);
|
||||
await expect
|
||||
.poll(() => settings.locator("[class*='_patterns_']").evaluate((el) => el.scrollWidth - el.clientWidth))
|
||||
.toBeLessThanOrEqual(1);
|
||||
const toolbar = settings.locator(`[role="toolbar"][aria-controls="${await patterns.getAttribute("id")}"]`);
|
||||
await toolbar.getByRole("button", { name: "Add" }).click();
|
||||
const pattern = patterns.getByRole("textbox", { name: "Pattern" });
|
||||
await pattern.fill("*.layout-demo");
|
||||
await pattern.press("Enter");
|
||||
await expect(patterns.getByRole("option", { name: "*.layout-demo", exact: true })).toBeVisible();
|
||||
await expect
|
||||
.poll(() => settings.locator("[class*='pageBody']").evaluate((el) => el.scrollWidth - el.clientWidth))
|
||||
.toBeLessThanOrEqual(1);
|
||||
|
||||
await search.fill("Exclude patterns");
|
||||
await expect(ignored).toHaveAttribute("aria-selected", "true");
|
||||
await expect(settings.getByRole("listbox", { name: "Exclude patterns" })).toBeVisible();
|
||||
await expect(patterns).toBeHidden();
|
||||
await ignored.click();
|
||||
await search.clear();
|
||||
await ignored.press("ArrowLeft");
|
||||
await expect(recognized).toHaveAttribute("aria-selected", "true");
|
||||
await expect(patterns.getByRole("option", { name: "*.layout-demo", exact: true })).toBeVisible();
|
||||
});
|
||||
@@ -0,0 +1,98 @@
|
||||
import type { EditorView } from "@codemirror/view";
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Hierarchy keeps source context and controls reachable in a narrow dock", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 940, height: 680 });
|
||||
const path = "/dev/acme-api/QuarterlySettlementReconciliationCoordinator.ts";
|
||||
const caller = "reconcileQuarterlySettlementForMerchantOrders";
|
||||
const context = "Checkout and settlement coordinator";
|
||||
await page.evaluate(
|
||||
async ({ path, caller }) => {
|
||||
const backend = "/src/editor/core/backend.ts";
|
||||
const { docBackend } = await import(/* @vite-ignore */ backend);
|
||||
docBackend().files.set(
|
||||
path,
|
||||
[
|
||||
"function settleOrder() {}",
|
||||
"",
|
||||
`function ${caller}() {`,
|
||||
" settleOrder();",
|
||||
" settleOrder();",
|
||||
"}",
|
||||
`function flushSettlementQueue() { ${caller}(); }`,
|
||||
].join("\n"),
|
||||
);
|
||||
const service = "/src/workbench/contributions.ts";
|
||||
await (await import(/* @vite-ignore */ service)).editorService().openFile(path);
|
||||
},
|
||||
{ path, caller },
|
||||
);
|
||||
const editor = page.locator(".cm-content");
|
||||
await expect(editor).toContainText("settleOrder");
|
||||
await editor.evaluate((el) => {
|
||||
const view = (el as HTMLElement & { cmTile: { view: EditorView } }).cmTile.view;
|
||||
view.dispatch({ selection: { anchor: 11 } });
|
||||
view.focus();
|
||||
});
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ path, caller, context }) => {
|
||||
const range = (line: number, col: number) => ({ start: { line, col }, end: { line, col: col + 5 } });
|
||||
const item = (name: string, line: number, detail: string, fromRanges: ReturnType<typeof range>[]) => ({
|
||||
name,
|
||||
path,
|
||||
detail,
|
||||
kind: "function",
|
||||
range: range(line, 0),
|
||||
selectionRange: range(line, 9),
|
||||
fromRanges,
|
||||
});
|
||||
window.__ipc.handlers.lsp_call_hierarchy = ({ pos }) => {
|
||||
const line = (pos as { line: number }).line;
|
||||
return {
|
||||
items:
|
||||
line === 0
|
||||
? [item(caller, 2, context, [range(3, 2), range(4, 2)])]
|
||||
: [item("flushSettlementQueue", 6, "Queue processing", [range(6, 34)])],
|
||||
incomplete: null,
|
||||
};
|
||||
};
|
||||
const actions = "/src/platform/actions.ts";
|
||||
await (await import(/* @vite-ignore */ actions)).executeAction("navigate.callHierarchy");
|
||||
const dock = "/src/workbench/toolwindows/store.ts";
|
||||
(await import(/* @vite-ignore */ dock)).setToolWindowSize("right", 136);
|
||||
},
|
||||
{ path, caller, context },
|
||||
);
|
||||
|
||||
const tree = page.getByRole("tree", { name: "Call hierarchy" });
|
||||
const row = tree.getByRole("treeitem").filter({ hasText: caller });
|
||||
await expect(row).toBeVisible();
|
||||
const detail = row.getByText(context, { exact: true });
|
||||
await expect.poll(() => detail.evaluate((el) => el.clientWidth)).toBeGreaterThan(100);
|
||||
expect((await row.getByText("(2 calls)", { exact: true }).boundingBox())!.x).toBeLessThan(
|
||||
(await detail.boundingBox())!.x,
|
||||
);
|
||||
const toolbar = page.getByRole("toolbar", { name: "Hierarchy actions" });
|
||||
expect(await toolbar.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await tree.evaluate((el) => {
|
||||
el.scrollLeft = el.scrollWidth;
|
||||
});
|
||||
expect(await tree.evaluate((el) => el.scrollLeft)).toBeGreaterThan(100);
|
||||
await tree.evaluate((el) => {
|
||||
el.scrollLeft = 0;
|
||||
});
|
||||
await row.click({ position: { x: 90, y: 12 } });
|
||||
await page.keyboard.press("ArrowRight");
|
||||
await expect(tree.getByRole("treeitem").filter({ hasText: "flushSettlementQueue" })).toBeVisible();
|
||||
await page.keyboard.press("Enter");
|
||||
await expect
|
||||
.poll(() =>
|
||||
page.evaluate(async () => {
|
||||
const service = "/src/workbench/contributions.ts";
|
||||
const cursor = (await import(/* @vite-ignore */ service)).editorService().activeCursor();
|
||||
return { path: cursor?.path, line: cursor?.line, col: cursor?.col };
|
||||
}),
|
||||
)
|
||||
.toEqual({ path, line: 3, col: 2 });
|
||||
});
|
||||
@@ -0,0 +1,52 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Inspections keeps the selected rule and its controls usable as the pane changes width", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 620, height: 720 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const dialog = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await expect(dialog).toBeVisible();
|
||||
await page.evaluate(async () => {
|
||||
const path = "/src/features/settings/model/staging.ts";
|
||||
(await import(/* @vite-ignore */ path)).selectPage("editor.inspections");
|
||||
});
|
||||
|
||||
const search = dialog.getByRole("textbox", { name: "Search inspections" });
|
||||
await search.fill("typo");
|
||||
const tree = dialog.getByRole("tree", { name: "Inspections" });
|
||||
const typo = tree.getByRole("treeitem", { name: /Typo/ });
|
||||
await typo.click();
|
||||
const body = dialog.locator("[class*='pageBody']");
|
||||
await expect.poll(() => body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
const resize = dialog.getByRole("separator", { name: "Resize inspection panes" });
|
||||
const details = dialog.getByRole("region", { name: "Inspection details" });
|
||||
await expect(resize).toHaveAttribute("aria-orientation", "horizontal");
|
||||
await expect(details.getByRole("heading", { name: "Typo" })).toBeVisible();
|
||||
const narrowTree = await tree.boundingBox();
|
||||
const narrowDetails = await details.boundingBox();
|
||||
expect(narrowDetails!.y).toBeGreaterThan(narrowTree!.y + narrowTree!.height);
|
||||
|
||||
await expect(details.getByRole("separator", { name: "Resize inspection description" })).toHaveAttribute(
|
||||
"aria-orientation",
|
||||
"horizontal",
|
||||
);
|
||||
const severity = details.getByRole("button", { name: "Severity" });
|
||||
const severityBox = await severity.boundingBox();
|
||||
expect(severityBox!.y + severityBox!.height).toBeLessThan(narrowDetails!.y + narrowDetails!.height);
|
||||
await severity.click();
|
||||
await page.getByRole("option", { name: "Warning", exact: true }).click();
|
||||
const code = details.getByRole("checkbox", { name: "Process code" });
|
||||
await code.uncheck();
|
||||
await expect(severity).toHaveText("Warning");
|
||||
|
||||
await page.setViewportSize({ width: 1040, height: 740 });
|
||||
await expect(resize).toHaveAttribute("aria-orientation", "vertical");
|
||||
const width = (await tree.boundingBox())!.width;
|
||||
await resize.press("ArrowRight");
|
||||
await expect.poll(async () => (await tree.boundingBox())!.width).toBeGreaterThan(width + 5);
|
||||
await expect(typo).toHaveAttribute("aria-selected", "true");
|
||||
await expect(severity).toHaveText("Warning");
|
||||
await expect(code).not.toBeChecked();
|
||||
});
|
||||
@@ -0,0 +1,90 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Interactive rebase keeps commit messages and plan controls usable at narrow widths", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
const first = "Keep regional settlement references stable when reconciling delayed ledger updates";
|
||||
const second = "Add settlement summary";
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ first, second }) => {
|
||||
const root = "/dev/acme-api";
|
||||
const id = (n: string) => n.repeat(40);
|
||||
const commits = [
|
||||
{ id: id("c"), shortId: "cccccccc", parents: [id("b")], summary: second, timeMs: 1795100200000 },
|
||||
{ id: id("b"), shortId: "bbbbbbbb", parents: [id("a")], summary: first, timeMs: 1795100100000 },
|
||||
].map((commit) => ({
|
||||
...commit,
|
||||
refs: [],
|
||||
author: "Sam Rivera",
|
||||
email: "[email protected]",
|
||||
message: commit.summary + "\n\nKeep the audit trail linked to the settlement job.",
|
||||
}));
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_roots = () => [{ root, operation: null, head: "main", headCommit: id("c") }];
|
||||
h.vcs_branch_info = () => ({
|
||||
head: "main",
|
||||
headCommit: id("c"),
|
||||
upstream: null,
|
||||
ahead: 0,
|
||||
behind: 0,
|
||||
operation: null,
|
||||
});
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_log = () => commits;
|
||||
h.vcs_log_refs = () => ({});
|
||||
h.vcs_log_users = () => ["Sam Rivera <[email protected]>"];
|
||||
h.vcs_config_get = () => null;
|
||||
h.vcs_commit_files = () => [];
|
||||
h.vcs_log_details_batch = () => [];
|
||||
const vcsPath = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ vcsPath);
|
||||
useVcs.setState({ available: true, root, roots: [root], repo: root, branchesLoaded: true });
|
||||
const contextPath = "/src/platform/context.ts";
|
||||
(await import(/* @vite-ignore */ contextPath)).setContext("vcsAvailable", true);
|
||||
const actionsPath = "/src/platform/actions.ts";
|
||||
await (await import(/* @vite-ignore */ actionsPath)).executeAction("vcs.showLog");
|
||||
},
|
||||
{ first, second },
|
||||
);
|
||||
const log = page.getByRole("listbox", { name: "Commits" });
|
||||
await log.getByRole("option", { name: new RegExp(first) }).click({ button: "right" });
|
||||
await page.getByRole("menuitem", { name: /Interactively Rebase from Here/ }).click();
|
||||
const dialog = page.getByRole("dialog", { name: /Rebasing 2 commits/ });
|
||||
await expect(dialog).toBeVisible();
|
||||
|
||||
await page.setViewportSize({ width: 440, height: 640 });
|
||||
const list = dialog.getByRole("list", { name: "Commits to rebase" });
|
||||
const originalRows = list.getByRole("listitem");
|
||||
await dialog.getByRole("button", { name: "Action for bbbbbbbb" }).click();
|
||||
await page.getByRole("option", { name: "Reword", exact: true }).click();
|
||||
const reword = dialog.getByRole("textbox", { name: "New message for bbbbbbbb" });
|
||||
await expect(reword).toHaveValue(first + "\n\nKeep the audit trail linked to the settlement job.");
|
||||
const editor = (await reword.boundingBox())!;
|
||||
expect(editor.width).toBeGreaterThan(260);
|
||||
expect(editor.height).toBeGreaterThan(160);
|
||||
|
||||
const divider = dialog.getByRole("separator", { name: "Resize rebase panes" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
const start = dialog.getByRole("button", { name: "Start Rebasing" });
|
||||
await expect(start).toBeDisabled();
|
||||
const message = "Keep settlement references stable\n\nPreserve the audit trail.";
|
||||
await reword.fill(message);
|
||||
await expect(start).toBeEnabled();
|
||||
|
||||
await dialog.getByRole("button", { name: "Move Down" }).click();
|
||||
await expect(originalRows.first()).toContainText(second);
|
||||
await expect(reword).toHaveValue(message);
|
||||
await originalRows
|
||||
.first()
|
||||
.getByRole("button", { name: new RegExp(second) })
|
||||
.click();
|
||||
const details = dialog.getByRole("region", { name: "Commit details" });
|
||||
await expect(details).toContainText("Keep the audit trail linked to the settlement job.");
|
||||
|
||||
await page.setViewportSize({ width: 1120, height: 760 });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
await expect(details).toContainText(second);
|
||||
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
@@ -0,0 +1,56 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Keymap fits a narrow Settings pane and keeps shortcut editing reachable", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1080, height: 760 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await settings.getByRole("treeitem", { name: "Keymap", exact: true }).click();
|
||||
|
||||
const search = settings.getByRole("textbox", { name: "Search actions" });
|
||||
const expand = settings.getByRole("button", { name: "Expand All", exact: true });
|
||||
await expect(search).toBeVisible();
|
||||
const wideSearch = (await search.boundingBox())!;
|
||||
const wideExpand = (await expand.boundingBox())!;
|
||||
expect(wideExpand.x).toBeLessThan(wideSearch.x);
|
||||
expect(Math.abs(wideExpand.y - wideSearch.y)).toBeLessThan(8);
|
||||
|
||||
await page.setViewportSize({ width: 520, height: 760 });
|
||||
const narrowSearch = (await search.boundingBox())!;
|
||||
const narrowExpand = (await expand.boundingBox())!;
|
||||
expect(narrowSearch.y).toBeGreaterThan(narrowExpand.y + narrowExpand.height);
|
||||
|
||||
const body = settings.locator("[class*='pageBody']");
|
||||
const fitPane = () =>
|
||||
expect.poll(() => body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await fitPane();
|
||||
|
||||
await search.fill("Reformat Code");
|
||||
const tree = settings.getByRole("tree", { name: "Actions", exact: true });
|
||||
const action = tree
|
||||
.getByRole("treeitem")
|
||||
.filter({ hasText: /Reformat Code/ })
|
||||
.first();
|
||||
await action.click();
|
||||
await settings.getByRole("button", { name: "Add Keyboard Shortcut", exact: true }).click();
|
||||
const recorder = page.getByRole("dialog", { name: /Keyboard Shortcut: Reformat Code/ });
|
||||
await recorder.getByRole("textbox", { name: "First stroke" }).press("Control+Alt+Shift+F8");
|
||||
await expect(recorder.getByText("No conflicts")).toBeVisible();
|
||||
await recorder.getByRole("button", { name: "OK", exact: true }).click();
|
||||
await expect(action.locator("kbd").filter({ hasText: "F8" })).toHaveCount(1);
|
||||
|
||||
const title = action.getByText(/Reformat Code/).first();
|
||||
await expect.poll(() => title.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
await tree.evaluate((el) => {
|
||||
el.scrollLeft = el.scrollWidth;
|
||||
});
|
||||
expect(await tree.evaluate((el) => el.scrollLeft)).toBeGreaterThan(0);
|
||||
await fitPane();
|
||||
|
||||
await settings.getByRole("button", { name: "Find Actions by Shortcut" }).click();
|
||||
await settings.getByRole("textbox", { name: "Find actions by shortcut" }).press("Control+Alt+Shift+F8");
|
||||
await expect(action).toBeVisible();
|
||||
await fitPane();
|
||||
|
||||
await settings.getByRole("button", { name: "Apply", exact: true }).click();
|
||||
await expect(settings.getByRole("button", { name: "Apply", exact: true })).toBeDisabled();
|
||||
});
|
||||
@@ -0,0 +1,50 @@
|
||||
import { expect, ipcCalls, openFromTree, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Local History gives the diff room and keeps revision selection across layouts", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1180, height: 700 });
|
||||
await openFromTree(page, "build.gradle.kts");
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(async () => {
|
||||
const file = "/dev/acme-api/build.gradle.kts";
|
||||
const entries = [
|
||||
{ id: "after", path: file, timestampMs: 2000, label: "Saved", size: 31, kind: "snapshot" },
|
||||
{ id: "before", path: file, timestampMs: 1000, label: "Original", size: 34, kind: "snapshot" },
|
||||
];
|
||||
window.__ipc.handlers.history_list_dir = () => ({ entries, deleted: [] });
|
||||
window.__ipc.handlers.history_content = ({ id }) =>
|
||||
id === "before" ? 'val reportMode = "summary"\n' : 'val reportMode = "detailed"\n';
|
||||
window.__ipc.handlers.vcs_file_mode = () => null;
|
||||
window.__ipc.handlers.fs_probe = () => ({ size: 32, binary: false, tooLarge: false });
|
||||
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("vcs.localHistory", file);
|
||||
});
|
||||
|
||||
const revisions = page.getByRole("listbox", { name: "Revisions" });
|
||||
await expect(revisions.getByRole("option", { name: /Saved/ })).toBeVisible();
|
||||
const separator = page.getByRole("separator", { name: "Revisions" });
|
||||
await expect(separator).toHaveAttribute("aria-orientation", "vertical");
|
||||
const initialWidth = (await revisions.boundingBox())!.width;
|
||||
await separator.press("ArrowLeft");
|
||||
await expect.poll(async () => (await revisions.boundingBox())!.width).toBeLessThan(initialWidth);
|
||||
|
||||
const original = revisions.getByRole("option", { name: /^Original/ });
|
||||
await original.click();
|
||||
await expect(original).toHaveAttribute("aria-selected", "true");
|
||||
await expect.poll(async () => ipcCalls(page, "history_content")).toContainEqual({ id: "before" });
|
||||
|
||||
await page.setViewportSize({ width: 480, height: 620 });
|
||||
await expect(separator).toHaveAttribute("aria-orientation", "horizontal");
|
||||
await expect(original).toHaveAttribute("aria-selected", "true");
|
||||
const diff = page.locator(".cm-mergeView").filter({ hasText: "summary" });
|
||||
await expect(diff).toBeVisible();
|
||||
const listBox = (await revisions.boundingBox())!;
|
||||
const diffBox = (await diff.boundingBox())!;
|
||||
expect(diffBox.y).toBeGreaterThanOrEqual(listBox.y + listBox.height);
|
||||
expect(diffBox.width).toBeGreaterThanOrEqual(listBox.width - 2);
|
||||
|
||||
await page.setViewportSize({ width: 1180, height: 700 });
|
||||
await expect(separator).toHaveAttribute("aria-orientation", "vertical");
|
||||
await expect(original).toHaveAttribute("aria-selected", "true");
|
||||
});
|
||||
@@ -0,0 +1,110 @@
|
||||
import type { GeneratorInfo } from "../src/bindings";
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const java: GeneratorInfo = {
|
||||
id: "java",
|
||||
name: "Java",
|
||||
group: "Java",
|
||||
icon: "project-java",
|
||||
order: 1,
|
||||
description: "A plain Java application built with Maven or Gradle.",
|
||||
git: true,
|
||||
dynamic: false,
|
||||
fields: [
|
||||
{
|
||||
id: "build",
|
||||
label: "Build system:",
|
||||
default: "maven",
|
||||
hint: "",
|
||||
visible: {},
|
||||
kind: {
|
||||
type: "choice",
|
||||
segmented: true,
|
||||
options: [
|
||||
{ value: "maven", label: "Maven" },
|
||||
{ value: "gradle", label: "Gradle" },
|
||||
],
|
||||
},
|
||||
},
|
||||
{
|
||||
id: "jdk",
|
||||
label: "JDK:",
|
||||
default: "",
|
||||
hint: "",
|
||||
visible: {},
|
||||
kind: { type: "sdk", sdk: "jdk" },
|
||||
},
|
||||
],
|
||||
};
|
||||
|
||||
const empty: GeneratorInfo = {
|
||||
...java,
|
||||
id: "empty",
|
||||
name: "Empty Project",
|
||||
group: "Project",
|
||||
description: "",
|
||||
fields: [],
|
||||
};
|
||||
|
||||
test("New Project fits the template form in a narrow window and preserves edits when resized", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await stubDesktop(page);
|
||||
await page.setViewportSize({ width: 490, height: 570 });
|
||||
await page.evaluate(
|
||||
async (catalog) => {
|
||||
const handlers = window.__ipc.handlers;
|
||||
handlers.scaffold_catalog = () => catalog;
|
||||
handlers.sdk_detect = () => [];
|
||||
handlers.scaffold_requirements = () => [];
|
||||
handlers.scaffold_create = () => new Promise(() => {});
|
||||
handlers["plugin:dialog|open"] = () => "/dev/workspaces";
|
||||
const actionsPath = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsPath);
|
||||
await executeAction("file.newProject");
|
||||
},
|
||||
[empty, java],
|
||||
);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "New Project" });
|
||||
const generators = dialog.getByRole("listbox", { name: "Generators" });
|
||||
await generators.getByRole("option", { name: "Java", exact: true }).click();
|
||||
|
||||
const form = dialog.locator("form");
|
||||
const hasNoHorizontalOverflow = (el: Element) => el.scrollWidth === el.clientWidth;
|
||||
expect(await form.evaluate(hasNoHorizontalOverflow)).toBe(true);
|
||||
await expect(dialog.getByRole("separator", { name: "Generators" })).toHaveAttribute("aria-orientation", "horizontal");
|
||||
|
||||
await dialog.getByRole("textbox", { name: "Name:" }).fill("Billing Service");
|
||||
await dialog.getByRole("button", { name: "Browse…" }).click();
|
||||
await expect(dialog.getByRole("textbox", { name: "Location:" })).toHaveValue("/dev/workspaces");
|
||||
const gradle = dialog.getByRole("button", { name: "Gradle" });
|
||||
await gradle.click();
|
||||
await expect(gradle).toHaveAttribute("aria-pressed", "true");
|
||||
|
||||
await page.setViewportSize({ width: 1040, height: 750 });
|
||||
const handle = dialog.getByRole("separator", { name: "Generators" });
|
||||
await expect(handle).toHaveAttribute("aria-orientation", "vertical");
|
||||
const originalWidth = (await generators.boundingBox())!.width;
|
||||
await handle.press("ArrowRight");
|
||||
await expect.poll(async () => (await generators.boundingBox())!.width).toBeGreaterThan(originalWidth);
|
||||
await expect(generators.getByRole("option", { name: "Java", exact: true })).toHaveAttribute("aria-selected", "true");
|
||||
await expect(dialog.getByRole("textbox", { name: "Name:" })).toHaveValue("Billing Service");
|
||||
await expect(gradle).toHaveAttribute("aria-pressed", "true");
|
||||
|
||||
await page.setViewportSize({ width: 490, height: 570 });
|
||||
await dialog.getByRole("button", { name: "Create", exact: true }).click();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "scaffold_create"))
|
||||
.toEqual([
|
||||
expect.objectContaining({
|
||||
req: {
|
||||
generator: "java",
|
||||
location: "/dev/workspaces",
|
||||
name: "Billing Service",
|
||||
git: true,
|
||||
values: { build: "gradle", jdk: "" },
|
||||
},
|
||||
}),
|
||||
]);
|
||||
});
|
||||
@@ -0,0 +1,59 @@
|
||||
import { expect, openFromTree, test } from "./fixtures";
|
||||
|
||||
test("Paste from History keeps the list and preview usable in a short dialog", async ({ workbench: page }) => {
|
||||
const editor = await openFromTree(page, "App.tsx");
|
||||
const content = editor.locator(".cm-content");
|
||||
await content.focus();
|
||||
const baseFont = Number.parseFloat(await content.evaluate((el) => getComputedStyle(el).fontSize));
|
||||
await page.evaluate(async () => {
|
||||
const source = await (await fetch("/src/editor/core/extras.ts")).text();
|
||||
const imports = [...source.matchAll(/["'](\/src\/[^"']+)["']/g)].map((match) => match[1]!);
|
||||
const activePath = (path: string) => imports.find((url) => url.split("?")[0] === path) ?? path;
|
||||
const historyPath = activePath("/src/editor/core/clipboardHistory.ts");
|
||||
const actionsPath = activePath("/src/platform/actions.ts");
|
||||
const { recordClipboard } = await import(/* @vite-ignore */ historyPath);
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsPath);
|
||||
recordClipboard("const older = 2;");
|
||||
recordClipboard("const newest = 1;\n// paste marker");
|
||||
Object.defineProperty(navigator, "clipboard", { configurable: true, value: { writeText: async () => {} } });
|
||||
for (let i = 0; i < 5; i++) await executeAction("editor.increaseFontSize");
|
||||
});
|
||||
const fontSize = `${baseFont + 5}px`;
|
||||
await expect(content).toHaveCSS("font-size", fontSize);
|
||||
await page.keyboard.press("Meta+Shift+v");
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Choose Content to Paste" });
|
||||
const divider = dialog.getByRole("separator", { name: "Resize paste preview" });
|
||||
const list = dialog.getByRole("listbox", { name: "Clipboard history" });
|
||||
const preview = dialog.getByLabel("Paste preview", { exact: true });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
await expect(list.getByText("const newest = 1;", { exact: true })).toHaveCSS("font-size", fontSize);
|
||||
await expect(preview).toHaveCSS("font-size", fontSize);
|
||||
await expect(dialog.locator(".cm-gutters")).toHaveCount(0);
|
||||
|
||||
await page.setViewportSize({ width: 420, height: 440 });
|
||||
const search = dialog.getByRole("textbox", { name: "Filter clipboard history" });
|
||||
const remove = dialog.getByRole("button", { name: "Delete" });
|
||||
await expect(search).toBeInViewport({ ratio: 1 });
|
||||
await expect(remove).toBeInViewport({ ratio: 1 });
|
||||
expect((await remove.boundingBox())!.y).toBeLessThan((await list.boundingBox())!.y);
|
||||
const previous = Number(await divider.getAttribute("aria-valuenow"));
|
||||
await divider.press("ArrowDown");
|
||||
await expect.poll(async () => Number(await divider.getAttribute("aria-valuenow"))).toBeGreaterThan(previous);
|
||||
const resized = await divider.getAttribute("aria-valuenow");
|
||||
await expect(dialog.getByRole("button", { name: "Paste" })).toBeInViewport({ ratio: 1 });
|
||||
await expect(preview).toContainText("// paste marker");
|
||||
|
||||
await search.fill("older");
|
||||
await remove.click();
|
||||
await expect(dialog.getByText("No matches", { exact: true })).toBeVisible();
|
||||
await dialog.getByRole("button", { name: "Clear", exact: true }).click();
|
||||
await expect(search).toHaveValue("");
|
||||
await search.press("Enter");
|
||||
await expect(dialog).toBeHidden();
|
||||
await expect(content).toContainText("const newest = 1;");
|
||||
|
||||
await page.keyboard.press("Meta+Shift+v");
|
||||
await expect(divider).toHaveAttribute("aria-valuenow", resized!);
|
||||
await page.keyboard.press("Escape");
|
||||
});
|
||||
@@ -0,0 +1,62 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Plugin management keeps the selected details reachable when Settings narrows", async ({ workbench: page }) => {
|
||||
const name = "ReconciliationTimelineInspectorEnterprise";
|
||||
const notes = "SettlementTimeline".repeat(18);
|
||||
await page.evaluate(
|
||||
async ({ name, notes }) => {
|
||||
const path = "/src/features/plugins/backend.ts";
|
||||
const { createMemoryPluginsBackend, setPluginsBackend } = await import(/* @vite-ignore */ path);
|
||||
const { plugins } = await createMemoryPluginsBackend().list();
|
||||
const longPlugin = { ...plugins[0], id: "settlement-inspector", name, changeNotes: notes };
|
||||
setPluginsBackend(createMemoryPluginsBackend([longPlugin, ...plugins.slice(1)]));
|
||||
},
|
||||
{ name, notes },
|
||||
);
|
||||
|
||||
await page.setViewportSize({ width: 1080, height: 760 });
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await settings.getByRole("treeitem", { name: "Plugins", exact: true }).click();
|
||||
await settings.getByRole("tab", { name: "Installed", exact: true }).click();
|
||||
|
||||
const filter = settings.getByRole("textbox", { name: "Filter plugins" });
|
||||
const list = settings.getByRole("list", { name: "Installed plugins" });
|
||||
const details = settings.getByLabel(`${name} details`);
|
||||
const heading = details.getByRole("heading", { name, exact: true });
|
||||
await expect(heading).toBeVisible();
|
||||
|
||||
const filterBox = (await filter.boundingBox())!;
|
||||
const headingBox = (await heading.boundingBox())!;
|
||||
expect(headingBox.x).toBeGreaterThan(filterBox.x + filterBox.width);
|
||||
|
||||
await page.setViewportSize({ width: 520, height: 760 });
|
||||
const body = settings.locator("[class*='pageBody']");
|
||||
await expect.poll(() => body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
const divider = settings.getByRole("separator", { name: "Resize plugin panes" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
const sources = settings.getByRole("tablist", { name: "Plugin sources" });
|
||||
await expect(sources.getByRole("tab", { name: "Marketplace" })).toBeVisible();
|
||||
await expect(sources.getByRole("tab", { name: "Installed" })).toBeVisible();
|
||||
expect(await sources.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
const before = (await divider.boundingBox())!.y;
|
||||
await divider.focus();
|
||||
await page.keyboard.press("ArrowDown");
|
||||
await expect.poll(async () => (await divider.boundingBox())!.y).toBeGreaterThan(before);
|
||||
await expect(details.getByRole("button", { name: "Disable", exact: true })).toBeVisible();
|
||||
|
||||
await details.getByRole("tab", { name: "What's New" }).click();
|
||||
await expect(details.getByText(notes, { exact: true })).toBeVisible();
|
||||
expect(await details.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
await filter.click();
|
||||
await expect(filter).toBeFocused();
|
||||
await filter.pressSequentially("Harbor");
|
||||
await list.getByRole("button", { name: /Harbor Night Theme/ }).click();
|
||||
await expect(settings.getByRole("heading", { name: "Harbor Night Theme", exact: true })).toBeVisible();
|
||||
await page.setViewportSize({ width: 1080, height: 760 });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
await expect(filter).toHaveValue("Harbor");
|
||||
await expect(settings.getByRole("heading", { name: "Harbor Night Theme", exact: true })).toBeVisible();
|
||||
});
|
||||
@@ -0,0 +1,47 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
const JDK_PATH = "/opt/jdks/corretto-21.0.8";
|
||||
const LONG_NAME = "AmazonCorretto21".repeat(6);
|
||||
|
||||
test("Project Structure SDKs keeps selection and selected details usable in a compact dialog", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await stubDesktop(page);
|
||||
await page.setViewportSize({ width: 520, height: 720 });
|
||||
await page.evaluate(
|
||||
async ({ path, name }) => {
|
||||
const sdk = { path, name, version: "21.0.8", source: "system", home: path, extra: null };
|
||||
window.__ipc.handlers.sdk_detect = ({ kind }) =>
|
||||
kind === "jdk"
|
||||
? [sdk]
|
||||
: kind === "python"
|
||||
? [{ ...sdk, path: "/usr/bin/python3", home: "/usr/bin", name: "Python 3.12", version: "3.12.2" }]
|
||||
: [];
|
||||
const actions = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actions);
|
||||
await executeAction("file.projectStructure", "sdks");
|
||||
},
|
||||
{ path: JDK_PATH, name: LONG_NAME },
|
||||
);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Project Structure" });
|
||||
const list = dialog.getByRole("listbox", { name: "SDKs" });
|
||||
const details = dialog.getByRole("region", { name: "SDK Details" });
|
||||
await expect(list.getByRole("option", { name: /Python 3.12/ })).toBeVisible();
|
||||
await expect(details.getByText(LONG_NAME, { exact: true })).toBeVisible();
|
||||
const content = dialog.locator("[class*='psDialogBody']");
|
||||
expect(await content.evaluate((el) => el.scrollWidth)).toBe(await content.evaluate((el) => el.clientWidth));
|
||||
|
||||
const path = details.getByRole("textbox", { name: "SDK home path" });
|
||||
await expect(path).toHaveValue(JDK_PATH);
|
||||
await expect(details.getByText("21.0.8", { exact: true })).toBeVisible();
|
||||
const useSdk = details.getByRole("button", { name: "Use as Project SDK" });
|
||||
await useSdk.click();
|
||||
await expect(useSdk).toBeDisabled();
|
||||
await expect(dialog.getByRole("button", { name: "Apply", exact: true })).toBeEnabled();
|
||||
|
||||
await list.getByRole("option", { name: /Python 3.12/ }).click();
|
||||
await expect(path).toHaveValue("/usr/bin/python3");
|
||||
await expect(details.getByText("3.12.2", { exact: true })).toBeVisible();
|
||||
await expect(useSdk).toHaveCount(0);
|
||||
});
|
||||
@@ -0,0 +1,86 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Pull fits the remote branch picker and keeps flags accessible in a narrow window", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 380, height: 580 });
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(async () => {
|
||||
const root = "/dev/checkout-reconciliation";
|
||||
const second = `${root}/billing-and-transaction-settlement`;
|
||||
const branch = {
|
||||
head: "main",
|
||||
upstream: "origin/main",
|
||||
headCommit: "c1",
|
||||
behind: 1,
|
||||
ahead: 0,
|
||||
operation: null,
|
||||
};
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_roots = () => [root, second].map((root) => ({ root, ...branch }));
|
||||
h.vcs_branch_info = () => branch;
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_log = () => [];
|
||||
h.vcs_remotes = () => [
|
||||
{ name: "origin", url: "/git/checkout-reconciliation.git" },
|
||||
{ name: "settlement-integration", url: "/git/settlement.git" },
|
||||
];
|
||||
h.vcs_branches = () =>
|
||||
["origin/main", "origin/release/month-end-international-settlement-reconciliation"].map((name) => ({
|
||||
name,
|
||||
commit: "c1",
|
||||
current: false,
|
||||
remote: true,
|
||||
upstream: null,
|
||||
ahead: 0,
|
||||
behind: 0,
|
||||
lastCommitMs: 0,
|
||||
}));
|
||||
h.vcs_remote = () => new Promise(() => {});
|
||||
const storeModule = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ storeModule);
|
||||
useVcs.setState({ available: true, root, repo: second, roots: [root, second], branch });
|
||||
const contextModule = "/src/platform/context.ts";
|
||||
const { setContext } = await import(/* @vite-ignore */ contextModule);
|
||||
setContext("vcsAvailable", true);
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("vcs.pull");
|
||||
});
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Pull to main" });
|
||||
const branch = dialog.getByRole("button", { name: "Remote branch" });
|
||||
await expect(branch).toHaveText("main");
|
||||
const body = dialog.locator("[data-dialog-body]");
|
||||
await expect.poll(() => branch.evaluate((el) => el.getBoundingClientRect().width)).toBeGreaterThanOrEqual(250);
|
||||
expect(await body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBe(0);
|
||||
|
||||
await branch.press("s");
|
||||
await page.getByRole("option", { name: "release/month-end-international-settlement-reconciliation" }).click();
|
||||
await expect(branch).toContainText("month-end-international-settlement-reconciliation");
|
||||
|
||||
const modify = dialog.getByRole("button", { name: "Modify options" });
|
||||
await modify.press("Enter");
|
||||
await page.getByRole("menuitemcheckbox", { name: "--ff-only" }).click();
|
||||
await expect(dialog.locator("code", { hasText: "--ff-only" })).toBeVisible();
|
||||
await modify.press("Enter");
|
||||
await expect(page.getByRole("menuitemcheckbox", { name: "--ff-only" })).toBeChecked();
|
||||
await expect(page.getByRole("menuitemcheckbox", { name: "--no-commit" })).toBeDisabled();
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(modify).toBeFocused();
|
||||
await dialog.getByRole("button", { name: "Pull", exact: true }).click();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "vcs_remote"))
|
||||
.toMatchObject([
|
||||
{
|
||||
repo: "/dev/checkout-reconciliation/billing-and-transaction-settlement",
|
||||
op: {
|
||||
op: "pullFrom",
|
||||
remote: "origin",
|
||||
branches: ["release/month-end-international-settlement-reconciliation"],
|
||||
rebase: false,
|
||||
options: { ffOnly: true },
|
||||
},
|
||||
},
|
||||
]);
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { expect, openFromTree, test } from "./fixtures";
|
||||
|
||||
test("Reformat File aligns scope and option controls and supports arrow-key scope changes", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
const editor = await openFromTree(page, "build.gradle.kts");
|
||||
await editor.locator(".cm-line").first().click();
|
||||
await page.keyboard.press("Home");
|
||||
await page.keyboard.press("Shift+End");
|
||||
await page.evaluate(async () => {
|
||||
const path = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ path);
|
||||
await executeAction("code.reformatDialog");
|
||||
});
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: /Reformat File/ });
|
||||
const scope = dialog.getByRole("group", { name: "Scope" });
|
||||
const selected = scope.getByRole("radio", { name: "Selected text" });
|
||||
await expect(selected).toBeChecked();
|
||||
await expect(scope.getByRole("radio").first()).toHaveAccessibleName("Selected text");
|
||||
await selected.press("ArrowDown");
|
||||
await expect(scope.getByRole("radio", { name: "Whole file" })).toBeChecked();
|
||||
|
||||
const optimize = dialog.getByRole("group", { name: "Options" }).getByRole("checkbox", { name: "Optimize imports" });
|
||||
expect((await selected.boundingBox())!.x).toBeCloseTo((await optimize.boundingBox())!.x, 0);
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
|
||||
test("Reformat Code keeps long targets and the file mask usable in a narrow window", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 340, height: 460 });
|
||||
const target = "InternationalSettlementReconciliation".repeat(4);
|
||||
await page.evaluate(async (target) => {
|
||||
const path = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ path);
|
||||
await executeAction("code.reformatFiles", { directories: [`/dev/acme-api/${target}`] });
|
||||
}, target);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Reformat Code", exact: true });
|
||||
await expect(dialog.getByText(target, { exact: true })).toBeVisible();
|
||||
const body = dialog.locator("[data-dialog-body]");
|
||||
expect(await body.evaluate((el) => el.scrollWidth)).toBe(await body.evaluate((el) => el.clientWidth));
|
||||
|
||||
await expect(
|
||||
dialog.getByRole("group", { name: "Options" }).getByRole("checkbox", { name: "Include subdirectories" }),
|
||||
).toBeChecked();
|
||||
const filters = dialog.getByRole("group", { name: "Filters" });
|
||||
const mask = filters.getByRole("textbox", { name: "File mask" });
|
||||
await expect(mask).toBeDisabled();
|
||||
await filters.getByText("File mask:", { exact: true }).click();
|
||||
await mask.fill("*.java");
|
||||
await expect(mask).toHaveValue("*.java");
|
||||
await dialog.getByRole("button", { name: "Cancel" }).click();
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
@@ -159,3 +159,86 @@ test("Find in Files streams matches by file and opens the chosen one at its line
|
||||
}, `Editor for ${ROOT}/build.gradle.kts`);
|
||||
await expect.poll(caretLine).toBe("import com.acme.orders.service.OrderService");
|
||||
});
|
||||
|
||||
test("the Find tool window keeps the selected preview and replacement actions when narrowed", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 1500, height: 820 });
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
({ path, relPath }) => {
|
||||
window.__ipc.handlers.search_validate = () => null;
|
||||
window.__ipc.handlers.search_start = ({ query, onEvent }) => {
|
||||
if ((query as SearchQuery).pattern !== "OrderService") return null;
|
||||
setTimeout(() => {
|
||||
window.__ipc.send(onEvent, {
|
||||
type: "file",
|
||||
file: {
|
||||
path,
|
||||
relPath,
|
||||
matches: [
|
||||
{
|
||||
line: 2,
|
||||
text: "import com.acme.orders.service.OrderService",
|
||||
ranges: [[31, 43]],
|
||||
textOffset: 0,
|
||||
},
|
||||
],
|
||||
},
|
||||
});
|
||||
window.__ipc.send(onEvent, {
|
||||
type: "done",
|
||||
summary: { files: 1, matches: 1, limitHit: false, cancelled: false, elapsedMs: 1 },
|
||||
});
|
||||
}, 20);
|
||||
return null;
|
||||
};
|
||||
},
|
||||
{ path: `${ROOT}/build.gradle.kts`, relPath: "build.gradle.kts" },
|
||||
);
|
||||
await page.keyboard.press("Meta+Shift+r");
|
||||
const popup = page.getByRole("dialog", { name: "Replace in Files" });
|
||||
await popup.getByRole("textbox", { name: "Text to find" }).fill("OrderService");
|
||||
await popup.getByRole("textbox", { name: "Replace with" }).fill("OrdersApi");
|
||||
await expect(popup.getByRole("listbox", { name: "Matches" }).getByRole("option")).toHaveCount(1);
|
||||
await popup.getByRole("button", { name: "Open in Find Window", exact: true }).click();
|
||||
|
||||
const find = page.getByRole("region", { name: "Find", exact: true });
|
||||
await find.getByRole("button", { name: "Options", exact: true }).click();
|
||||
await page.getByRole("menuitem", { name: "Move To", exact: true }).hover();
|
||||
await page.getByRole("menuitem", { name: "Right Top", exact: true }).click();
|
||||
|
||||
const dockDivider = page.getByRole("separator", { name: "Resize right tool window", exact: true });
|
||||
const resizeDock = async (width: number) => {
|
||||
await expect(dockDivider).toBeVisible();
|
||||
const handle = (await dockDivider.boundingBox())!;
|
||||
const dock = (await find.boundingBox())!;
|
||||
const x = handle.x + handle.width / 2;
|
||||
const y = handle.y + handle.height / 2;
|
||||
await page.mouse.move(x, y);
|
||||
await page.mouse.down();
|
||||
await page.mouse.move(x + dock.width - width, y, { steps: 5 });
|
||||
await page.mouse.up();
|
||||
};
|
||||
await resizeDock(690);
|
||||
const row = find.getByRole("treeitem", { name: /OrderService.*OrdersApi/ });
|
||||
await row.click();
|
||||
const preview = find.getByRole("region", { name: "Preview", exact: true });
|
||||
await expect(preview.locator(".cm-content")).toContainText("OrderService");
|
||||
const divider = find.getByRole("separator", { name: "Resize find preview" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
|
||||
await resizeDock(325);
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
await expect(row).toHaveAttribute("aria-selected", "true");
|
||||
await expect(preview.locator(".cm-content")).toContainText("OrderService");
|
||||
await expect(find.getByRole("toolbar", { name: "Find actions" })).toHaveAttribute("aria-orientation", "vertical");
|
||||
for (const label of ["Preview", "Replace Selected", "Replace All"]) {
|
||||
await expect(find.getByRole("button", { name: label, exact: true })).toBeInViewport({ ratio: 1 });
|
||||
}
|
||||
await find.getByRole("button", { name: "Replace All", exact: true }).click();
|
||||
const confirmation = page.getByRole("dialog", { name: "Replace All" });
|
||||
await expect(confirmation).toBeVisible();
|
||||
await confirmation.getByRole("button", { name: "Cancel" }).click();
|
||||
await expect(confirmation).toBeHidden();
|
||||
});
|
||||
@@ -80,6 +80,29 @@ test("⌘, opens Settings with the page tree; Escape closes", async ({ workbench
|
||||
await expect(dialog).toBeHidden();
|
||||
});
|
||||
|
||||
test("editor appearance groups related controls and keeps whitespace options editable", async ({ workbench: page }) => {
|
||||
await page.keyboard.press("Meta+,");
|
||||
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
|
||||
await settings.getByRole("textbox", { name: "Search settings" }).fill("Show whitespaces");
|
||||
await settings.getByRole("treeitem", { name: "Appearance", exact: true }).click();
|
||||
const section = (name: string) => settings.getByRole("region", { name, exact: true });
|
||||
|
||||
await expect(section("Caret").getByRole("checkbox", { name: "Use block caret" })).toBeVisible();
|
||||
await expect(section("Code Structure").getByRole("checkbox", { name: "Show line numbers" })).toBeVisible();
|
||||
await expect(section("Code Assistance").getByRole("checkbox", { name: "Show intention bulb" })).toBeVisible();
|
||||
const presentation = section("Presentation");
|
||||
await expect(presentation.getByRole("checkbox", { name: "Render documentation comments" })).toBeVisible();
|
||||
await expect(presentation.getByRole("textbox", { name: "Distraction free mode text width:" })).toBeVisible();
|
||||
const whitespace = presentation.getByRole("checkbox", { name: "Show whitespaces" });
|
||||
const leading = presentation.getByRole("checkbox", { name: "Leading", exact: true });
|
||||
if (await whitespace.isChecked()) await whitespace.uncheck();
|
||||
await expect(leading).toBeDisabled();
|
||||
await whitespace.check();
|
||||
await expect(leading).toBeEnabled();
|
||||
await settings.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
await expect(settings).toBeHidden();
|
||||
});
|
||||
|
||||
test("Language Servers page installs a tool with progress (in-memory installer)", async ({ workbench: page }) => {
|
||||
await page.keyboard.press("Meta+,");
|
||||
const dialog = page.getByRole("dialog", { name: "Settings" });
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
import { expect, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Shelf keeps patch and file selection available in a narrow dock", async ({ workbench: page }) => {
|
||||
const name = "Reconcile payment and settlement totals before exporting ledger reports";
|
||||
const directory = "services/settlement/internal/payment-reconciliation/statement-generation";
|
||||
const filename = "invoiceSettlementRowAssembler.ts";
|
||||
const file = directory + "/" + filename;
|
||||
await page.setViewportSize({ width: 1440, height: 760 });
|
||||
await stubDesktop(page);
|
||||
await page.evaluate(
|
||||
async ({ name, file }) => {
|
||||
const root = "/dev/acme-api";
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_roots = () => [{ root, operation: null, head: "main", headCommit: "1111111" }];
|
||||
h.vcs_branch_info = () => ({
|
||||
head: "main",
|
||||
headCommit: "1111111",
|
||||
upstream: null,
|
||||
ahead: 0,
|
||||
behind: 0,
|
||||
operation: null,
|
||||
});
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_shelves = () => [
|
||||
{
|
||||
id: "settlement",
|
||||
name,
|
||||
timeMs: null,
|
||||
branch: "main",
|
||||
files: [file, "README.md"].map((path) => ({ path, kind: "modified", oldPath: null })),
|
||||
},
|
||||
{
|
||||
id: "docs",
|
||||
name: "Update release notes",
|
||||
timeMs: null,
|
||||
branch: "main",
|
||||
files: [{ path: "CHANGELOG.md", kind: "modified", oldPath: null }],
|
||||
},
|
||||
];
|
||||
h.vcs_shelf_diff = () => [];
|
||||
const vcs = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ vcs);
|
||||
useVcs.setState({ root, repo: root, roots: [root], available: true });
|
||||
const project = "/src/platform/project.ts";
|
||||
const { useProject } = await import(/* @vite-ignore */ project);
|
||||
const settings = useProject.getState().settings ?? {};
|
||||
useProject.setState({ settings: { ...settings, vcs: { ...settings.vcs, commit: { nonModal: true } } } });
|
||||
const context = "/src/platform/context.ts";
|
||||
(await import(/* @vite-ignore */ context)).setContext("vcsAvailable", true);
|
||||
const dock = "/src/workbench/toolwindows/store.ts";
|
||||
(await import(/* @vite-ignore */ dock)).setToolWindowSize("left", 228);
|
||||
const actions = "/src/platform/actions.ts";
|
||||
await (await import(/* @vite-ignore */ actions)).executeAction("vcs.showShelf");
|
||||
},
|
||||
{ name, file },
|
||||
);
|
||||
|
||||
const panel = page.locator("[data-shelf-panel]");
|
||||
const patches = panel.getByRole("tree", { name: "Shelved changes" });
|
||||
const patch = patches.getByRole("treeitem").filter({ hasText: name });
|
||||
await patch.click({ position: { x: 90, y: 12 } });
|
||||
if ((await patch.getAttribute("aria-expanded")) === "false") await page.keyboard.press("ArrowRight");
|
||||
const location = panel.getByText(directory, { exact: true });
|
||||
await expect.poll(() => location.evaluate((el) => el.clientWidth)).toBeGreaterThan(100);
|
||||
|
||||
const divider = panel.getByRole("separator", { name: "Resize shelf panes" });
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
|
||||
const files = panel.getByRole("tree", { name: "Shelved files" });
|
||||
await expect(files.getByRole("treeitem")).toHaveCount(2);
|
||||
const pathBox = (await location.boundingBox())!;
|
||||
const filesBox = (await files.boundingBox())!;
|
||||
expect(pathBox.x).toBeLessThan(filesBox.x + filesBox.width - 50);
|
||||
const row = files.getByRole("treeitem").filter({ hasText: filename });
|
||||
await row.click({ position: { x: 90, y: 12 } });
|
||||
await expect(row).toHaveAttribute("aria-selected", "true");
|
||||
await panel.getByRole("button", { name: "Unshelve…", exact: true }).click();
|
||||
const dialog = page.getByRole("dialog", { name: "Unshelve Changes" });
|
||||
await expect(
|
||||
dialog.getByRole("tree", { name: "Files to unshelve" }).getByText(filename, { exact: true }),
|
||||
).toBeVisible();
|
||||
await expect(dialog.getByText("README.md", { exact: true })).toHaveCount(0);
|
||||
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
|
||||
|
||||
await page.evaluate(async () => {
|
||||
const dock = "/src/workbench/toolwindows/store.ts";
|
||||
(await import(/* @vite-ignore */ dock)).setToolWindowSize("left", 640);
|
||||
});
|
||||
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
|
||||
await expect(row).toHaveAttribute("aria-selected", "true");
|
||||
await patches.getByRole("treeitem").filter({ hasText: "Update release notes" }).click();
|
||||
await expect(files.getByRole("treeitem")).toHaveCount(1);
|
||||
await expect(files.getByText("CHANGELOG.md", { exact: true })).toBeVisible();
|
||||
});
|
||||
@@ -0,0 +1,60 @@
|
||||
import { expect, ipcCalls, stubDesktop, test } from "./fixtures";
|
||||
|
||||
test("Stash wraps the current branch and accepts a multiline message in a narrow window", async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await page.setViewportSize({ width: 380, height: 590 });
|
||||
await stubDesktop(page);
|
||||
const root = "/dev/settlement-engine";
|
||||
const head = "release/QuarterlyInternationalSettlementReconciliationAndAuthorizationForMerchantOperations";
|
||||
await page.evaluate(
|
||||
async ({ root, head }) => {
|
||||
const branch = { head, headCommit: "c1", upstream: null, ahead: 0, behind: 0, operation: null };
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_branch_info = () => branch;
|
||||
h.vcs_roots = () => [{ root, ...branch }];
|
||||
h.vcs_status = () => [];
|
||||
h.vcs_stashes = () => [];
|
||||
h.vcs_stash_push = () => null;
|
||||
const storeModule = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ storeModule);
|
||||
useVcs.setState({ available: true, root, repo: root, roots: [root], branch });
|
||||
const contextModule = "/src/platform/context.ts";
|
||||
const { setContext } = await import(/* @vite-ignore */ contextModule);
|
||||
setContext("vcsAvailable", true);
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("vcs.stash");
|
||||
},
|
||||
{ root, head },
|
||||
);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Stash", exact: true });
|
||||
await expect(dialog.getByText(`Current branch: ${head}`)).toBeVisible();
|
||||
const body = dialog.locator("[data-dialog-body]");
|
||||
expect(await body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBe(0);
|
||||
const message = dialog.getByRole("textbox", { name: "Message", exact: true });
|
||||
await expect(message).toBeFocused();
|
||||
await message.fill("Set aside settlement work");
|
||||
await message.press("End");
|
||||
await message.press("Enter");
|
||||
await expect(message).toHaveValue("Set aside settlement work\n");
|
||||
await message.pressSequentially("Continue after the release.");
|
||||
expect(await ipcCalls(page, "vcs_stash_push")).toEqual([]);
|
||||
|
||||
await dialog.getByRole("checkbox", { name: "Keep index" }).check();
|
||||
await dialog.getByRole("checkbox", { name: "Include untracked files" }).check();
|
||||
await message.press("Control+Enter");
|
||||
await expect(dialog).toBeHidden();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "vcs_stash_push"))
|
||||
.toEqual([
|
||||
{
|
||||
repo: root,
|
||||
message: "Set aside settlement work\nContinue after the release.",
|
||||
keepIndex: true,
|
||||
includeUntracked: true,
|
||||
paths: null,
|
||||
},
|
||||
]);
|
||||
});
|
||||
@@ -0,0 +1,65 @@
|
||||
import { expect, openFromTree, test } from "./fixtures";
|
||||
|
||||
test("Switcher keeps the open file list and path visible in a narrow workbench", async ({ workbench: page }) => {
|
||||
await openFromTree(page, "README.md");
|
||||
await openFromTree(page, "App.tsx");
|
||||
await page.keyboard.down("Control");
|
||||
await page.keyboard.press("Tab");
|
||||
|
||||
const switcher = page.getByRole("dialog", { name: "Switcher", exact: true });
|
||||
const files = switcher.getByRole("listbox", { name: "Open files" });
|
||||
const tools = switcher.getByRole("listbox", { name: "Tool windows" });
|
||||
const selected = files.getByRole("option", { selected: true });
|
||||
await expect(selected).toHaveText("README.md");
|
||||
expect((await switcher.boundingBox())!.width).toBeLessThan(600);
|
||||
|
||||
await page.setViewportSize({ width: 400, height: 500 });
|
||||
await expect.poll(async () => (await files.boundingBox())!.width).toBeGreaterThan(225);
|
||||
const footer = switcher.locator("footer");
|
||||
await expect(footer).toHaveText(/README\.md$/);
|
||||
await expect(footer).toBeInViewport({ ratio: 1 });
|
||||
await expect(footer).toHaveCSS("font-size", "12px");
|
||||
expect(await tools.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
expect(await files.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
const structure = tools.getByText("Structure", { exact: true });
|
||||
expect(await structure.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
await page.keyboard.press("Tab");
|
||||
const activeTool = tools.getByRole("option", { selected: true });
|
||||
await expect(activeTool).toBeInViewport({ ratio: 1 });
|
||||
const firstTool = await activeTool.getAttribute("aria-posinset");
|
||||
await page.keyboard.press("PageDown");
|
||||
await page.keyboard.press("PageDown");
|
||||
await expect(activeTool).not.toHaveAttribute("aria-posinset", firstTool!);
|
||||
await expect(activeTool).toBeInViewport({ ratio: 0.98 });
|
||||
expect(await tools.evaluate((el) => el.scrollTop)).toBeGreaterThan(0);
|
||||
await page.keyboard.press("Shift+Tab");
|
||||
await expect(selected).toHaveText("README.md");
|
||||
await page.keyboard.up("Control");
|
||||
|
||||
await expect(switcher).toBeHidden();
|
||||
await expect(page.getByRole("tab", { name: "README.md", exact: true })).toHaveAttribute("aria-selected", "true");
|
||||
});
|
||||
|
||||
test("Switcher takes up less space when both lists have only a few entries", async ({ workbench: page }) => {
|
||||
await openFromTree(page, "README.md");
|
||||
await openFromTree(page, "App.tsx");
|
||||
await page.evaluate(async () => {
|
||||
const path = "/src/workbench/contributions.ts";
|
||||
const { useContributions } = (await import(
|
||||
/* @vite-ignore */ path
|
||||
)) as typeof import("../src/workbench/contributions");
|
||||
useContributions.setState(({ toolWindows }) => ({
|
||||
toolWindows: new Map([...toolWindows].filter(([id]) => id === "project" || id === "terminal")),
|
||||
}));
|
||||
});
|
||||
await page.keyboard.down("Control");
|
||||
await page.keyboard.press("Tab");
|
||||
const switcher = page.getByRole("dialog", { name: "Switcher", exact: true });
|
||||
const tools = switcher.getByRole("listbox", { name: "Tool windows" });
|
||||
await expect(tools.getByRole("option")).toHaveCount(2);
|
||||
await expect.poll(async () => (await switcher.boundingBox())!.height).toBeLessThan(380);
|
||||
await expect(switcher.locator("footer")).toHaveText(/README\.md$/);
|
||||
await page.keyboard.press("Escape");
|
||||
await page.keyboard.up("Control");
|
||||
});
|
||||
@@ -71,3 +71,57 @@ test("shows Update failures from the branch menu even when VCS notifications are
|
||||
await expect(page.getByText(/untracked working tree files would be overwritten by merge/)).toBeVisible();
|
||||
expect(await ipcCalls(page, "vcs_remote")).toHaveLength(1);
|
||||
});
|
||||
|
||||
test("Update Project wraps long tracking branches and keeps its options reachable", async ({ workbench: page }) => {
|
||||
await stubDesktop(page);
|
||||
await page.setViewportSize({ width: 360, height: 580 });
|
||||
const local = "release/" + "InternationalSettlementReconciliation".repeat(3);
|
||||
await page.evaluate(async (head) => {
|
||||
const root = "/dev/acme-api";
|
||||
const branch = { head, upstream: `origin/${head}`, behind: 1, ahead: 1, operation: null, headCommit: "c1" };
|
||||
const h = window.__ipc.handlers;
|
||||
h.vcs_branch_info = () => branch;
|
||||
h.vcs_roots = () => [{ root, head, headCommit: "c1", operation: null }];
|
||||
h.settings_set = () => null;
|
||||
h.vcs_remote = () => new Promise(() => {});
|
||||
const storeModule = "/src/features/vcs/store.ts";
|
||||
const { useVcs } = await import(/* @vite-ignore */ storeModule);
|
||||
useVcs.setState({ available: true, root, repo: root, roots: [root], branch });
|
||||
const contextModule = "/src/platform/context.ts";
|
||||
const { setContext } = await import(/* @vite-ignore */ contextModule);
|
||||
setContext("vcsAvailable", true);
|
||||
const actionsModule = "/src/platform/actions.ts";
|
||||
const { executeAction } = await import(/* @vite-ignore */ actionsModule);
|
||||
await executeAction("vcs.update");
|
||||
}, local);
|
||||
|
||||
const dialog = page.getByRole("dialog", { name: "Update Project", exact: true });
|
||||
await expect(dialog.getByText(`Update ${local} from origin/${local} (1 incoming)`)).toBeVisible();
|
||||
const body = dialog.locator("[data-dialog-body]");
|
||||
const width = await body.evaluate((el) => ({ scroll: el.scrollWidth, available: el.clientWidth }));
|
||||
expect(width.scroll).toBe(width.available);
|
||||
|
||||
const reset = dialog.getByRole("button", { name: "Reset to the Remote Branch" });
|
||||
await expect(reset).toBeVisible();
|
||||
expect(
|
||||
await reset.evaluate(
|
||||
(el) => el.getBoundingClientRect().right <= el.closest('[role="dialog"]')!.getBoundingClientRect().right,
|
||||
),
|
||||
).toBe(true);
|
||||
const merge = dialog.getByRole("radio", { name: /^Merge incoming changes/ });
|
||||
const rebase = dialog.getByRole("radio", { name: /^Rebase the current branch/ });
|
||||
await expect(merge).toBeChecked();
|
||||
await merge.press("ArrowDown");
|
||||
await expect(rebase).toBeChecked();
|
||||
await dialog.getByRole("checkbox", { name: "Don't show again" }).check();
|
||||
await dialog.getByRole("button", { name: "OK", exact: true }).click();
|
||||
await expect
|
||||
.poll(() => ipcCalls(page, "vcs_remote"))
|
||||
.toEqual([expect.objectContaining({ op: { op: "pull", rebase: true } })]);
|
||||
expect(await ipcCalls(page, "settings_set")).toEqual(
|
||||
expect.arrayContaining([
|
||||
expect.objectContaining({ key: "vcs.git.updateMethod", value: '"rebase"' }),
|
||||
expect.objectContaining({ key: "vcs.confirmation.showUpdateOptions", value: "false" }),
|
||||
]),
|
||||
);
|
||||
});
|
||||
@@ -0,0 +1,42 @@
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
test("Welcome keeps project search and actions on one row at a narrow width", async ({ workbench: page }) => {
|
||||
await page.setViewportSize({ width: 1080, height: 700 });
|
||||
await page.evaluate(async () => {
|
||||
const projectPath = "/src/platform/project.ts";
|
||||
const { useProject } = await import(/* @vite-ignore */ projectPath);
|
||||
useProject.setState({ project: null, lightEdit: false });
|
||||
});
|
||||
|
||||
const projects = page.getByRole("region", { name: "Projects", exact: true });
|
||||
const search = projects.getByRole("textbox", { name: "Search projects" });
|
||||
const list = projects.getByRole("listbox", { name: "Recent projects" });
|
||||
const more = projects.getByRole("button", { name: "More Actions", exact: true });
|
||||
const open = projects.getByRole("button", { name: "Open", exact: true });
|
||||
await expect(list.getByRole("option")).toHaveCount(4);
|
||||
await expect(more).toBeVisible();
|
||||
await expect(open).toHaveText("Open");
|
||||
|
||||
await page.setViewportSize({ width: 440, height: 620 });
|
||||
const boxes = await Promise.all([search.boundingBox(), open.boundingBox(), more.boundingBox()]);
|
||||
expect(boxes[0]!.width).toBeGreaterThan(95);
|
||||
for (const box of boxes.slice(1)) {
|
||||
expect(Math.abs(box!.y + box!.height / 2 - (boxes[0]!.y + boxes[0]!.height / 2))).toBeLessThan(2);
|
||||
expect(box!.x + box!.width).toBeLessThanOrEqual(440);
|
||||
}
|
||||
await expect(open.getByText("Open", { exact: true })).toBeHidden();
|
||||
await expect.poll(() => projects.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
|
||||
|
||||
await search.fill("tokio");
|
||||
await expect(list.getByRole("option")).toHaveCount(1);
|
||||
await expect(list.getByRole("option")).toContainText("tokio");
|
||||
await more.press("Enter");
|
||||
const menu = page.getByRole("menu", { name: "More Actions" });
|
||||
for (const label of ["New File", "Open File", "Remote Development"]) {
|
||||
await expect(menu.getByRole("menuitem", { name: new RegExp(label) })).toBeVisible();
|
||||
}
|
||||
await page.keyboard.press("Escape");
|
||||
await expect(menu).toBeHidden();
|
||||
await expect(more).toBeFocused();
|
||||
await expect(search).toHaveValue("tokio");
|
||||
});
|
||||
Бінарний файл не відображається.
@@ -120,6 +120,17 @@ public final class OpenIdeaJdbc {
|
||||
n++;
|
||||
}
|
||||
}
|
||||
} else if (op.equals("schemaColumns")) {
|
||||
// Every column of the namespace in one call (SQL completion), without primary keys.
|
||||
header(out, "table", "name", "type", "nullable", "default");
|
||||
try (ResultSet rs = m.getColumns(catalog, schema, "%", "%")) {
|
||||
int n = 0;
|
||||
while (rs.next() && n < 100000) {
|
||||
row(out, rs.getString("TABLE_NAME"), rs.getString("COLUMN_NAME"), rs.getString("TYPE_NAME"),
|
||||
rs.getInt("NULLABLE") == 0 ? "0" : "1", rs.getString("COLUMN_DEF"));
|
||||
n++;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
header(out, "name", "type", "nullable", "default", "primary");
|
||||
String table = a.get(1);
|
||||
@@ -233,7 +244,7 @@ public final class OpenIdeaJdbc {
|
||||
switch (op) {
|
||||
case "open" -> open(a, reply);
|
||||
case "schemas" -> schemas(reply);
|
||||
case "tables", "columns" -> metadata(op, a, reply);
|
||||
case "tables", "columns", "schemaColumns" -> metadata(op, a, reply);
|
||||
case "namespace" -> {
|
||||
header(reply, "namespace");
|
||||
String name = null;
|
||||
@@ -243,6 +254,20 @@ public final class OpenIdeaJdbc {
|
||||
} catch (SQLException | AbstractMethodError ignored) {}
|
||||
row(reply, name);
|
||||
}
|
||||
case "valid" -> {
|
||||
// After a failed statement: whether the session survived (a dropped TCP
|
||||
// connection leaves every later statement failing until the IDE reconnects).
|
||||
header(reply, "valid");
|
||||
boolean valid;
|
||||
try {
|
||||
valid = connection != null && !connection.isClosed() && connection.isValid(5);
|
||||
} catch (AbstractMethodError | SQLFeatureNotSupportedException e) {
|
||||
valid = true; // A pre-JDBC 4 driver cannot tell: keep the session.
|
||||
} catch (SQLException e) {
|
||||
valid = false;
|
||||
}
|
||||
row(reply, Boolean.toString(valid));
|
||||
}
|
||||
case "page" -> execute(work, a, reply, true);
|
||||
case "query" -> {
|
||||
if (a.size() == 3 || a.get(3).isEmpty()) {
|
||||
|
||||
@@ -14,6 +14,7 @@ import java.util.logging.Logger;
|
||||
public class SelfTest {
|
||||
public static class Fixture implements Driver {
|
||||
private boolean readonly;
|
||||
private boolean dropped;
|
||||
private int changes;
|
||||
private Path started;
|
||||
|
||||
@@ -29,6 +30,12 @@ public class SelfTest {
|
||||
case "getDatabaseProductName" -> "Fixture";
|
||||
case "getDatabaseProductVersion" -> "1";
|
||||
case "getIdentifierQuoteString" -> "\"";
|
||||
case "getSearchStringEscape" -> "\\";
|
||||
case "getSchemas" -> rows(List.of(Map.of("TABLE_SCHEM", "app")));
|
||||
case "getColumns" -> "app".equals(a[1]) && "%".equals(a[2]) ? rows(List.of(
|
||||
Map.of("TABLE_NAME", "orders", "COLUMN_NAME", "id", "TYPE_NAME", "INT", "NULLABLE", 0),
|
||||
Map.of("TABLE_NAME", "orders", "COLUMN_NAME", "note", "TYPE_NAME", "VARCHAR", "NULLABLE", 1,
|
||||
"COLUMN_DEF", "'none'"))) : rows(List.of());
|
||||
default -> throw new SQLFeatureNotSupportedException();
|
||||
});
|
||||
return proxy(Connection.class, (p, m, a) -> switch (m.getName()) {
|
||||
@@ -36,6 +43,21 @@ public class SelfTest {
|
||||
case "getMetaData" -> meta;
|
||||
case "close" -> null;
|
||||
case "createStatement" -> statement();
|
||||
case "isClosed" -> false;
|
||||
case "isValid" -> !dropped;
|
||||
case "getCatalog" -> null;
|
||||
default -> throw new SQLFeatureNotSupportedException();
|
||||
});
|
||||
}
|
||||
|
||||
/** A forward-only result set over `data`, read by column label. */
|
||||
static ResultSet rows(List<Map<String, Object>> data) {
|
||||
int[] at = {-1};
|
||||
return proxy(ResultSet.class, (p, m, a) -> switch (m.getName()) {
|
||||
case "next" -> ++at[0] < data.size();
|
||||
case "getString" -> (String) data.get(at[0]).get((String) a[0]);
|
||||
case "getInt" -> (Integer) data.get(at[0]).getOrDefault((String) a[0], 0);
|
||||
case "close" -> null;
|
||||
default -> throw new SQLFeatureNotSupportedException();
|
||||
});
|
||||
}
|
||||
@@ -53,6 +75,7 @@ public class SelfTest {
|
||||
throw new SQLException("statement cancelled");
|
||||
}
|
||||
if (sql.equals("write") && readonly) throw new SQLException("read-only");
|
||||
if (sql.equals("drop")) { dropped = true; throw new SQLException("connection reset"); }
|
||||
changes++;
|
||||
yield false;
|
||||
}
|
||||
@@ -122,6 +145,15 @@ public class SelfTest {
|
||||
send(out, 5, "query", "after cancel", "0", "2");
|
||||
var result = reply(in);
|
||||
assert result[0] == 1 && result[result.length - 1] == 2;
|
||||
send(out, 6, "valid");
|
||||
assert new String(reply(in), StandardCharsets.UTF_8).contains("true");
|
||||
send(out, 7, "query", "drop", "0", "2");
|
||||
assert reply(in)[0] == 0;
|
||||
send(out, 8, "valid");
|
||||
assert new String(reply(in), StandardCharsets.UTF_8).contains("false");
|
||||
send(out, 9, "schemaColumns", "app");
|
||||
var columns = new String(reply(in), StandardCharsets.UTF_8);
|
||||
assert columns.contains("orders") && columns.contains("note") && columns.contains("'none'") : columns;
|
||||
} finally {
|
||||
child.destroyForcibly().waitFor();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
diff --git a/dist/index.cjs b/dist/index.cjs
|
||||
index b20aa9d84be6ff4b85b126bdd930065277668a26..e677ab06ca9668407e202979e14b75ab7641d6b1 100644
|
||||
--- a/dist/index.cjs
|
||||
+++ b/dist/index.cjs
|
||||
@@ -9675,7 +9675,9 @@ const hideNativeSelection = state.Prec.highest(EditorView.theme({
|
||||
"& :focus": {
|
||||
caretColor: "initial !important",
|
||||
...drawMainRange ? {
|
||||
- "&::selection, & ::selection": {
|
||||
+ // Not `& ::selection` too: a pseudo-class with a universal descendant restyles the
|
||||
+ // whole subtree of every element that gains or loses focus.
|
||||
+ "&::selection": {
|
||||
backgroundColor: "Highlight !important"
|
||||
}
|
||||
} : {}
|
||||
diff --git a/dist/index.js b/dist/index.js
|
||||
index 216f754db06f65f7f17f056b47d8f6fab45067bf..22282993239d836ea1da19af10ccfc61b6480cc5 100644
|
||||
--- a/dist/index.js
|
||||
+++ b/dist/index.js
|
||||
@@ -9670,7 +9670,9 @@ const hideNativeSelection = /*@__PURE__*/Prec.highest(/*@__PURE__*/EditorView.th
|
||||
"& :focus": {
|
||||
caretColor: "initial !important",
|
||||
...drawMainRange ? {
|
||||
- "&::selection, & ::selection": {
|
||||
+ // Not `& ::selection` too: a pseudo-class with a universal descendant restyles the
|
||||
+ // whole subtree of every element that gains or loses focus.
|
||||
+ "&::selection": {
|
||||
backgroundColor: "Highlight !important"
|
||||
}
|
||||
} : {}
|
||||
+34
-25
@@ -323,6 +323,18 @@ const scroll: Scenario = {
|
||||
},
|
||||
};
|
||||
|
||||
/**
|
||||
* Runs an action without a default shortcut from a key press: the press is the measured input,
|
||||
* and the action runs in its handler, as from a key binding. Pause is bound to nothing.
|
||||
*/
|
||||
async function runActionOnKey(h: Harness, id: string) {
|
||||
await h.page.evaluate((id) => {
|
||||
const probe = (window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf;
|
||||
addEventListener("keydown", () => void probe.runAction(id), { capture: true, once: true });
|
||||
}, id);
|
||||
await h.page.keyboard.press("Pause");
|
||||
}
|
||||
|
||||
/**
|
||||
* Git Log with 20,000 commits on branching lanes, loaded page by page as the
|
||||
* backend does (150 ms a page, like `git log`): showing it, walking the
|
||||
@@ -339,12 +351,7 @@ const gitLog: Scenario = {
|
||||
).__openideaPerf.fakeGitLog(20_000, 150),
|
||||
);
|
||||
const showMs = await h.measure(
|
||||
() =>
|
||||
h.page.evaluate(() =>
|
||||
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
|
||||
"vcs.showLog",
|
||||
),
|
||||
),
|
||||
() => runActionOnKey(h, "vcs.showLog"),
|
||||
'[role="listbox"][aria-label="Commits"]',
|
||||
"order flow step 0",
|
||||
);
|
||||
@@ -430,16 +437,13 @@ const resizePanels: Scenario = {
|
||||
await h.page.evaluate(() =>
|
||||
(window as never as { __openideaPerf: { fakeGitLog(n: number): void } }).__openideaPerf.fakeGitLog(2_000),
|
||||
);
|
||||
await h.measure(
|
||||
() =>
|
||||
h.page.evaluate(() =>
|
||||
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
|
||||
"vcs.showLog",
|
||||
),
|
||||
),
|
||||
'[role="listbox"][aria-label="Commits"]',
|
||||
"order flow step 0",
|
||||
await h.page.evaluate(() =>
|
||||
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
|
||||
"vcs.showLog",
|
||||
),
|
||||
);
|
||||
// Set-up, not measured: the splitters are dragged once the log is shown.
|
||||
await h.inPage((p) => p.waitShown('[role="listbox"][aria-label="Commits"]', "order flow step 0", 10_000));
|
||||
const refresh = await h.refreshMs();
|
||||
const drag = async (name: string, dx: number, dy: number) => {
|
||||
const box = (await h.page.getByRole("separator", { name }).boundingBox())!;
|
||||
@@ -560,7 +564,9 @@ const agentTabs: Scenario = {
|
||||
window as never as { __openideaPerf: { runAction(id: string, arg?: unknown): Promise<boolean> } }
|
||||
).__openideaPerf.runAction("agents.openSampleConversations", { tasks: 2, turns: 150 }),
|
||||
);
|
||||
const shown = (n: number) => `[data-editor-focus] span[title="Sample task ${n}"]`;
|
||||
// The conversation shown: its requests end with its task's title.
|
||||
const SHOWN = "[data-editor-focus] [data-message]";
|
||||
const title = (n: number) => `(Sample task ${n})`;
|
||||
// Both conversations get their earlier entries painted in background batches, also the
|
||||
// first one, hidden behind the second as soon as it opened.
|
||||
await h.page.waitForFunction(
|
||||
@@ -575,25 +581,28 @@ const agentTabs: Scenario = {
|
||||
// Rows painted while hidden are laid out the first time their conversation shows.
|
||||
for (const n of [1, 2]) {
|
||||
await h.page.getByRole("tab", { name: `Sample task ${n}` }).click();
|
||||
await h.page.locator(shown(n)).waitFor();
|
||||
await h.page
|
||||
.locator(SHOWN, { hasText: title(n) })
|
||||
.first()
|
||||
.waitFor();
|
||||
await h.page.waitForTimeout(300);
|
||||
}
|
||||
// WebKit restyles a hidden conversation in full when it is shown again (Chromium keeps its
|
||||
// style): what bounds that there is the history's DOM, and rows skipping rendering off screen.
|
||||
const { conversationNodes, rowsAlwaysRendered } = await h.page.evaluate((selector) => {
|
||||
const conversation = document.querySelector(selector)!.closest("[data-editor-focus]")!;
|
||||
const conversation = document.querySelector(selector)!;
|
||||
const rows = [...conversation.querySelector("[data-message]")!.parentElement!.children];
|
||||
return {
|
||||
conversationNodes: conversation.querySelectorAll("*").length,
|
||||
rowsAlwaysRendered: rows.filter((r) => getComputedStyle(r).contentVisibility !== "auto").length,
|
||||
};
|
||||
}, shown(2));
|
||||
}, "[data-editor-focus]");
|
||||
|
||||
const t0 = await h.now();
|
||||
const before = await h.counters();
|
||||
const switches: number[] = [];
|
||||
for (let i = 0; i < 10; i++) {
|
||||
switches.push(await h.measure(() => h.pressAction("navigate.switcher"), shown(i % 2 ? 2 : 1)));
|
||||
switches.push(await h.measure(() => h.pressAction("navigate.switcher"), SHOWN, title(i % 2 ? 2 : 1)));
|
||||
await h.page.waitForTimeout(150);
|
||||
}
|
||||
const work = Harness.delta(before, await h.counters());
|
||||
@@ -602,10 +611,7 @@ const agentTabs: Scenario = {
|
||||
// Scrolling up from the end, a step at a time: how far the text under the pointer moves
|
||||
// beyond the scroll itself.
|
||||
const scrollJumps = await h.page.evaluate(async (selector) => {
|
||||
const stream = document
|
||||
.querySelector(selector)!
|
||||
.closest("[data-editor-focus]")!
|
||||
.querySelector("[data-message]")!.parentElement!;
|
||||
const stream = document.querySelector(selector)!.parentElement!;
|
||||
const frame = () => new Promise(requestAnimationFrame);
|
||||
stream.scrollTop = stream.scrollHeight;
|
||||
await frame();
|
||||
@@ -626,7 +632,7 @@ const agentTabs: Scenario = {
|
||||
}
|
||||
stream.scrollTop = stream.scrollHeight;
|
||||
return jumps;
|
||||
}, shown(2));
|
||||
}, SHOWN);
|
||||
|
||||
const refresh = await h.refreshMs();
|
||||
const box = (await h.page.locator("[data-editor-focus]").boundingBox())!;
|
||||
@@ -732,6 +738,9 @@ const projectTree: Scenario = {
|
||||
async run(h) {
|
||||
const generated = h.page.locator('[role="treeitem"][aria-level="2"]', { hasText: "generated" }).first();
|
||||
await generated.click();
|
||||
// Measure from a settled selection: a key pressed in the click's own frame also pays for that frame.
|
||||
await generated.and(h.page.locator('[aria-selected="true"]')).waitFor();
|
||||
await h.page.evaluate(() => new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(r))));
|
||||
const expandMs = await h.measure(
|
||||
() => h.page.keyboard.press("ArrowRight"),
|
||||
'[role="tree"][aria-label="Project"]',
|
||||
|
||||
Створено
+20
-24
@@ -7,6 +7,9 @@ settings:
|
||||
overrides:
|
||||
mermaid>katex: ^0.18.2
|
||||
|
||||
patchedDependencies:
|
||||
'@codemirror/view': 0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5
|
||||
|
||||
importers:
|
||||
|
||||
.:
|
||||
@@ -61,7 +64,7 @@ importers:
|
||||
version: 6.7.6
|
||||
'@codemirror/view':
|
||||
specifier: ^6.43.14
|
||||
version: 6.43.14
|
||||
version: 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@floating-ui/react-dom':
|
||||
specifier: ^2.1.9
|
||||
version: 2.1.9([email protected]([email protected]))([email protected])
|
||||
@@ -85,7 +88,7 @@ importers:
|
||||
version: 1.2.0
|
||||
'@replit/codemirror-vim':
|
||||
specifier: 6.4.0
|
||||
version: 6.4.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
|
||||
version: 6.4.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5))
|
||||
'@tanstack/react-virtual':
|
||||
specifier: ^3.14.21
|
||||
version: 3.14.21([email protected]([email protected]))([email protected])
|
||||
@@ -591,7 +594,6 @@ packages:
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [riscv64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@oxc-parser/[email protected]':
|
||||
resolution: {integrity: sha512-JSlhgoK+/g1TGJI5NuADx2+6syhxnQNLCWLXyO5QLFyetomcr/vIxSdiNlmyAv963YXUzCuwAwRG6npZ5xyJ1A==}
|
||||
@@ -1069,7 +1071,6 @@ packages:
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
'@rolldown/[email protected]':
|
||||
resolution: {integrity: sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q==}
|
||||
@@ -1083,14 +1084,12 @@ packages:
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [s390x]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rolldown/[email protected]':
|
||||
resolution: {integrity: sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg==}
|
||||
engines: {node: ^20.19.0 || >=22.12.0}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
'@rolldown/[email protected]':
|
||||
resolution: {integrity: sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg==}
|
||||
@@ -1864,7 +1863,6 @@ packages:
|
||||
engines: {node: '>= 12.0.0'}
|
||||
cpu: [arm64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
[email protected]:
|
||||
resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
|
||||
@@ -1878,14 +1876,12 @@ packages:
|
||||
engines: {node: '>= 12.0.0'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [glibc]
|
||||
|
||||
[email protected]:
|
||||
resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
|
||||
engines: {node: '>= 12.0.0'}
|
||||
cpu: [x64]
|
||||
os: [linux]
|
||||
libc: [musl]
|
||||
|
||||
[email protected]:
|
||||
resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
|
||||
@@ -2391,14 +2387,14 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
@@ -2438,7 +2434,7 @@ snapshots:
|
||||
'@codemirror/lang-javascript': 6.2.5
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/css': 1.3.9
|
||||
'@lezer/html': 1.3.13
|
||||
@@ -2454,7 +2450,7 @@ snapshots:
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/lint': 6.9.7
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/javascript': 1.5.6
|
||||
|
||||
@@ -2464,7 +2460,7 @@ snapshots:
|
||||
'@codemirror/lang-html': 6.4.12
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.5
|
||||
'@lezer/lr': 1.4.11
|
||||
@@ -2488,7 +2484,7 @@ snapshots:
|
||||
'@codemirror/lang-html': 6.4.12
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.5
|
||||
'@lezer/lr': 1.4.11
|
||||
@@ -2499,7 +2495,7 @@ snapshots:
|
||||
'@codemirror/lang-html': 6.4.12
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/markdown': 1.8.0
|
||||
|
||||
@@ -2562,7 +2558,7 @@ snapshots:
|
||||
'@codemirror/autocomplete': 6.20.3
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/xml': 1.0.6
|
||||
|
||||
@@ -2606,7 +2602,7 @@ snapshots:
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/streamparser': 6.0.0
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/common': 1.5.3
|
||||
'@lezer/highlight': 1.2.5
|
||||
'@lezer/lr': 1.4.11
|
||||
@@ -2619,21 +2615,21 @@ snapshots:
|
||||
'@codemirror/[email protected]':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
crelt: 1.0.7
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
dependencies:
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@lezer/highlight': 1.2.5
|
||||
style-mod: 4.1.4
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
crelt: 1.0.7
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
@@ -2642,7 +2638,7 @@ snapshots:
|
||||
|
||||
'@codemirror/[email protected]': {}
|
||||
|
||||
'@codemirror/[email protected]':
|
||||
'@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)':
|
||||
dependencies:
|
||||
'@codemirror/state': 6.7.6
|
||||
crelt: 1.0.7
|
||||
@@ -3105,13 +3101,13 @@ snapshots:
|
||||
|
||||
'@replit/[email protected]': {}
|
||||
|
||||
'@replit/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
|
||||
'@replit/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5))':
|
||||
dependencies:
|
||||
'@codemirror/commands': 6.11.1
|
||||
'@codemirror/language': 6.13.1
|
||||
'@codemirror/search': 6.7.2
|
||||
'@codemirror/state': 6.7.6
|
||||
'@codemirror/view': 6.43.14
|
||||
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
|
||||
'@replit/codemirror-vim-core': 0.1.0
|
||||
|
||||
'@rolldown/[email protected]':
|
||||
|
||||
@@ -3,3 +3,5 @@ allowBuilds:
|
||||
overrides:
|
||||
# GHSA-238p-pmpm-9mq7 (fixed in 0.18.2); mermaid 12.1 still asks for katex ^0.16.
|
||||
mermaid>katex: ^0.18.2
|
||||
patchedDependencies:
|
||||
"@codemirror/view": patches/@codemirror__view.patch
|
||||
@@ -106,7 +106,12 @@ impl Forward {
|
||||
type Channels = Arc<Mutex<HashMap<u64, (Channel<ChannelFrame>, u64)>>>;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct Connections(Mutex<HashMap<String, Arc<Connection>>>);
|
||||
pub struct Connections {
|
||||
windows: Mutex<HashMap<String, Arc<Connection>>>,
|
||||
/// The connect attempt allowed to publish for each window. A later connect, or a
|
||||
/// disconnect, supersedes an attempt that is still starting the server.
|
||||
attempts: Mutex<HashMap<String, u64>>,
|
||||
}
|
||||
|
||||
impl Connection {
|
||||
/// Commands of a remote window that run on this machine follow this machine's decision about the
|
||||
@@ -143,13 +148,13 @@ impl Connection {
|
||||
|
||||
impl Connections {
|
||||
pub fn get(&self, window: &str) -> Option<Arc<Connection>> {
|
||||
self.0.lock().get(window).cloned()
|
||||
self.windows.lock().get(window).cloned()
|
||||
}
|
||||
|
||||
/// The window connected to folder `root` of `target`.
|
||||
pub fn window_of(&self, target: &RemoteTarget, root: &str) -> Option<String> {
|
||||
let root = root.trim_end_matches('/');
|
||||
self.0
|
||||
self.windows
|
||||
.lock()
|
||||
.iter()
|
||||
// A dev container is one project: its folder there is only known once connected.
|
||||
@@ -162,17 +167,131 @@ impl Connections {
|
||||
|
||||
/// Every connected window.
|
||||
pub fn all(&self) -> Vec<(String, Arc<Connection>)> {
|
||||
self.0.lock().iter().map(|(w, c)| (w.clone(), c.clone())).collect()
|
||||
self.windows.lock().iter().map(|(w, c)| (w.clone(), c.clone())).collect()
|
||||
}
|
||||
|
||||
/// Starts a connect for `window`. An older attempt can no longer publish.
|
||||
pub fn begin(&self, window: &str) -> u64 {
|
||||
self.bump(window)
|
||||
}
|
||||
|
||||
fn bump(&self, window: &str) -> u64 {
|
||||
let mut attempts = self.attempts.lock();
|
||||
let next = attempts.get(window).copied().unwrap_or(0).wrapping_add(1);
|
||||
attempts.insert(window.to_owned(), next);
|
||||
next
|
||||
}
|
||||
|
||||
/// Installs `connection` when `attempt` is still the one [`begin`] returned for `window`.
|
||||
/// An older attempt leaves the connection a newer one published.
|
||||
pub fn publish(&self, window: &str, attempt: u64, connection: Arc<Connection>) -> bool {
|
||||
let attempts = self.attempts.lock();
|
||||
if attempts.get(window).copied() != Some(attempt) {
|
||||
return false;
|
||||
}
|
||||
if let Some(old) = self.windows.lock().insert(window.to_owned(), connection) {
|
||||
old.peer.kill();
|
||||
old.forwards.lock().clear();
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
pub fn disconnect(&self, window: &str) {
|
||||
if let Some(c) = self.0.lock().remove(window) {
|
||||
// Invalidate an attempt that has not published yet, or it would put the
|
||||
// connection back after this disconnect.
|
||||
self.bump(window);
|
||||
if let Some(c) = self.windows.lock().remove(window) {
|
||||
c.peer.kill();
|
||||
c.forwards.lock().clear();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// `ssh://` / `wsl://` / `devcontainer://` location, the same spelling the frontend stores.
|
||||
pub fn remote_location(target: &RemoteTarget, path: &str) -> String {
|
||||
let (scheme, name) = match target {
|
||||
RemoteTarget::Ssh { config } => ("ssh", config.as_str()),
|
||||
RemoteTarget::Wsl { distro } => ("wsl", distro.as_str()),
|
||||
RemoteTarget::DevContainer { folder, .. } => ("devcontainer", folder.as_str()),
|
||||
};
|
||||
let config = match target {
|
||||
RemoteTarget::DevContainer { config, .. } if !config.is_empty() => format!(":{}", encode_uri_component(config)),
|
||||
_ => String::new(),
|
||||
};
|
||||
let path = if path.starts_with('/') { path.to_owned() } else { format!("/{path}") };
|
||||
format!("{scheme}://{}{config}{path}", encode_uri_component(name))
|
||||
}
|
||||
|
||||
/// The remote project a `ssh://`, `wsl://` or `devcontainer://` location names.
|
||||
pub fn parse_remote_location(location: &str) -> Option<(RemoteTarget, String)> {
|
||||
let (kind, rest) = if let Some(rest) = location.strip_prefix("ssh://") {
|
||||
("ssh", rest)
|
||||
} else if let Some(rest) = location.strip_prefix("wsl://") {
|
||||
("wsl", rest)
|
||||
} else {
|
||||
("devcontainer", location.strip_prefix("devcontainer://")?)
|
||||
};
|
||||
let slash = rest.find('/')?;
|
||||
if slash == 0 {
|
||||
return None;
|
||||
}
|
||||
let authority = &rest[..slash];
|
||||
let path = rest[slash..].to_owned();
|
||||
let (name, config) = if kind == "devcontainer" {
|
||||
match authority.split_once(':') {
|
||||
Some((name, config)) => (name, config),
|
||||
None => (authority, ""),
|
||||
}
|
||||
} else {
|
||||
(authority, "")
|
||||
};
|
||||
let name = decode_uri_component(name)?;
|
||||
let config = decode_uri_component(config)?;
|
||||
if name.is_empty() {
|
||||
return None;
|
||||
}
|
||||
let target = match kind {
|
||||
"ssh" => RemoteTarget::Ssh { config: name },
|
||||
"wsl" => RemoteTarget::Wsl { distro: name },
|
||||
_ => RemoteTarget::DevContainer { folder: name, config },
|
||||
};
|
||||
Some((target, path))
|
||||
}
|
||||
|
||||
/// `encodeURIComponent`: the frontend builds locations with it.
|
||||
fn encode_uri_component(value: &str) -> String {
|
||||
let mut out = String::new();
|
||||
for b in value.bytes() {
|
||||
match b {
|
||||
b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'!' | b'~' | b'*' | b'\'' | b'(' | b')' => {
|
||||
out.push(b as char)
|
||||
}
|
||||
_ => out.push_str(&format!("%{b:02X}")),
|
||||
}
|
||||
}
|
||||
out
|
||||
}
|
||||
|
||||
fn decode_uri_component(value: &str) -> Option<String> {
|
||||
let bytes = value.as_bytes();
|
||||
let mut out = Vec::with_capacity(bytes.len());
|
||||
let mut i = 0;
|
||||
while i < bytes.len() {
|
||||
if bytes[i] == b'%' {
|
||||
if i + 2 >= bytes.len() {
|
||||
return None;
|
||||
}
|
||||
let hex = std::str::from_utf8(&bytes[i + 1..i + 3]).ok()?;
|
||||
out.push(u8::from_str_radix(hex, 16).ok()?);
|
||||
i += 3;
|
||||
} else {
|
||||
out.push(bytes[i]);
|
||||
i += 1;
|
||||
}
|
||||
}
|
||||
String::from_utf8(out).ok()
|
||||
}
|
||||
|
||||
/// Where [`remote_connect`] is (`fraction`: 0..1 of a download / upload).
|
||||
#[derive(Clone, Copy, Debug, Serialize, Deserialize, Type)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
@@ -512,6 +631,9 @@ pub async fn remote_connect(
|
||||
});
|
||||
progress(RemoteStage::Connecting, None);
|
||||
let label = AppState::owner_window(window.label()).to_owned();
|
||||
// A later connect or a disconnect supersedes this attempt, so it cannot replace
|
||||
// the connection that one published — or put one back after it was dropped.
|
||||
let attempt = state.remote_dev.begin(&label);
|
||||
let channels: Channels = Arc::default();
|
||||
let connection_slot: Arc<std::sync::OnceLock<std::sync::Weak<Connection>>> = Arc::default();
|
||||
let handler = Arc::new(ClientHandler {
|
||||
@@ -613,10 +735,14 @@ pub async fn remote_connect(
|
||||
if let RemoteTarget::DevContainer { folder, config } = &target {
|
||||
forward_configured_ports(&connection, folder, config).await;
|
||||
}
|
||||
state.remote_dev.disconnect(&label);
|
||||
if !state.remote_dev.publish(&label, attempt, connection.clone()) {
|
||||
tracing::debug!("{label}: remote connection superseded");
|
||||
connection.peer.kill();
|
||||
connection.forwards.lock().clear();
|
||||
return Err(IdeError::cancelled());
|
||||
}
|
||||
state.host.close_project(&label);
|
||||
state.host.mcp_reports.set_remote(&label, std::path::PathBuf::from(&connection.root));
|
||||
state.remote_dev.0.lock().insert(label.clone(), connection.clone());
|
||||
let weak = Arc::downgrade(&connection);
|
||||
let peer = connection.peer.clone();
|
||||
let auth_plugins = state.plugins.clone();
|
||||
@@ -641,6 +767,9 @@ pub async fn remote_connect(
|
||||
sync_plugin_languages(&plugins, &connection, &label).await;
|
||||
sync_plugin_packages(&plugins, &connection, &label).await;
|
||||
});
|
||||
if let Err(error) = crate::window_groups::persist(window.app_handle()).await {
|
||||
tracing::warn!(%error, "cannot save window session after opening remote project");
|
||||
}
|
||||
Ok(RemoteProject { target, root, host, server_version: info.version, os: info.os, commands, project })
|
||||
}
|
||||
|
||||
@@ -1069,6 +1198,29 @@ async fn invoke_reply(peer: &Peer, call: Invoke, entries_timeout: std::time::Dur
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn remote_locations_round_trip_like_the_frontend() {
|
||||
let cases = [
|
||||
(RemoteTarget::Wsl { distro: "Ubuntu-24.04".into() }, "/home/me/app", "wsl://Ubuntu-24.04/home/me/app"),
|
||||
(RemoteTarget::Ssh { config: "my box".into() }, "/srv/app", "ssh://my%20box/srv/app"),
|
||||
(
|
||||
RemoteTarget::DevContainer { folder: "/work/app".into(), config: "devcontainer.json".into() },
|
||||
"/workspaces/app",
|
||||
"devcontainer://%2Fwork%2Fapp:devcontainer.json/workspaces/app",
|
||||
),
|
||||
(
|
||||
RemoteTarget::DevContainer { folder: "/work/app".into(), config: String::new() },
|
||||
"/workspaces/app",
|
||||
"devcontainer://%2Fwork%2Fapp/workspaces/app",
|
||||
),
|
||||
];
|
||||
for (target, path, location) in cases {
|
||||
assert_eq!(remote_location(&target, path), location);
|
||||
assert_eq!(parse_remote_location(location), Some((target, path.to_owned())));
|
||||
}
|
||||
assert!(parse_remote_location(r"\\wsl.localhost\Ubuntu\home\me\app").is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_command_missing_on_a_server_of_another_version_says_which_versions() {
|
||||
let missing = || IdeError::unavailable("-32601: command web_url is not available remotely");
|
||||
@@ -1159,6 +1311,24 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn a_later_connect_supersedes_an_earlier_attempt() {
|
||||
let connections = Connections::default();
|
||||
let first = connections.begin("main");
|
||||
let second = connections.begin("main");
|
||||
let older = Arc::new(connected(RemoteTarget::Wsl { distro: "Ubuntu".into() }, "/home/me/old"));
|
||||
assert!(!connections.publish("main", first, older.clone()));
|
||||
assert!(connections.get("main").is_none());
|
||||
let newer = Arc::new(connected(RemoteTarget::Wsl { distro: "Ubuntu".into() }, "/home/me/new"));
|
||||
assert!(connections.publish("main", second, newer.clone()));
|
||||
assert!(Arc::ptr_eq(&connections.get("main").unwrap(), &newer));
|
||||
connections.disconnect("main");
|
||||
assert!(connections.get("main").is_none());
|
||||
assert!(!connections.publish("main", second, newer.clone()));
|
||||
older.peer.kill();
|
||||
newer.peer.kill();
|
||||
}
|
||||
|
||||
#[tokio::test]
|
||||
async fn the_server_does_not_decide_trust_for_commands_run_here() {
|
||||
let tmp = tempfile::tempdir().unwrap();
|
||||
|
||||
@@ -143,10 +143,11 @@ impl AppState {
|
||||
|
||||
/// Opens `root` in `window` and records it in the recent projects.
|
||||
pub fn open_project(&self, window: &str, root: &Path) -> IdeResult<Arc<Project>> {
|
||||
// A local project replaces a remote one in this window.
|
||||
self.remote_dev.disconnect(window);
|
||||
let project = self.host.open_project(window, root)?;
|
||||
self.record_project(&project)?;
|
||||
// Drop the remote connection only once the local project is actually open.
|
||||
// A failed open leaves the window on the host it is still routing to.
|
||||
self.remote_dev.disconnect(window);
|
||||
Ok(project)
|
||||
}
|
||||
|
||||
@@ -166,14 +167,16 @@ impl AppState {
|
||||
|
||||
/// Opens `window` for editing the loose file `file` (LightEdit); not a recent project.
|
||||
pub fn open_light(&self, window: &str, file: &Path) -> IdeResult<Arc<Project>> {
|
||||
let project = self.host.open_light(window, file)?;
|
||||
self.remote_dev.disconnect(window);
|
||||
self.host.open_light(window, file)
|
||||
Ok(project)
|
||||
}
|
||||
|
||||
/// LightEdit without a file (File › New File from a welcome window).
|
||||
pub fn open_light_empty(&self, window: &str) -> IdeResult<Arc<Project>> {
|
||||
let project = self.host.open_light_empty(window)?;
|
||||
self.remote_dev.disconnect(window);
|
||||
self.host.open_light_empty(window)
|
||||
Ok(project)
|
||||
}
|
||||
|
||||
/// Called on the event-loop thread (window destruction, the `close_project`
|
||||
|
||||
@@ -276,10 +276,18 @@ pub async fn persist(app: &AppHandle) -> IdeResult<()> {
|
||||
}
|
||||
let groups = state.groups.lock().groups().to_vec();
|
||||
let windows = labels_in_order(app);
|
||||
let project_of = |label: &str| match host.project(label) {
|
||||
Ok(p) => (!p.light).then(|| p.root.clone()),
|
||||
// A restored window may have taken its launch but not finished opening yet.
|
||||
Err(_) => state.pending(label).and_then(|l| l.project).map(Into::into),
|
||||
let project_of = |label: &str| {
|
||||
if let Some(path) = windows::window_project_path(app, label) {
|
||||
return Some(path);
|
||||
}
|
||||
// Taken its launch, not finished opening: keep the remote location or local folder.
|
||||
state.pending(label).and_then(|launch| {
|
||||
launch
|
||||
.remote
|
||||
.as_ref()
|
||||
.map(|remote| PathBuf::from(crate::remote_dev::remote_location(&remote.target, &remote.path)))
|
||||
.or_else(|| launch.project.clone().map(Into::into))
|
||||
})
|
||||
};
|
||||
let Some(saved) = ide_workspace::window_groups::session(&groups, &windows, project_of) else {
|
||||
return Ok(());
|
||||
@@ -314,8 +322,13 @@ pub async fn restore(app: &AppHandle, caller: &str) -> IdeResult<()> {
|
||||
}
|
||||
let state = app.state::<WindowsState>();
|
||||
let host = app.state::<AppState>();
|
||||
let project = host.project(caller)?;
|
||||
if !project.settings.effective().general.reopen_last_project || state.groups_restored.swap(true, Ordering::SeqCst) {
|
||||
// A remote window has no local project. Leave the flag clear until this window has
|
||||
// one, so the call that runs once the connection is up can still restore its siblings.
|
||||
let Some(root) = windows::window_project_path(app, caller) else {
|
||||
return Ok(());
|
||||
};
|
||||
let settings = ide_host::ops::project::settings_get(&host.host, caller);
|
||||
if !settings.general.reopen_last_project || state.groups_restored.swap(true, Ordering::SeqCst) {
|
||||
return Ok(());
|
||||
}
|
||||
let saved = {
|
||||
@@ -327,30 +340,25 @@ pub async fn restore(app: &AppHandle, caller: &str) -> IdeResult<()> {
|
||||
};
|
||||
// The caller's own group first (it already shows one of its projects), then every other
|
||||
// group and single window that was open at quit. Missing folders are skipped.
|
||||
let order = saved
|
||||
.iter()
|
||||
.filter(|g| g.projects.contains(&project.root))
|
||||
.chain(saved.iter().filter(|g| !g.projects.contains(&project.root)));
|
||||
let owns = |group: &ide_workspace::window_groups::SavedWindows| {
|
||||
group.projects.iter().any(|path| windows::same_saved_project(path, &root))
|
||||
};
|
||||
let order = saved.iter().filter(|group| owns(group)).chain(saved.iter().filter(|group| !owns(group)));
|
||||
for group in order {
|
||||
let mut labels = Vec::new();
|
||||
let mut selected = None;
|
||||
for path in &group.projects {
|
||||
let label = if path == &project.root {
|
||||
let label = if windows::same_saved_project(path, &root) {
|
||||
Some(caller.to_owned())
|
||||
} else if path.is_dir() {
|
||||
let window = match windows::find_project_window(app, path) {
|
||||
Some(w) => Ok(w),
|
||||
None => windows::create_restored_window(app, path.clone()),
|
||||
};
|
||||
match window {
|
||||
Ok(w) => Some(w.label().to_owned()),
|
||||
} else {
|
||||
match windows::reopen_saved_window(app, path) {
|
||||
Ok(Some(w)) => Some(w.label().to_owned()),
|
||||
Ok(None) => None,
|
||||
Err(e) => {
|
||||
tracing::warn!("cannot reopen {}: {e}", path.display());
|
||||
None
|
||||
}
|
||||
}
|
||||
} else {
|
||||
None
|
||||
};
|
||||
if let Some(label) = label {
|
||||
if group.projects.get(group.selected) == Some(path) {
|
||||
|
||||
@@ -211,6 +211,74 @@ pub fn wsl_launch(path: &Path) -> Option<RemoteLaunch> {
|
||||
Some(RemoteLaunch { target: RemoteTarget::Wsl { distro: w.distro }, path: w.path })
|
||||
}
|
||||
|
||||
/// A saved project path that is a remote location: `ssh://`, `wsl://`, `devcontainer://`,
|
||||
/// or a `\\wsl.localhost` share remembered before those locations existed.
|
||||
pub(crate) fn saved_remote(path: &Path) -> Option<RemoteLaunch> {
|
||||
if let Some(text) = path.to_str()
|
||||
&& let Some((target, root)) = crate::remote_dev::parse_remote_location(text)
|
||||
{
|
||||
return Some(RemoteLaunch { target, path: root });
|
||||
}
|
||||
wsl_launch(path)
|
||||
}
|
||||
|
||||
/// What reopening `path` should launch. A remote location is recognised before any stat,
|
||||
/// so a WSL share that is down still comes back as a remote project.
|
||||
pub(crate) fn saved_project_launch(path: &Path) -> Option<Launch> {
|
||||
if let Some(remote) = saved_remote(path) {
|
||||
return Some(Launch { remote: Some(remote), ..Default::default() });
|
||||
}
|
||||
path.is_dir().then(|| Launch { project: Some(path.to_path_buf().into()), ..Default::default() })
|
||||
}
|
||||
|
||||
/// The same project, including a WSL share and the `wsl://` location of that folder.
|
||||
pub(crate) fn same_saved_project(a: &Path, b: &Path) -> bool {
|
||||
if a == b {
|
||||
return true;
|
||||
}
|
||||
match (saved_remote(a), saved_remote(b)) {
|
||||
(Some(left), Some(right)) => {
|
||||
left.target == right.target && left.path.trim_end_matches('/') == right.path.trim_end_matches('/')
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// The project `label` has open: a remote location (`wsl://` and the rest), else its local root.
|
||||
pub(crate) fn window_project_path(app: &AppHandle, label: &str) -> Option<PathBuf> {
|
||||
let state = app.try_state::<AppState>()?;
|
||||
if let Some(c) = state.remote_dev.get(label) {
|
||||
return Some(PathBuf::from(crate::remote_dev::remote_location(&c.target, &c.root)));
|
||||
}
|
||||
state.project(label).ok().filter(|p| !p.light).map(|p| p.root.clone())
|
||||
}
|
||||
|
||||
/// Reopens a project saved at quit. Remote locations become a remote launch; a missing
|
||||
/// local folder is skipped. An already connected window is focused instead of duplicated.
|
||||
pub(crate) fn reopen_saved_window(app: &AppHandle, path: &Path) -> IdeResult<Option<WebviewWindow>> {
|
||||
let Some(launch) = saved_project_launch(path) else {
|
||||
return Ok(None);
|
||||
};
|
||||
if let Some(remote) = launch.remote.clone() {
|
||||
let open = app.try_state::<AppState>().and_then(|s| s.remote_dev.window_of(&remote.target, &remote.path));
|
||||
if let Some(w) = open.and_then(|label| app.get_webview_window(&label)) {
|
||||
return Ok(Some(w));
|
||||
}
|
||||
let title = remote
|
||||
.path
|
||||
.trim_end_matches('/')
|
||||
.rsplit('/')
|
||||
.next()
|
||||
.filter(|n| !n.is_empty() && *n != "~")
|
||||
.map(str::to_owned);
|
||||
return Ok(Some(create_window_for(app, title, launch, true)?));
|
||||
}
|
||||
if let Some(w) = find_project_window(app, path) {
|
||||
return Ok(Some(w));
|
||||
}
|
||||
Ok(Some(create_restored_window(app, path.to_path_buf())?))
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct WindowsState {
|
||||
pub groups: Mutex<ide_workspace::window_groups::WindowGroups>,
|
||||
@@ -2446,11 +2514,41 @@ mod tests {
|
||||
let folder = launch_for(share.clone(), true);
|
||||
let remote =
|
||||
RemoteLaunch { target: RemoteTarget::Wsl { distro: "Ubuntu".into() }, path: "/home/me/app".into() };
|
||||
assert_eq!((folder.remote, folder.project, folder.files.len()), (Some(remote), None, 0));
|
||||
assert_eq!((folder.remote, folder.project, folder.files.len()), (Some(remote.clone()), None, 0));
|
||||
let file = launch_for(share.join("main.py"), false);
|
||||
assert_eq!((file.remote, file.project, file.files.len()), (None, None, 1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn a_saved_wsl_project_reopens_as_a_remote_launch_without_the_share() {
|
||||
let remote =
|
||||
RemoteLaunch { target: RemoteTarget::Wsl { distro: "Ubuntu".into() }, path: "/home/me/app".into() };
|
||||
for saved in [r"\\wsl.localhost\Ubuntu\home\me\app", "wsl://Ubuntu/home/me/app", "//wsl$/Ubuntu/home/me/app"] {
|
||||
let launch = saved_project_launch(Path::new(saved)).expect(saved);
|
||||
assert_eq!(launch.remote, Some(remote.clone()));
|
||||
assert!(launch.project.is_none(), "{saved}");
|
||||
}
|
||||
assert!(same_saved_project(
|
||||
Path::new(r"\\wsl.localhost\Ubuntu\home\me\app"),
|
||||
Path::new("wsl://Ubuntu/home/me/app/")
|
||||
));
|
||||
let ssh = saved_project_launch(Path::new("ssh://box/srv/app")).unwrap();
|
||||
assert_eq!(
|
||||
ssh.remote,
|
||||
Some(RemoteLaunch { target: RemoteTarget::Ssh { config: "box".into() }, path: "/srv/app".into() })
|
||||
);
|
||||
let container =
|
||||
saved_project_launch(Path::new("devcontainer://%2Fwork%2Fapp:devcontainer.json/workspaces/app")).unwrap();
|
||||
assert_eq!(
|
||||
container.remote,
|
||||
Some(RemoteLaunch {
|
||||
target: RemoteTarget::DevContainer { folder: "/work/app".into(), config: "devcontainer.json".into() },
|
||||
path: "/workspaces/app".into(),
|
||||
})
|
||||
);
|
||||
assert!(saved_project_launch(Path::new("/no/such/local/project-openidea")).is_none());
|
||||
}
|
||||
|
||||
fn p(s: &str) -> PathBuf {
|
||||
PathBuf::from(s)
|
||||
}
|
||||
|
||||
+2
-24
@@ -2602,18 +2602,6 @@ export type AgentSettings_Deserialize = {
|
||||
smoothText?: boolean,
|
||||
/** Conversations and the composer expand to the full width of the pane instead of staying in a centred column. */
|
||||
fitWindowWidth?: boolean,
|
||||
/** While the agent works, playful words fill the pauses in what it reports. */
|
||||
playfulStatus?: boolean,
|
||||
/**
|
||||
* Seconds the agent reports nothing new before the playful words take over; 0 shows them
|
||||
* from the start.
|
||||
*/
|
||||
playfulAfterSeconds?: number,
|
||||
/**
|
||||
* The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
|
||||
* the built-in ones of that activity; an empty list keeps its status factual.
|
||||
*/
|
||||
playfulWords?: { [key in string]: string[] },
|
||||
thinking?: ThinkingDisplay,
|
||||
toolCalls?: ToolCallDisplay,
|
||||
/** A tool call's output (a command's, a diff) is shown without opening it. */
|
||||
@@ -2654,18 +2642,6 @@ export type AgentSettings_Serialize = {
|
||||
smoothText: boolean,
|
||||
/** Conversations and the composer expand to the full width of the pane instead of staying in a centred column. */
|
||||
fitWindowWidth: boolean,
|
||||
/** While the agent works, playful words fill the pauses in what it reports. */
|
||||
playfulStatus: boolean,
|
||||
/**
|
||||
* Seconds the agent reports nothing new before the playful words take over; 0 shows them
|
||||
* from the start.
|
||||
*/
|
||||
playfulAfterSeconds: number,
|
||||
/**
|
||||
* The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
|
||||
* the built-in ones of that activity; an empty list keeps its status factual.
|
||||
*/
|
||||
playfulWords: { [key in string]: string[] },
|
||||
thinking: ThinkingDisplay,
|
||||
toolCalls: ToolCallDisplay,
|
||||
/** A tool call's output (a command's, a diff) is shown without opening it. */
|
||||
@@ -3794,6 +3770,8 @@ export type CommitSettings = {
|
||||
agentModel?: string,
|
||||
/** That model's thinking level for commit messages; empty keeps the agent's. */
|
||||
agentEffort?: string,
|
||||
/** Show the Generate Commit Message with Agent button above the commit message. */
|
||||
agentButton?: boolean,
|
||||
};
|
||||
|
||||
export type Commit_Deserialize = {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { describe, expect, it, vi } from "vitest";
|
||||
import { Compartment, EditorState } from "@codemirror/state";
|
||||
import { EditorView } from "@codemirror/view";
|
||||
import { Decoration, EditorView, WidgetType } from "@codemirror/view";
|
||||
import { codeLenses } from "@/editor/api";
|
||||
import { codeLensExtension, codeLensPositions, declarationStart, groupLenses, indentColumns } from "./codeLens";
|
||||
|
||||
@@ -95,3 +95,50 @@ describe("code lens position", () => {
|
||||
v.destroy();
|
||||
});
|
||||
});
|
||||
|
||||
describe("inline lens against a folded chip", () => {
|
||||
const doc = "def f():\n pass\n";
|
||||
const lenses = [{ pos: 8, title: "1 usage", kind: "usages", order: 10 }];
|
||||
|
||||
class FakeChip extends WidgetType {
|
||||
toDOM() {
|
||||
const el = document.createElement("span");
|
||||
el.className = "cm-foldPlaceholder";
|
||||
el.getBoundingClientRect = () => ({ width: 18 }) as DOMRect;
|
||||
return el;
|
||||
}
|
||||
override eq(other: WidgetType) {
|
||||
return other instanceof FakeChip;
|
||||
}
|
||||
}
|
||||
|
||||
it("steps past a folded chip drawn after its anchor and back when it goes away", async () => {
|
||||
vi.useFakeTimers();
|
||||
const chip = new Compartment();
|
||||
const chipDeco = () =>
|
||||
EditorView.decorations.of(Decoration.set([Decoration.widget({ widget: new FakeChip(), side: 3 }).range(8)]));
|
||||
const v = new EditorView({
|
||||
state: EditorState.create({
|
||||
doc,
|
||||
extensions: [codeLensExtension, codeLenses.of(lenses), codeLensPositions.of({ usages: "right" }), chip.of([])],
|
||||
}),
|
||||
parent: document.body,
|
||||
});
|
||||
const inline = v.dom.querySelector<HTMLElement>(".cm-openidea-lensInline")!;
|
||||
const inner = inline.firstElementChild as HTMLElement;
|
||||
await vi.advanceTimersByTimeAsync(10);
|
||||
expect(inner.style.left).toBe("");
|
||||
|
||||
// The fold appears after the lens mounted; side 3 mirrors the production DOM order, where
|
||||
// CodeMirror draws the fold's replace widget after the side-1 line-end anchor.
|
||||
v.dispatch({ effects: chip.reconfigure(chipDeco()) });
|
||||
await vi.advanceTimersByTimeAsync(10);
|
||||
expect(inner.style.left).toBe("calc(var(--openidea-hint-offset) + 18px)");
|
||||
|
||||
v.dispatch({ effects: chip.reconfigure([]) });
|
||||
await vi.advanceTimersByTimeAsync(10);
|
||||
expect(inner.style.left).toBe("");
|
||||
v.destroy();
|
||||
vi.useRealTimers();
|
||||
});
|
||||
});
|
||||
@@ -7,6 +7,7 @@
|
||||
import { EditorState, Facet, RangeSetBuilder, type Extension } from "@codemirror/state";
|
||||
import { Decoration, EditorView, WidgetType, type DecorationSet } from "@codemirror/view";
|
||||
import { codeLenses, type CodeLens } from "@/editor/api";
|
||||
import { foldChipWidth } from "./folding";
|
||||
import { showContextMenu } from "@/ui";
|
||||
import { codeVisionMenuItems } from "../codeVision";
|
||||
import { LINE_INSET } from "./lineInset";
|
||||
@@ -99,6 +100,21 @@ class LensWidget extends WidgetType {
|
||||
return this.key === other.key && this.lenses.every((l, i) => l.run === other.lenses[i]?.run);
|
||||
}
|
||||
|
||||
/** The box parks a fixed offset past its zero-width anchor; a folded chip drawn after the
|
||||
anchor paints under the box, so the box also steps past the chip's width (folding.ts). */
|
||||
private stepPastFoldChip(el: HTMLElement) {
|
||||
const inner = this.inline ? (el.firstElementChild as HTMLElement | null) : el;
|
||||
if (!inner) return;
|
||||
const chip = foldChipWidth(el);
|
||||
if (chip === this.appliedChip) return;
|
||||
this.appliedChip = chip;
|
||||
if (chip) inner.style.left = `calc(var(--openidea-hint-offset) + ${chip}px)`;
|
||||
else inner.style.removeProperty("left");
|
||||
}
|
||||
|
||||
private appliedChip = -1;
|
||||
private observer: MutationObserver | undefined;
|
||||
|
||||
override toDOM(view: EditorView): HTMLElement {
|
||||
// The inline one shares no class with the row, so none of the row's block styles reach into the line.
|
||||
const dom: HTMLElement = document.createElement(this.inline ? "span" : "div");
|
||||
@@ -111,6 +127,18 @@ class LensWidget extends WidgetType {
|
||||
dom.appendChild(host);
|
||||
}
|
||||
this.fill(host, view);
|
||||
if (this.inline) {
|
||||
// The chip can appear (or go away) after this widget mounted, hence the observer; the
|
||||
// element is only measurable once CodeMirror has inserted it, so defer like the blame does.
|
||||
setTimeout(() => {
|
||||
if (!dom.isConnected) return;
|
||||
this.stepPastFoldChip(dom);
|
||||
const line = dom.closest(".cm-line");
|
||||
if (!line) return;
|
||||
this.observer = new MutationObserver(() => this.stepPastFoldChip(dom));
|
||||
this.observer.observe(line, { childList: true, subtree: true, characterData: true });
|
||||
}, 0);
|
||||
}
|
||||
dom.addEventListener("contextmenu", (e) => {
|
||||
e.preventDefault();
|
||||
e.stopPropagation();
|
||||
@@ -126,6 +154,7 @@ class LensWidget extends WidgetType {
|
||||
const host = this.inline ? (dom.firstElementChild as HTMLElement | null) : dom;
|
||||
if (!host) return false;
|
||||
this.fill(host, view);
|
||||
if (this.inline) this.stepPastFoldChip(dom);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -174,6 +203,11 @@ class LensWidget extends WidgetType {
|
||||
return this.inline ? -1 : 16;
|
||||
}
|
||||
|
||||
override destroy(): void {
|
||||
this.observer?.disconnect();
|
||||
this.observer = undefined;
|
||||
}
|
||||
|
||||
override ignoreEvent(): boolean {
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,9 @@ class CornerInset {
|
||||
|
||||
private measure() {
|
||||
const corner = this.corner;
|
||||
if (!corner) return;
|
||||
// A hidden tab's view is detached and measures 0: keeping the inset spares every line
|
||||
// a restyle when the tab hides and another when it shows again.
|
||||
if (!corner || !this.view.dom.isConnected) return;
|
||||
const width = corner.getBoundingClientRect().width;
|
||||
let inset = width > 0 ? round(width) + CORNER_GAP : 0;
|
||||
// A narrow window or a wide corner: keep at least half of the width for text.
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
backendFolds,
|
||||
enclosingFoldRange,
|
||||
expandToLevelEffects,
|
||||
foldChipWidth,
|
||||
foldSelectionEffects,
|
||||
foldsFromRanges,
|
||||
foldingExtension,
|
||||
@@ -420,3 +421,41 @@ describe("comment placeholders", () => {
|
||||
view.destroy();
|
||||
});
|
||||
});
|
||||
|
||||
describe("foldChipWidth", () => {
|
||||
function editor(doc: string) {
|
||||
return new EditorView({
|
||||
state: EditorState.create({ doc, extensions: [foldingExtension()] }),
|
||||
parent: document.body,
|
||||
});
|
||||
}
|
||||
|
||||
it("measures a folded chip drawn after the anchor", () => {
|
||||
const view = editor("const a = 1\nconst b = 2");
|
||||
view.dispatch({ effects: foldEffect.of({ from: view.state.doc.line(1).to, to: view.state.doc.line(2).to }) });
|
||||
// jsdom has no layout: the chip's width is faked like the blame tests' hint boxes.
|
||||
const chip = view.dom.querySelector(".cm-foldPlaceholder")!;
|
||||
chip.getBoundingClientRect = () => ({ width: 18 }) as DOMRect;
|
||||
// Production order: the zero-width anchor sits at the fold start, the chip after it.
|
||||
const anchor = document.createElement("span");
|
||||
chip.before(anchor);
|
||||
expect(foldChipWidth(anchor)).toBe(18);
|
||||
view.destroy();
|
||||
});
|
||||
|
||||
it("is zero with no chip on the line, or when the chip precedes the anchor", () => {
|
||||
const view = editor("const a = 1\nconst b = 2");
|
||||
const other = document.createElement("span");
|
||||
view.dom.querySelectorAll(".cm-line")[1]!.append(other);
|
||||
expect(foldChipWidth(other)).toBe(0);
|
||||
view.dispatch({ effects: foldEffect.of({ from: view.state.doc.line(1).to, to: view.state.doc.line(2).to }) });
|
||||
// A chip earlier in the line (mid-line import folds) cannot overlap a later anchor;
|
||||
// passing the chip itself as the anchor (nothing precedes itself) is also 0.
|
||||
const chip = view.dom.querySelector(".cm-foldPlaceholder")!;
|
||||
chip.getBoundingClientRect = () => ({ width: 18 }) as DOMRect;
|
||||
const anchor = document.createElement("span");
|
||||
chip.after(anchor);
|
||||
expect(foldChipWidth(anchor)).toBe(0);
|
||||
view.destroy();
|
||||
});
|
||||
});
|
||||
@@ -463,6 +463,20 @@ export function backendFoldingChanged(update: ViewUpdate): boolean {
|
||||
return update.startState.field(backendFolds, false) !== update.state.field(backendFolds, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* The folded chip is an in-flow widget drawn at the fold start, which for header-line folds is
|
||||
* the same position as the zero-width anchors of the line-end annotations (`codeLens.ts`, inline
|
||||
* blame, plugin messages). Their absolutely positioned boxes park a fixed offset past those
|
||||
* anchors, so a chip drawn after them paints under (over) the hint. Each consumer measures the
|
||||
* chip and steps past it, but only when the chip follows its anchor in the DOM — a chip earlier
|
||||
* in the line (mid-line import folds) already sits before the anchor and cannot overlap.
|
||||
*/
|
||||
export function foldChipWidth(el: HTMLElement): number {
|
||||
const chip = el.closest(".cm-line")?.querySelector(".cm-foldPlaceholder");
|
||||
if (!chip || !(el.compareDocumentPosition(chip) & Node.DOCUMENT_POSITION_FOLLOWING)) return 0;
|
||||
return Math.round(chip.getBoundingClientRect().width);
|
||||
}
|
||||
|
||||
export function foldingExtension(showOutline = true): Extension {
|
||||
return [
|
||||
// The chevron column sits right of contributed icon gutters (IDEA new UI).
|
||||
|
||||
@@ -20,16 +20,12 @@ import { countColumn, Facet, RangeSetBuilder, type EditorState, type Extension }
|
||||
import { Decoration, EditorView, ViewPlugin, type DecorationSet, type ViewUpdate } from "@codemirror/view";
|
||||
import { getIndentUnit, matchBrackets, syntaxTree } from "@codemirror/language";
|
||||
import { LINE_INSET } from "./lineInset";
|
||||
import { SPACE, spaceWidth } from "./spaceWidth";
|
||||
import { BRACKET_COLORS, LONG_LINE, bracketScanner, type BracketScanner } from "./rainbowBrackets";
|
||||
|
||||
/** How far (px) a guide sits left of its column, so a caret in that column is right of it (IDEA's indent guide shift). */
|
||||
const GUIDE_SHIFT = 2;
|
||||
|
||||
/** One column of indentation: a space in the editor font, as measured by the guides plugin. */
|
||||
const SPACE = "var(--openidea-space, 1ch)";
|
||||
|
||||
const SPACE_SAMPLE = 64;
|
||||
|
||||
/** Number of `--openidea-guide-<n>` rainbow colours; deeper guides repeat them. */
|
||||
export const GUIDE_COLORS = 5;
|
||||
|
||||
@@ -325,37 +321,20 @@ function build(
|
||||
}
|
||||
|
||||
export const indentGuides: Extension = [
|
||||
spaceWidth,
|
||||
ViewPlugin.fromClass(
|
||||
class {
|
||||
decorations: DecorationSet;
|
||||
private probe: HTMLElement;
|
||||
private brackets: BracketCache[] = [];
|
||||
/** Guide variables of each decorated line, by its start: code lens rows above it repeat them. */
|
||||
private lineVars = new Map<number, { images: string; positions: string }>();
|
||||
private scanner: BracketScanner | null;
|
||||
constructor(readonly view: EditorView) {
|
||||
// Inherits the editor font from the scroller, outside the content CodeMirror observes;
|
||||
// the measured width goes on the scroller, where lines and code lens rows pick it up.
|
||||
this.probe = document.createElement("span");
|
||||
this.probe.setAttribute("aria-hidden", "true");
|
||||
this.probe.style.cssText = "position: absolute; top: 0; left: 0; visibility: hidden; white-space: pre";
|
||||
this.probe.textContent = " ".repeat(SPACE_SAMPLE);
|
||||
view.scrollDOM.appendChild(this.probe);
|
||||
const scanner = bracketScanner(view);
|
||||
this.scanner = scanner;
|
||||
this.decorations = build(view, scanner, this.brackets, this.lineVars);
|
||||
this.measure();
|
||||
this.syncLenses();
|
||||
}
|
||||
measure() {
|
||||
this.view.requestMeasure({
|
||||
key: this,
|
||||
read: (view) => this.probe.getBoundingClientRect().width / (view.scaleX || 1) / SPACE_SAMPLE,
|
||||
write: (width, view) => {
|
||||
if (width > 0) view.scrollDOM.style.setProperty("--openidea-space", `${+width.toFixed(3)}px`);
|
||||
},
|
||||
});
|
||||
}
|
||||
/** Gives code lens rows the guides of the line they annotate, once they are in the DOM. */
|
||||
syncLenses() {
|
||||
this.view.requestMeasure({
|
||||
@@ -379,15 +358,12 @@ export const indentGuides: Extension = [
|
||||
});
|
||||
}
|
||||
destroy() {
|
||||
this.probe.remove();
|
||||
this.view.scrollDOM.style.removeProperty("--openidea-space");
|
||||
for (const el of this.view.contentDOM.querySelectorAll<HTMLElement>(".cm-openidea-lens")) {
|
||||
el.style.removeProperty("--openidea-guide-images");
|
||||
el.style.removeProperty("--openidea-guide-positions");
|
||||
}
|
||||
}
|
||||
update(u: ViewUpdate) {
|
||||
if (u.geometryChanged) this.measure();
|
||||
const scanner = bracketScanner(u.view);
|
||||
// A new scanner (rainbow brackets toggled or reconfigured) may colour blocks differently.
|
||||
const bracketsChanged = scanner !== this.scanner;
|
||||
|
||||
@@ -394,6 +394,11 @@ describe("language modes", () => {
|
||||
return found;
|
||||
}
|
||||
|
||||
it("colours Go's `default` branch like the other keywords", async () => {
|
||||
const support = await loadSupport(findLanguageDescription("Go", "/p/main.go")!);
|
||||
expect(keywords(support!.language, "switch x {\ncase 1:\ndefault:\n}")).toEqual(["switch", "case", "default"]);
|
||||
});
|
||||
|
||||
it("colours TOML keys as keywords in files, lock files and ```toml code blocks", async () => {
|
||||
for (const path of ["/p/Cargo.toml", "/p/uv.lock"]) {
|
||||
const support = await loadSupport(findLanguageDescription("TOML", path)!);
|
||||
|
||||
@@ -420,6 +420,9 @@ export const JAVA_TAGS: Parameters<typeof styleTags>[0] = {
|
||||
this: t.keyword,
|
||||
};
|
||||
|
||||
// @lezer/go leaves `default` uncoloured, unlike `case` and `switch`.
|
||||
const GO_TAGS: Parameters<typeof styleTags>[0] = { default: t.controlKeyword };
|
||||
|
||||
/** Highlighting the stock grammars lack or colour unlike IntelliJ. */
|
||||
const EXTRA_TAGS: Record<string, Parameters<typeof styleTags>[0]> = {
|
||||
JavaScript: JS_TAGS,
|
||||
@@ -437,6 +440,7 @@ const EXTRA_TAGS: Record<string, Parameters<typeof styleTags>[0]> = {
|
||||
"MethodDeclaration/Name FunctionDefinition/Name": t.function(t.definition(t.variableName)),
|
||||
"PropertyDeclaration/VariableDeclarator/VariableName": t.definition(t.propertyName),
|
||||
},
|
||||
Go: GO_TAGS,
|
||||
CSS: CSS_TAGS,
|
||||
SCSS: CSS_TAGS,
|
||||
Sass: CSS_TAGS,
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
import { afterEach, expect, it, vi } from "vitest";
|
||||
import { registerEditorContribution } from "@/editor/api";
|
||||
import { prewarmEditor } from "./prewarm";
|
||||
|
||||
afterEach(() => vi.unstubAllGlobals());
|
||||
|
||||
it("builds an off-screen editor with embedded contributions only, then removes it", () => {
|
||||
let frame: FrameRequestCallback | undefined;
|
||||
vi.stubGlobal("requestAnimationFrame", (f: FrameRequestCallback) => ((frame = f), 1));
|
||||
const seen: string[] = [];
|
||||
const offEmbedded = registerEditorContribution({
|
||||
id: "test.embedded",
|
||||
embedded: true,
|
||||
extensions: (ctx) => (seen.push(`embedded ${ctx.doc}`), []),
|
||||
});
|
||||
const offFile = registerEditorContribution({
|
||||
id: "test.file",
|
||||
extensions: () => (seen.push("file"), []),
|
||||
});
|
||||
try {
|
||||
prewarmEditor();
|
||||
expect(document.querySelectorAll(".cm-editor")).toHaveLength(1);
|
||||
expect(seen).toEqual(["embedded -1"]);
|
||||
frame!(0);
|
||||
expect(document.querySelector(".cm-editor")).toBeNull();
|
||||
expect(document.body.children).toHaveLength(0);
|
||||
} finally {
|
||||
offEmbedded();
|
||||
offFile();
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,55 @@
|
||||
import { EditorState, type Extension } from "@codemirror/state";
|
||||
import { EditorView } from "@codemirror/view";
|
||||
import { editorContributions, type EditorDocContext } from "@/editor/api";
|
||||
import { baseExtensions } from "./setup";
|
||||
|
||||
/**
|
||||
* Builds and drops an off-screen editor with the file editors' setup, so the first file opened
|
||||
* does not also pay for compiling the editor code and mounting its stylesheets. The document is
|
||||
* virtual and empty, and only contributions that accept such editors (`embedded`) take part:
|
||||
* nothing reaches a language server or the file system.
|
||||
*/
|
||||
export function prewarmEditor(): void {
|
||||
const host = document.createElement("div");
|
||||
host.setAttribute("aria-hidden", "true");
|
||||
host.style.cssText = "position:fixed;left:-10000px;top:0;width:480px;height:240px;visibility:hidden;contain:strict";
|
||||
document.body.appendChild(host);
|
||||
const ctx: EditorDocContext = {
|
||||
doc: -1,
|
||||
path: "prewarm.txt",
|
||||
language: "plaintext",
|
||||
uiMode: null,
|
||||
readOnly: true,
|
||||
virtual: true,
|
||||
};
|
||||
const contributions: Extension[] = [];
|
||||
for (const c of editorContributions()) {
|
||||
if (!c.embedded) continue;
|
||||
try {
|
||||
contributions.push(c.extensions(ctx));
|
||||
} catch {
|
||||
// Warming is best effort: the real editor reports a failing contribution.
|
||||
}
|
||||
}
|
||||
const view = new EditorView({
|
||||
parent: host,
|
||||
state: EditorState.create({
|
||||
doc: "",
|
||||
extensions: baseExtensions({
|
||||
ctx,
|
||||
settings: undefined,
|
||||
info: undefined,
|
||||
language: null,
|
||||
docLength: 0,
|
||||
indent: { tabSize: 4, insertSpaces: true },
|
||||
wrapOverride: false,
|
||||
contributions,
|
||||
}),
|
||||
}),
|
||||
});
|
||||
// One frame so its measure pass runs too, then nothing of it is left behind.
|
||||
requestAnimationFrame(() => {
|
||||
view.destroy();
|
||||
host.remove();
|
||||
});
|
||||
}
|
||||
@@ -189,7 +189,7 @@ it("indents by the code's character width, so a font size change keeps it in lin
|
||||
const v = open(true, ["class A {", "\t/**", "\t * Books.", "\t */", "\tvoid book() {}", "}"].join("\n"));
|
||||
const body = v.dom.querySelector<HTMLElement>(".cm-openidea-renderedDoc")!;
|
||||
// A tab is a tab size of columns, not one character.
|
||||
expect(body.style.marginLeft).toContain(`${v.state.tabSize} * var(--openidea-doc-char`);
|
||||
expect(body.style.marginLeft).toContain(`${v.state.tabSize} * var(--openidea-space`);
|
||||
});
|
||||
|
||||
it("forgets a flip whose comment is deleted, so the feature turns off again", async () => {
|
||||
|
||||
@@ -61,6 +61,7 @@ import { tx, useI18n } from "@/platform/i18n";
|
||||
import { loadMarkdown, markupToHtml } from "@/editor/lsp/markdown";
|
||||
import { hasContent, renderDoc, type DocComment, type DocStyle, type RenderedDoc } from "./docRender";
|
||||
import { LINE_INSET } from "./lineInset";
|
||||
import { SPACE, spaceWidth } from "./spaceWidth";
|
||||
|
||||
/** The file's default: render its doc comments or not. */
|
||||
export const renderDocComments = Facet.define<boolean, boolean>({
|
||||
@@ -320,9 +321,9 @@ class DocWidget extends WidgetType {
|
||||
const titles = doc.sections.map(sectionTitle);
|
||||
const dom = document.createElement("div");
|
||||
dom.className = "cm-openidea-renderedDoc";
|
||||
// In the code's character width, which `docMetrics` keeps current: the DOM stays
|
||||
// right through a font size change or zoom, which does not draw the widget again.
|
||||
const left = `(${this.indent} * var(--openidea-doc-char, 1ch) + ${LINE_INSET}px)`;
|
||||
// In columns of the code's font (`spaceWidth`): the DOM stays right through a font
|
||||
// size change or zoom, which does not draw the widget again.
|
||||
const left = `(${this.indent} * ${SPACE} + ${LINE_INSET}px)`;
|
||||
dom.style.marginLeft = `calc${left}`;
|
||||
// The content is as wide as its longest line; the comment wraps at the visible width instead.
|
||||
dom.style.maxWidth = `calc(var(--openidea-doc-width, 100%) - ${left} - ${DOC_RIGHT_GAP}px)`;
|
||||
@@ -827,12 +828,10 @@ export function toggleRenderedViewAtCaret(view: EditorView): boolean {
|
||||
const DOC_RIGHT_GAP = 24;
|
||||
|
||||
/**
|
||||
* Publishes on the content the visible width of the text area, `--openidea-doc-width`,
|
||||
* and the code's character width, `--openidea-doc-char`. A block widget is as wide as
|
||||
* the content, which without soft wraps is as wide as the longest line, so a rendered
|
||||
* comment needs the first to wrap where the reader can see, as IDEA's does; it indents
|
||||
* by the second, which a font size change or zoom changes. Horizontal scrolling leaves
|
||||
* both unchanged.
|
||||
* Publishes on the content the visible width of the text area, `--openidea-doc-width`.
|
||||
* A block widget is as wide as the content, which without soft wraps is as wide as the
|
||||
* longest line, so a rendered comment needs it to wrap where the reader can see.
|
||||
* Scrolling leaves it unchanged, so lines are not restyled while scrolling.
|
||||
*/
|
||||
const docMetrics = ViewPlugin.fromClass(
|
||||
class {
|
||||
@@ -845,18 +844,12 @@ const docMetrics = ViewPlugin.fromClass(
|
||||
measure() {
|
||||
this.view.requestMeasure({
|
||||
key: this,
|
||||
read: (view) => ({
|
||||
width: view.scrollDOM.clientWidth - view.contentDOM.offsetLeft,
|
||||
char: view.defaultCharacterWidth,
|
||||
}),
|
||||
write: ({ width, char }, view) => {
|
||||
read: (view) => view.scrollDOM.clientWidth - view.contentDOM.offsetLeft,
|
||||
write: (width, view) => {
|
||||
const style = view.contentDOM.style;
|
||||
const widthValue = `${Math.max(0, Math.floor(width))}px`;
|
||||
if (style.getPropertyValue("--openidea-doc-width") !== widthValue)
|
||||
style.setProperty("--openidea-doc-width", widthValue);
|
||||
const charValue = `${char}px`;
|
||||
if (style.getPropertyValue("--openidea-doc-char") !== charValue)
|
||||
style.setProperty("--openidea-doc-char", charValue);
|
||||
const value = `${Math.max(0, Math.floor(width))}px`;
|
||||
if (style.getPropertyValue("--openidea-doc-width") !== value)
|
||||
style.setProperty("--openidea-doc-width", value);
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -947,5 +940,6 @@ export const renderedDocsExtension: Extension = [
|
||||
markdownReady,
|
||||
languageWatcher,
|
||||
docMetrics,
|
||||
spaceWidth,
|
||||
docsTheme,
|
||||
];
|
||||
@@ -0,0 +1,51 @@
|
||||
/**
|
||||
* The editor font's space width, published on the scroller as `--openidea-space`
|
||||
* for anything laid out in columns of indentation (indent guides, code lens rows,
|
||||
* rendered doc comments). A space is measured, not `ch`: in a proportional font it
|
||||
* is narrower than "0". The probe's text is fixed, so the value only changes with
|
||||
* the font, its size or zoom; `defaultCharacterWidth` is sampled from whichever
|
||||
* line is in view and drifts while scrolling, and an inherited variable that
|
||||
* changes restyles every line.
|
||||
*/
|
||||
import { EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view";
|
||||
|
||||
/** One column of indentation, as a CSS length. */
|
||||
export const SPACE = "var(--openidea-space, 1ch)";
|
||||
|
||||
const SAMPLE = 64;
|
||||
|
||||
/** Shared by every extension that lays out by `SPACE`; CodeMirror installs it once. */
|
||||
export const spaceWidth = ViewPlugin.fromClass(
|
||||
class {
|
||||
private probe: HTMLElement;
|
||||
private written = "";
|
||||
constructor(readonly view: EditorView) {
|
||||
// Inherits the editor font from the scroller, outside the content CodeMirror observes.
|
||||
this.probe = document.createElement("span");
|
||||
this.probe.setAttribute("aria-hidden", "true");
|
||||
this.probe.style.cssText = "position: absolute; top: 0; left: 0; visibility: hidden; white-space: pre";
|
||||
this.probe.textContent = " ".repeat(SAMPLE);
|
||||
view.scrollDOM.appendChild(this.probe);
|
||||
this.measure();
|
||||
}
|
||||
measure() {
|
||||
this.view.requestMeasure({
|
||||
key: this,
|
||||
read: (view) => this.probe.getBoundingClientRect().width / (view.scaleX || 1) / SAMPLE,
|
||||
write: (width, view) => {
|
||||
const value = `${+width.toFixed(3)}px`;
|
||||
if (width <= 0 || value === this.written) return;
|
||||
this.written = value;
|
||||
view.scrollDOM.style.setProperty("--openidea-space", value);
|
||||
},
|
||||
});
|
||||
}
|
||||
update(u: ViewUpdate) {
|
||||
if (u.geometryChanged) this.measure();
|
||||
}
|
||||
destroy() {
|
||||
this.probe.remove();
|
||||
this.view.scrollDOM.style.removeProperty("--openidea-space");
|
||||
}
|
||||
},
|
||||
);
|
||||
@@ -276,14 +276,23 @@ export const openideaTheme = EditorView.theme({
|
||||
},
|
||||
".cm-openidea-laneDeleted": {
|
||||
position: "absolute",
|
||||
left: "0",
|
||||
top: "-3px",
|
||||
left: "-4px",
|
||||
top: "-6px",
|
||||
width: "12px",
|
||||
height: "12px",
|
||||
cursor: "pointer",
|
||||
zIndex: "1",
|
||||
},
|
||||
".cm-openidea-laneDeleted::after": {
|
||||
content: '""',
|
||||
position: "absolute",
|
||||
left: "4px",
|
||||
top: "3px",
|
||||
width: "0",
|
||||
height: "0",
|
||||
borderTop: "3px solid transparent",
|
||||
borderBottom: "3px solid transparent",
|
||||
borderLeft: "6px solid var(--lane-color)",
|
||||
zIndex: "1",
|
||||
},
|
||||
".cm-foldGutter": { width: "16px" },
|
||||
".cm-foldGutter .cm-gutterElement": {
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { EditorController, openFilePaths, useEditorStatus, useTabs } from "./controller";
|
||||
import { EditorController, openFilePaths, useEditorStatus, useTabErrors, useTabs } from "./controller";
|
||||
import { createMemoryBackend } from "./backend";
|
||||
import { initialTabsState } from "./model/tabs";
|
||||
import { useDocMeta } from "./model/document";
|
||||
import { storeSession } from "./model/session";
|
||||
import { resetDistractionFree, setDistractionFree } from "@/workbench/distractionFree";
|
||||
import * as contributions from "@/workbench/contributions";
|
||||
import {
|
||||
registerEditorKind,
|
||||
registerTextEditorWrapper,
|
||||
@@ -11,6 +13,7 @@ import {
|
||||
useProjectViewLead,
|
||||
} from "@/workbench/contributions";
|
||||
import { registerActions } from "@/platform/actions";
|
||||
import { IpcError, type ErrorKind } from "@/platform/ipc";
|
||||
import { useProject } from "@/platform/project";
|
||||
import { useRemote } from "@/platform/remote";
|
||||
import { hideContextMenu, resolveMenuItems, useContextMenuStore } from "@/ui";
|
||||
@@ -29,6 +32,75 @@ afterEach(() => {
|
||||
useEditorStatus.setState({ status: null });
|
||||
});
|
||||
|
||||
describe("restoring an editor session", () => {
|
||||
const root = "/session-restore";
|
||||
const existing = `${root}/existing.txt`;
|
||||
const unavailable = `${root}/unavailable.txt`;
|
||||
const text = "first\nsecond";
|
||||
let controller: EditorController | undefined;
|
||||
|
||||
afterEach(() => {
|
||||
controller?.stop();
|
||||
controller = undefined;
|
||||
storeSession(root, null);
|
||||
useTabErrors.setState({}, true);
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
async function restoreWithOpenError(kind: ErrorKind, message: string) {
|
||||
storeSession(root, {
|
||||
version: 1,
|
||||
layout: { kind: "pane", tabs: [{ path: existing }, { path: unavailable }], active: 1 },
|
||||
activePane: 0,
|
||||
files: { [existing]: { anchor: 6, head: 6 } },
|
||||
});
|
||||
const backend = createMemoryBackend({ [existing]: text });
|
||||
// For an absent path the memory backend serves sample text, not a disk error.
|
||||
const open = backend.open.bind(backend);
|
||||
vi.spyOn(backend, "open").mockImplementation(async (path) => {
|
||||
if (path === unavailable) throw new IpcError({ kind, message });
|
||||
return open(path);
|
||||
});
|
||||
const editor = (controller = new EditorController(backend));
|
||||
editor.start();
|
||||
|
||||
const restoring = editor.restoreSession(root);
|
||||
const state = useTabs.getState();
|
||||
const selected = state.panes[state.activePane]!.active!;
|
||||
// Restore opens the selected tab in the background. Join the same slot request.
|
||||
await Promise.all([restoring, editor.ensureSlot(selected)]);
|
||||
return { editor, selected };
|
||||
}
|
||||
|
||||
it("silently drops a deleted selected file and restores the remaining tab", async () => {
|
||||
const notify = vi.fn();
|
||||
vi.spyOn(contributions, "notifications").mockReturnValue({ notify });
|
||||
const { editor, selected } = await restoreWithOpenError("notFound", `No such file: ${unavailable}`);
|
||||
|
||||
expect(notify).not.toHaveBeenCalled();
|
||||
expect(useTabErrors.getState()).toEqual({});
|
||||
expect(openFilePaths(useTabs.getState())).toEqual([existing]);
|
||||
expect(editor.slotFor(selected)).toBeNull();
|
||||
expect(editor.activeInput()?.path).toBe(existing);
|
||||
|
||||
// In the app the visible tab's editor host requests this slot after selection changes.
|
||||
const state = useTabs.getState();
|
||||
const slot = await editor.ensureSlot(state.panes[state.activePane]!.active!);
|
||||
expect(slot?.model.path).toBe(existing);
|
||||
expect(slot?.state.doc.toString()).toBe(text);
|
||||
expect(slot?.caret()).toMatchObject({ line: 1, col: 0 });
|
||||
});
|
||||
|
||||
it("keeps a tab and reports its open error when access is denied", async () => {
|
||||
const message = `Permission denied: ${unavailable}`;
|
||||
const { editor, selected } = await restoreWithOpenError("permissionDenied", message);
|
||||
|
||||
expect(openFilePaths(useTabs.getState())).toEqual([existing, unavailable]);
|
||||
expect(editor.activeInput()?.path).toBe(unavailable);
|
||||
expect(useTabErrors.getState()).toEqual({ [selected]: message });
|
||||
});
|
||||
});
|
||||
|
||||
describe("EditorController", () => {
|
||||
it("returns navigation context to the editor when activating a non-text tab", async () => {
|
||||
ctrl = new EditorController(createMemoryBackend({ "/p/a.ts": "one\n" }));
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import {
|
||||
initialTabsState,
|
||||
moveTabToNewSplit,
|
||||
@@ -9,7 +9,15 @@ import {
|
||||
togglePin,
|
||||
type TabsState,
|
||||
} from "./tabs";
|
||||
import { loadSession, parseSession, restoreTabsState, serializeSession, slashPath } from "./session";
|
||||
import {
|
||||
loadSession,
|
||||
parseSession,
|
||||
restoreTabsState,
|
||||
serializeSession,
|
||||
slashPath,
|
||||
storeSession,
|
||||
type EditorSession,
|
||||
} from "./session";
|
||||
|
||||
const file = (path: string) => ({ kind: "file", key: `file:${path}`, path });
|
||||
const fileKey = (p: string) => `file:${p}`;
|
||||
@@ -103,6 +111,44 @@ describe("editor session", () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe("loading a session with malformed JSON", () => {
|
||||
const root = "/malformed-session";
|
||||
const key = `openidea.editorSession.v1:${root}`;
|
||||
const malformed = '{"version":1,"layout":{"kind":"pane","tabs":[';
|
||||
|
||||
beforeEach(() => localStorage.setItem(key, malformed));
|
||||
afterEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
localStorage.removeItem(key);
|
||||
});
|
||||
|
||||
it("returns null without writing to storage or changing the saved bytes", () => {
|
||||
const before = localStorage.getItem(key);
|
||||
expect(before).toBe(malformed);
|
||||
const setItem = vi.spyOn(Storage.prototype, "setItem");
|
||||
|
||||
expect(loadSession(root)).toBeNull();
|
||||
expect(localStorage.getItem(key)).toBe(before);
|
||||
expect(setItem).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("loads a valid session after an explicit save replaces malformed JSON", () => {
|
||||
expect(loadSession(root)).toBeNull();
|
||||
const path = `${root}/recovered.ts`;
|
||||
const recovered: EditorSession = {
|
||||
version: 1,
|
||||
layout: { kind: "pane", tabs: [{ path }], active: 0 },
|
||||
activePane: 0,
|
||||
files: { [path]: { anchor: 1, head: 2 } },
|
||||
};
|
||||
|
||||
storeSession(root, recovered);
|
||||
|
||||
expect(JSON.parse(localStorage.getItem(key)!)).toEqual(recovered);
|
||||
expect(loadSession(root)).toEqual(recovered);
|
||||
});
|
||||
});
|
||||
|
||||
describe("moveTabToNewSplit", () => {
|
||||
it("moves a tab into a new pane on the given edge", () => {
|
||||
let s = initialTabsState();
|
||||
|
||||
@@ -61,6 +61,20 @@ export interface Reveal {
|
||||
const KEPT_VIEWS = 8;
|
||||
const keptSlots: EditorSlot[] = [];
|
||||
|
||||
/**
|
||||
* Holds the visible tabs' tooltip layers. A layer added to `document.body` itself on every
|
||||
* tab switch would change which element is the body's last child, and Chromium then
|
||||
* restyles the whole workbench (`:last-child` rules); inside this host it restyles nothing else.
|
||||
*/
|
||||
let tooltipHost: HTMLElement | null = null;
|
||||
function tooltipHostElement(): HTMLElement {
|
||||
if (!tooltipHost?.isConnected) {
|
||||
tooltipHost = document.createElement("div");
|
||||
document.body.appendChild(tooltipHost);
|
||||
}
|
||||
return tooltipHost;
|
||||
}
|
||||
|
||||
export class EditorSlot {
|
||||
private stored: EditorState;
|
||||
private historyTarget: WorkspaceHistoryTarget;
|
||||
@@ -70,7 +84,7 @@ export class EditorSlot {
|
||||
/** The view kept, detached from the document, while the tab is hidden. */
|
||||
private kept: EditorView | null = null;
|
||||
/**
|
||||
* The tab's tooltips (hints, hover, completion…). They live outside the view, in `document.body`,
|
||||
* The tab's tooltips (hints, hover, completion…). They live outside the view, under `document.body`,
|
||||
* so they leave the page with the view when the tab is hidden instead of floating over the next tab.
|
||||
*/
|
||||
private readonly tooltipLayer = typeof document === "undefined" ? null : document.createElement("div");
|
||||
@@ -207,7 +221,7 @@ export class EditorSlot {
|
||||
|
||||
mount(parent: HTMLElement): EditorView {
|
||||
if (this.view) return this.view;
|
||||
if (this.tooltipLayer && !this.tooltipLayer.isConnected) document.body.appendChild(this.tooltipLayer);
|
||||
if (this.tooltipLayer && !this.tooltipLayer.isConnected) tooltipHostElement().appendChild(this.tooltipLayer);
|
||||
const kept = this.kept;
|
||||
let view: EditorView;
|
||||
if (kept) {
|
||||
|
||||
@@ -568,7 +568,8 @@ function EditorTabActions({ paneId, tab }: { paneId: string; tab: Tab }) {
|
||||
anchor={moreRef}
|
||||
placement="bottom-end"
|
||||
aria-label="Tab actions"
|
||||
items={ctrl.tabMenu(paneId, tab)}
|
||||
// Built when shown: every tab render (each open and switch) would otherwise assemble the whole menu.
|
||||
items={open ? ctrl.tabMenu(paneId, tab) : []}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -11,15 +11,37 @@
|
||||
.body {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-2);
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
padding: var(--space-3);
|
||||
}
|
||||
|
||||
.split {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.history {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1);
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
padding-bottom: var(--space-2);
|
||||
}
|
||||
|
||||
.toolbar {
|
||||
display: flex;
|
||||
flex: none;
|
||||
align-items: center;
|
||||
gap: var(--space-2);
|
||||
}
|
||||
|
||||
.filter {
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.list {
|
||||
flex: 2;
|
||||
min-height: 84px;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.label {
|
||||
@@ -27,7 +49,9 @@
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
font-family: var(--font-mono);
|
||||
font-family: var(--paste-history-font-family, var(--font-mono));
|
||||
font-size: var(--paste-history-font-size, var(--fs-code));
|
||||
font-weight: var(--paste-history-font-weight, normal);
|
||||
}
|
||||
|
||||
.detail {
|
||||
@@ -36,8 +60,12 @@
|
||||
font-size: var(--fs-small);
|
||||
}
|
||||
|
||||
.previewPanel {
|
||||
padding-top: var(--space-2);
|
||||
}
|
||||
|
||||
.preview {
|
||||
flex: 3;
|
||||
height: 100%;
|
||||
min-height: 0;
|
||||
overflow: hidden;
|
||||
border: 1px solid var(--border-strong);
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useEffect, useLayoutEffect, useRef, useState, type KeyboardEvent } from "react";
|
||||
import { useEffect, useLayoutEffect, useRef, useState, type CSSProperties, type KeyboardEvent } from "react";
|
||||
import { create } from "zustand";
|
||||
import { EditorState } from "@codemirror/state";
|
||||
import { EditorView, highlightSpecialChars, lineNumbers } from "@codemirror/view";
|
||||
import { EditorView, highlightSpecialChars } from "@codemirror/view";
|
||||
import { language, syntaxHighlighting } from "@codemirror/language";
|
||||
import { tx } from "@/platform/i18n";
|
||||
import { isImeKey } from "@/platform/ime";
|
||||
@@ -9,11 +9,14 @@ import { executeAction, registerActions } from "@/platform/actions";
|
||||
import { setContext } from "@/platform/context";
|
||||
import { bindingsFor, normalizeBinding, strokeOf } from "@/platform/keymap";
|
||||
import {
|
||||
Button,
|
||||
Dialog,
|
||||
IconButton,
|
||||
List,
|
||||
SearchField,
|
||||
SINGLE_FIRST,
|
||||
SplitGroup,
|
||||
SplitHandle,
|
||||
SplitPanel,
|
||||
T,
|
||||
isRowSelected,
|
||||
listNavigate,
|
||||
@@ -22,9 +25,11 @@ import {
|
||||
selectableText,
|
||||
selectedRows,
|
||||
} from "@/ui";
|
||||
import { useRowHeight } from "@/ui/density";
|
||||
import { clipLabel, clipboardHistory, removeClipboardEntries } from "../clipboardHistory";
|
||||
import { openideaHighlightStyle } from "../cm/highlight";
|
||||
import { compartments } from "../cm/setup";
|
||||
import { fontZoom } from "../cm/prefs";
|
||||
import { openideaTheme } from "../cm/theme";
|
||||
import styles from "./PasteHistoryDialog.module.css";
|
||||
|
||||
@@ -82,6 +87,11 @@ function PasteHistoryDialog({ view, paste, onClose }: Request & { onClose: () =>
|
||||
const [entries, setEntries] = useState(clipboardHistory);
|
||||
const [query, setQuery] = useState("");
|
||||
const [selection, setSelection] = useState(SINGLE_FIRST);
|
||||
const [editorFont] = useState(() => {
|
||||
const { fontFamily, fontSize, fontWeight } = getComputedStyle(view.contentDOM);
|
||||
return { fontFamily, fontSize, fontWeight };
|
||||
});
|
||||
const rowHeight = Math.max(useRowHeight(), Math.ceil(Number.parseFloat(editorFont.fontSize) || 0) + 8);
|
||||
const search = useRef<HTMLInputElement>(null);
|
||||
const rows = entries
|
||||
.filter(({ text }) => text.toLocaleLowerCase().includes(query.toLocaleLowerCase()))
|
||||
@@ -156,7 +166,7 @@ function PasteHistoryDialog({ view, paste, onClose }: Request & { onClose: () =>
|
||||
title="Choose Content to Paste"
|
||||
onClose={onClose}
|
||||
className={styles.dialog}
|
||||
width={680}
|
||||
width={560}
|
||||
resizable="both"
|
||||
minWidth={360}
|
||||
minHeight={320}
|
||||
@@ -169,48 +179,63 @@ function PasteHistoryDialog({ view, paste, onClose }: Request & { onClose: () =>
|
||||
},
|
||||
{ label: "Cancel", role: "cancel" },
|
||||
]}
|
||||
footerStart={
|
||||
<Button disabled={!selected.length} onClick={runRemove}>
|
||||
<T>Delete</T>
|
||||
</Button>
|
||||
}
|
||||
>
|
||||
<div
|
||||
className={styles.body}
|
||||
style={
|
||||
{
|
||||
"--paste-history-font-family": editorFont.fontFamily,
|
||||
"--paste-history-font-size": editorFont.fontSize,
|
||||
"--paste-history-font-weight": editorFont.fontWeight,
|
||||
} as CSSProperties
|
||||
}
|
||||
onKeyDown={onKeyDown}
|
||||
onFocusCapture={(e) => setContext("pasteHistoryListFocus", !!e.target.closest('[role="listbox"]'))}
|
||||
onBlurCapture={() => setContext("pasteHistoryListFocus", false)}
|
||||
>
|
||||
<SearchField
|
||||
ref={search}
|
||||
data-autofocus=""
|
||||
aria-label="Filter clipboard history"
|
||||
placeholder="Filter clipboard history"
|
||||
value={query}
|
||||
onChange={filter}
|
||||
/>
|
||||
<List
|
||||
items={rows}
|
||||
getKey={(row) => row.key}
|
||||
activeIndex={selection.lead}
|
||||
onSelect={(index, e) => setSelection(selectRow(rows, selection, index, rowSelectionMode(e)))}
|
||||
isSelected={(row) => isRowSelected(selection, row.key)}
|
||||
onActivate={(row, _index, e) => {
|
||||
if (e.type === "keydown") runPaste();
|
||||
else if (e.detail === 2) runPaste(row.key);
|
||||
}}
|
||||
rowHeight={28}
|
||||
className={styles.list}
|
||||
aria-label={tx("Clipboard history")}
|
||||
empty={<T>{entries.length ? "No matches" : "Nothing to paste: the clipboard history is empty"}</T>}
|
||||
renderItem={(row) => (
|
||||
<>
|
||||
<span className={styles.label}>{row.label}</span>
|
||||
<span className={styles.detail}>{row.detail ?? tx("1 line")}</span>
|
||||
</>
|
||||
)}
|
||||
/>
|
||||
<PastePreview source={view} text={preview} />
|
||||
<SplitGroup orientation="vertical" storageKey="openidea.editor.pasteHistory" className={styles.split}>
|
||||
<SplitPanel id="clipboard" defaultSize="30%" minSize="96px">
|
||||
<div className={styles.history}>
|
||||
<div className={styles.toolbar}>
|
||||
<IconButton icon="minus" size="small" title="Delete" disabled={!selected.length} onClick={runRemove} />
|
||||
<SearchField
|
||||
ref={search}
|
||||
className={styles.filter}
|
||||
data-autofocus=""
|
||||
aria-label="Filter clipboard history"
|
||||
placeholder="Filter clipboard history"
|
||||
value={query}
|
||||
onChange={filter}
|
||||
/>
|
||||
</div>
|
||||
<List
|
||||
items={rows}
|
||||
getKey={(row) => row.key}
|
||||
activeIndex={selection.lead}
|
||||
onSelect={(index, e) => setSelection(selectRow(rows, selection, index, rowSelectionMode(e)))}
|
||||
isSelected={(row) => isRowSelected(selection, row.key)}
|
||||
onActivate={(row, _index, e) => {
|
||||
if (e.type === "keydown") runPaste();
|
||||
else if (e.detail === 2) runPaste(row.key);
|
||||
}}
|
||||
rowHeight={rowHeight}
|
||||
className={styles.list}
|
||||
aria-label={tx("Clipboard history")}
|
||||
empty={<T>{entries.length ? "No matches" : "Nothing to paste: the clipboard history is empty"}</T>}
|
||||
renderItem={(row) => (
|
||||
<>
|
||||
<span className={styles.label}>{row.label}</span>
|
||||
<span className={styles.detail}>{row.detail ?? tx("1 line")}</span>
|
||||
</>
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</SplitPanel>
|
||||
<SplitHandle aria-label={tx("Resize paste preview")} />
|
||||
<SplitPanel id="preview" defaultSize="70%" minSize="100px" className={styles.previewPanel}>
|
||||
<PastePreview source={view} text={preview} />
|
||||
</SplitPanel>
|
||||
</SplitGroup>
|
||||
</div>
|
||||
</Dialog>
|
||||
);
|
||||
@@ -228,11 +253,11 @@ function PastePreview({ source, text }: { source: EditorView; text: string }) {
|
||||
syntaxHighlighting(openideaHighlightStyle),
|
||||
source.state.facet(language)?.extension ?? [],
|
||||
compartments.font.get(source.state) ?? [],
|
||||
fontZoom.init(() => source.state.field(fontZoom, false) ?? 0),
|
||||
EditorState.tabSize.of(source.state.tabSize),
|
||||
EditorState.readOnly.of(true),
|
||||
EditorView.editable.of(false),
|
||||
EditorView.contentAttributes.of({ "aria-label": tx("Paste preview"), class: selectableText, tabindex: "0" }),
|
||||
lineNumbers(),
|
||||
highlightSpecialChars(),
|
||||
],
|
||||
}),
|
||||
|
||||
@@ -2,8 +2,9 @@
|
||||
* The documentation view with its history toolbar, as IDEA's one documentation
|
||||
* component: the F1 popup, the hover and the Documentation tool window show it.
|
||||
*/
|
||||
import { useEffect, useRef, type KeyboardEvent } from "react";
|
||||
import { useLayoutEffect, useRef, type KeyboardEvent } from "react";
|
||||
import { createRoot } from "react-dom/client";
|
||||
import { flushSync } from "react-dom";
|
||||
import clsx from "clsx";
|
||||
import { useStore } from "zustand";
|
||||
import { IconButton, selectableText } from "@/ui";
|
||||
@@ -23,7 +24,9 @@ import styles from "./Popups.module.css";
|
||||
|
||||
export function DomContent({ build, className }: { build: () => HTMLElement; className?: string }) {
|
||||
const ref = useRef<HTMLDivElement>(null);
|
||||
useEffect(() => {
|
||||
// Build the body before paint: the popup is measured as soon as it is created, so an empty first
|
||||
// frame would be placed and then moved once the text appeared.
|
||||
useLayoutEffect(() => {
|
||||
const el = ref.current;
|
||||
if (!el) return;
|
||||
const node = build();
|
||||
@@ -113,6 +116,8 @@ function HoverDocView({ doc }: { doc: HoverDoc }) {
|
||||
/** Mounts a hover's documentation into its CodeMirror tooltip; returns its unmount. */
|
||||
export function mountHoverDoc(el: HTMLElement, doc: HoverDoc): () => void {
|
||||
const root = createRoot(el);
|
||||
root.render(<HoverDocView doc={doc} />);
|
||||
// Render before returning: CodeMirror measures the tooltip right after `create()`, so a popup
|
||||
// that is still empty at that point is placed a second time when the text arrives.
|
||||
flushSync(() => root.render(<HoverDocView doc={doc} />));
|
||||
return () => queueMicrotask(() => root.unmount());
|
||||
}
|
||||
@@ -553,33 +553,6 @@
|
||||
}
|
||||
|
||||
/* Dialog bodies get no padding of their own; wrap the groups like Analysis dialogs' .form. */
|
||||
.reformatBody {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 14px;
|
||||
}
|
||||
.reformatGroup {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: var(--space-1-5);
|
||||
}
|
||||
.reformatLegend {
|
||||
margin-bottom: 6px;
|
||||
padding: 0;
|
||||
font-size: var(--fs-small);
|
||||
color: var(--fg-subtle);
|
||||
}
|
||||
.reformatOption {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: var(--space-1-5);
|
||||
font-size: var(--fs-ui);
|
||||
}
|
||||
|
||||
.pasteImports {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { act, fireEvent, render, screen } from "@testing-library/react";
|
||||
import { act, fireEvent, render, screen, within } from "@testing-library/react";
|
||||
import type { Location } from "@/bindings";
|
||||
|
||||
const openFile = vi.fn(async () => undefined);
|
||||
@@ -19,7 +19,6 @@ const { closePopup, openPopup, useLspPopup } = await import("./popupStore");
|
||||
const { useDocWindow, hoverDoc, pushHistory, stepHistory, hoverCandidates } = await import("./docs");
|
||||
const { mountHoverDoc } = await import("./DocView");
|
||||
const { hoverSource } = await import("./hover");
|
||||
import popupStyles from "./Popups.module.css";
|
||||
import { registerImportsOnPasteActions } from "./importsOnPaste";
|
||||
import { EditorState } from "@codemirror/state";
|
||||
import { EditorView } from "@codemirror/view";
|
||||
@@ -262,7 +261,7 @@ describe("hover documentation", () => {
|
||||
const frame = (el: Element) => el.querySelector<HTMLElement>('[data-lsp-doc="hover"]')!;
|
||||
afterEach(() => document.body.replaceChildren());
|
||||
|
||||
it("shows the hovered documentation in the same view as F1's", async () => {
|
||||
it("shows the hovered documentation in the same view as F1's, laid out when create() returns", async () => {
|
||||
const docHover: ContributedHover = (state, pos) => {
|
||||
const w = state.wordAt(pos);
|
||||
return w ? { from: w.from, to: w.to, markdown: "hovered docs" } : null;
|
||||
@@ -276,11 +275,13 @@ describe("hover documentation", () => {
|
||||
});
|
||||
const tooltip = await hoverSource(view, 2);
|
||||
let created!: { dom: HTMLElement; destroy: () => void };
|
||||
await act(async () => {
|
||||
// Asserted inside a synchronous act(): `create()` has to leave a laid-out popup behind, since
|
||||
// CodeMirror places the tooltip in the measure pass that follows it.
|
||||
act(() => {
|
||||
created = tooltip!.create() as typeof created;
|
||||
document.body.appendChild(created.dom);
|
||||
expect(frame(created.dom).textContent).toContain("hovered docs");
|
||||
});
|
||||
expect(frame(created.dom).textContent).toContain("hovered docs");
|
||||
await act(async () => void document.body.appendChild(created.dom));
|
||||
expect(screen.getByRole("button", { name: "Back" })).toBeTruthy();
|
||||
created.destroy();
|
||||
view.destroy();
|
||||
@@ -352,7 +353,7 @@ describe("quick definition popup", () => {
|
||||
});
|
||||
|
||||
describe("reformat dialog", () => {
|
||||
it("wraps its content in the padded body", () => {
|
||||
it("offers only whole-file formatting when the editor has no selection", () => {
|
||||
const onRun = vi.fn();
|
||||
openPopup({
|
||||
kind: "reformat",
|
||||
@@ -363,9 +364,10 @@ describe("reformat dialog", () => {
|
||||
onRun,
|
||||
});
|
||||
render(<LspPopups />);
|
||||
const body = screen.getByRole("dialog", { name: "Reformat File" }).querySelector("[data-dialog-body]")!;
|
||||
expect(body.firstElementChild).toHaveClass(popupStyles.reformatBody!);
|
||||
expect(body.firstElementChild!.querySelectorAll("fieldset")).toHaveLength(2);
|
||||
const scope = within(screen.getByRole("group", { name: "Scope" }));
|
||||
expect(scope.getByRole("radio", { name: "Selected text" })).toBeDisabled();
|
||||
expect(scope.getByRole("radio", { name: "Whole file" })).toBeChecked();
|
||||
expect(within(screen.getByRole("group", { name: "Options" })).getByRole("checkbox")).not.toBeChecked();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Run" }));
|
||||
expect(onRun).toHaveBeenCalledWith({ selectionOnly: false, optimizeImports: false });
|
||||
});
|
||||
|
||||
@@ -11,6 +11,7 @@ import {
|
||||
List,
|
||||
MenuList,
|
||||
Popup,
|
||||
Radio,
|
||||
Select,
|
||||
Spinner,
|
||||
SymbolBadge,
|
||||
@@ -35,6 +36,7 @@ import { renderCode } from "./markdown";
|
||||
import { describeSummary } from "./workspaceEdit";
|
||||
import { useUsagesStatus } from "./navigation";
|
||||
import styles from "./Popups.module.css";
|
||||
import fieldsetStyles from "@/ui/DialogFieldset.module.css";
|
||||
import { tx } from "@/platform/i18n";
|
||||
import { executeAction } from "@/platform/actions";
|
||||
|
||||
@@ -681,7 +683,7 @@ function ReformatDialog({ popup }: { popup: Extract<LspPopup, { kind: "reformat"
|
||||
open
|
||||
onClose={closePopup}
|
||||
title={popup.title}
|
||||
width={380}
|
||||
width={400}
|
||||
buttons={[
|
||||
{
|
||||
label: "Run",
|
||||
@@ -695,33 +697,27 @@ function ReformatDialog({ popup }: { popup: Extract<LspPopup, { kind: "reformat"
|
||||
{ label: "Cancel", role: "cancel" },
|
||||
]}
|
||||
>
|
||||
<div className={styles.reformatBody}>
|
||||
<fieldset className={styles.reformatGroup}>
|
||||
<legend className={styles.reformatLegend}>
|
||||
<div className={fieldsetStyles.body}>
|
||||
<fieldset className={fieldsetStyles.group}>
|
||||
<legend className={fieldsetStyles.legend}>
|
||||
<T>Scope</T>
|
||||
</legend>
|
||||
<label className={styles.reformatOption}>
|
||||
<input
|
||||
type="radio"
|
||||
name="reformat-scope"
|
||||
checked={!selectionOnly}
|
||||
onChange={() => setSelectionOnly(false)}
|
||||
/>
|
||||
<T>Whole file</T>
|
||||
</label>
|
||||
<label className={clsx(styles.reformatOption, !popup.hasSelection && styles.disabled)}>
|
||||
<input
|
||||
type="radio"
|
||||
name="reformat-scope"
|
||||
checked={selectionOnly}
|
||||
disabled={!popup.hasSelection}
|
||||
onChange={() => setSelectionOnly(true)}
|
||||
/>
|
||||
<T>Selected text</T>
|
||||
</label>
|
||||
<Radio
|
||||
name="reformat-scope"
|
||||
checked={selectionOnly}
|
||||
disabled={!popup.hasSelection}
|
||||
onChange={() => setSelectionOnly(true)}
|
||||
label="Selected text"
|
||||
/>
|
||||
<Radio
|
||||
name="reformat-scope"
|
||||
checked={!selectionOnly}
|
||||
onChange={() => setSelectionOnly(false)}
|
||||
label="Whole file"
|
||||
/>
|
||||
</fieldset>
|
||||
<fieldset className={styles.reformatGroup}>
|
||||
<legend className={styles.reformatLegend}>
|
||||
<fieldset className={fieldsetStyles.group}>
|
||||
<legend className={fieldsetStyles.legend}>
|
||||
<T>Options</T>
|
||||
</legend>
|
||||
<Checkbox
|
||||
|
||||
Loaded 100 of 282 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Заблокувати користувача