mirror of
https://github.com/l0ng-ai/openidea.git
synced 2026-11-17 23:53:41 -10:00
Compare commits
27
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7c9ff885dd | ||
|
|
4e90d9fd5c | ||
|
|
ffc2f75d3b | ||
|
|
19587af8b1 | ||
|
|
b2c22ccec6 | ||
|
|
f795aa3232 | ||
|
|
9239b99f3a | ||
|
|
c5be2998ec | ||
|
|
b83df2dbda | ||
|
|
9f7a35f170 | ||
|
|
52b3e14a8c | ||
|
|
934e4ca0e7 | ||
|
|
a2809bda80 | ||
|
|
0fd8389b33 | ||
|
|
19c0ae07f2 | ||
|
|
5a5b53d86b | ||
|
|
ac7a81db1c | ||
|
|
9681e1a118 | ||
|
|
293972baaa | ||
|
|
b173a53004 | ||
|
|
f6e54f581b | ||
|
|
276a30849c | ||
|
|
63abedaadd | ||
|
|
c22a7fa112 | ||
|
|
a46f187428 | ||
|
|
ff826279f2 | ||
|
|
759fb3278d |
No files matched your search
Generated
+44
-44
@@ -4144,7 +4144,7 @@ checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954"
|
||||
|
||||
[[package]]
|
||||
name = "ide-agent"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4168,7 +4168,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-analysis"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ast-grep-core",
|
||||
"ide-core",
|
||||
@@ -4182,7 +4182,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-android"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4193,7 +4193,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-build"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"chardetng",
|
||||
@@ -4211,7 +4211,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-cli"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"serde",
|
||||
@@ -4225,7 +4225,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-clipboard"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"gtk",
|
||||
"objc2 0.6.5",
|
||||
@@ -4235,7 +4235,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-core"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4252,7 +4252,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-coverage"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-run",
|
||||
@@ -4266,7 +4266,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-dap"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"ide-core",
|
||||
@@ -4293,7 +4293,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-db"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"bb8",
|
||||
@@ -4329,7 +4329,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-docker"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"serde",
|
||||
@@ -4342,7 +4342,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-extension"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4363,7 +4363,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-fonts"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"objc2-core-foundation",
|
||||
"objc2-core-text",
|
||||
@@ -4375,7 +4375,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-github"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vcs",
|
||||
@@ -4388,7 +4388,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-heap"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4406,7 +4406,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-host"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
@@ -4477,7 +4477,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-http"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-vfs",
|
||||
@@ -4496,7 +4496,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-index"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4518,7 +4518,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jdwp"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-jvm-inspect",
|
||||
"proptest",
|
||||
@@ -4530,7 +4530,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jsonrpc"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"encoding_rs",
|
||||
"futures",
|
||||
@@ -4547,7 +4547,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-attach"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"tempfile",
|
||||
@@ -4556,7 +4556,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-jvm-inspect"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"serde",
|
||||
@@ -4567,7 +4567,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-language"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"criterion",
|
||||
@@ -4624,7 +4624,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-lsp"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4652,7 +4652,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-mcp"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"dunce",
|
||||
@@ -4671,7 +4671,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-notebook"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"futures",
|
||||
"ide-core",
|
||||
@@ -4694,7 +4694,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-plugin"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4717,7 +4717,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-profiler"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-jvm-attach",
|
||||
@@ -4731,7 +4731,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-remote"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"futures",
|
||||
@@ -4751,7 +4751,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-run"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"encoding_rs",
|
||||
@@ -4775,7 +4775,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-scaffold"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-tools",
|
||||
@@ -4791,7 +4791,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-sdk"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dunce",
|
||||
"ide-core",
|
||||
@@ -4812,7 +4812,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-search"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"encoding_rs",
|
||||
@@ -4833,7 +4833,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-spell"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"parking_lot",
|
||||
@@ -4846,7 +4846,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-ssh"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"flate2",
|
||||
@@ -4871,7 +4871,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-syntax"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"ide-language",
|
||||
@@ -4886,7 +4886,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-terminal"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"ide-core",
|
||||
"libc",
|
||||
@@ -4899,7 +4899,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-text"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"criterion",
|
||||
"ide-core",
|
||||
@@ -4912,7 +4912,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-tools"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"hex",
|
||||
@@ -4933,7 +4933,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vcs"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -4954,7 +4954,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-vfs"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"chardetng",
|
||||
"dunce",
|
||||
@@ -4978,7 +4978,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-web"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"dirs 6.0.0",
|
||||
"ide-core",
|
||||
@@ -4994,7 +4994,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "ide-workspace"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"blake3",
|
||||
"dunce",
|
||||
@@ -6595,7 +6595,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "openidea"
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
dependencies = [
|
||||
"base64 0.22.1",
|
||||
"blake3",
|
||||
|
||||
+1
-1
@@ -5,7 +5,7 @@ members = ["crates/*", "src-tauri"]
|
||||
exclude = ["sdk", "plugins"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.44"
|
||||
version = "0.1.45"
|
||||
edition = "2024"
|
||||
rust-version = "1.96"
|
||||
license = "Apache-2.0"
|
||||
|
||||
@@ -821,8 +821,10 @@ fn a_reporting_task_outlives_its_background_budget() {
|
||||
|
||||
#[test]
|
||||
fn background_tasks_scale_and_renew_cpu_fuel_budget() {
|
||||
// Room for activation (about 3_100 on macOS, more on Windows) but not for `patient`'s
|
||||
// whole run (about 9_000) without the refill on each report.
|
||||
let f = fixture(Limits {
|
||||
fuel: 3_500,
|
||||
fuel: 6_000,
|
||||
timeout: Duration::from_millis(500),
|
||||
background: Duration::from_millis(5_000),
|
||||
..Limits::default()
|
||||
@@ -831,14 +833,14 @@ fn background_tasks_scale_and_renew_cpu_fuel_budget() {
|
||||
if f.host.set_capability("misbehave", "process:git", true).is_err() {
|
||||
return;
|
||||
}
|
||||
// Warm up activation in its own call so `patient` starts with a fresh 3_500-fuel budget.
|
||||
// Warm up activation in its own call so `patient` starts with a fresh budget.
|
||||
assert_eq!(f.run("misbehave", "echo", Some("warm")).unwrap().as_deref(), Some("warm"));
|
||||
|
||||
let out = f.run("misbehave", "patient", None).expect("background task succeeds").expect("output");
|
||||
assert_eq!(out, "still here");
|
||||
|
||||
let err = f.run("misbehave", "spin", None).unwrap_err();
|
||||
assert!(err.contains("exceeded its CPU budget (3500 fuel per call)"), "{err}");
|
||||
assert!(err.contains("exceeded its CPU budget (6000 fuel per call)"), "{err}");
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
||||
@@ -27,17 +27,38 @@ fn git_dir(root: &Path) -> Option<std::path::PathBuf> {
|
||||
Some(if path.is_absolute() { path.to_owned() } else { root.join(path) })
|
||||
}
|
||||
|
||||
/// The config and exclude file of the Git directory `git`; a linked worktree's directory
|
||||
/// (`.git/worktrees/<name>`) reads the shared ones its `commondir` names as well.
|
||||
fn insert_git_inputs(out: &mut std::collections::BTreeSet<std::path::PathBuf>, git: &Path) {
|
||||
out.insert(git.join("config"));
|
||||
out.insert(git.join("info/exclude"));
|
||||
if let Ok(common) = std::fs::read_to_string(git.join("commondir")) {
|
||||
let common = Path::new(common.trim());
|
||||
let common = if common.is_absolute() { common.to_owned() } else { git.join(common) };
|
||||
out.insert(common.join("config"));
|
||||
out.insert(common.join("info/exclude"));
|
||||
}
|
||||
}
|
||||
|
||||
/// External ignore/config inputs, including candidates that do not exist yet.
|
||||
/// These are outside the directory manifest (`.git` is skipped), so the full
|
||||
/// path set must match at warm start.
|
||||
pub(crate) fn external_ignore_candidates(root: &Path) -> Vec<std::path::PathBuf> {
|
||||
let mut out = std::collections::BTreeSet::new();
|
||||
if let Some(git) = git_dir(root) {
|
||||
out.insert(git.join("config"));
|
||||
out.insert(git.join("info/exclude"));
|
||||
insert_git_inputs(&mut out, &git);
|
||||
}
|
||||
out.insert(root.join(".git/config"));
|
||||
out.insert(root.join(".git/info/exclude"));
|
||||
// The walker also reads the ignore files above the root (`parents`), and a project nested
|
||||
// in a repository uses that repository's exclude file and config.
|
||||
for dir in root.ancestors().skip(1) {
|
||||
out.insert(dir.join(".gitignore"));
|
||||
out.insert(dir.join(".ignore"));
|
||||
if let Some(git) = git_dir(dir) {
|
||||
insert_git_inputs(&mut out, &git);
|
||||
}
|
||||
}
|
||||
if let Some(path) = ignore::gitignore::gitconfig_excludes_path() {
|
||||
out.insert(path);
|
||||
}
|
||||
|
||||
@@ -797,6 +797,52 @@ fn warm_start_detects_changed_ignore_rules() {
|
||||
assert_eq!(idx.status().files, 1, "an updated ignore rule invalidates the warm snapshot");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn warm_start_detects_changed_ignore_rules_above_the_project() {
|
||||
// The project is a folder of a repository whose ignore files sit above it.
|
||||
let f = Fixture::new(&[("generated/a.rs", "fn a() {}\n"), ("src/b.rs", "fn b() {}\n")]);
|
||||
let repo = f.root.parent().unwrap().to_owned();
|
||||
std::fs::create_dir_all(repo.join(".git/info")).unwrap();
|
||||
std::fs::write(repo.join(".git/HEAD"), "ref: refs/heads/main\n").unwrap();
|
||||
let idx = f.open();
|
||||
assert_eq!(idx.status().files, 2);
|
||||
drop(idx);
|
||||
|
||||
std::fs::write(repo.join(".gitignore"), "proj/generated/\n").unwrap();
|
||||
let idx = f.open();
|
||||
assert_eq!(idx.status().files, 1, "a new ignore file above the project invalidates the warm snapshot");
|
||||
drop(idx);
|
||||
|
||||
std::thread::sleep(Duration::from_millis(20));
|
||||
std::fs::write(repo.join(".gitignore"), "").unwrap();
|
||||
std::fs::write(repo.join(".git/info/exclude"), "proj/src/\n").unwrap();
|
||||
let idx = f.open();
|
||||
assert_eq!(idx.status().files, 1, "so do the enclosing repository's changed rules");
|
||||
assert!(!symbols(&idx, "a", SymbolFilter::All).is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn warm_start_detects_a_changed_exclude_file_of_a_linked_worktree() {
|
||||
// The project is a linked worktree: its `.git` file points into the main repository,
|
||||
// whose shared `info/exclude` the walker reads through `commondir`.
|
||||
let f = Fixture::new(&[("generated/a.rs", "fn a() {}\n"), ("src/b.rs", "fn b() {}\n")]);
|
||||
let main = f.root.parent().unwrap().join("main/.git");
|
||||
let worktree = main.join("worktrees/proj");
|
||||
std::fs::create_dir_all(main.join("info")).unwrap();
|
||||
std::fs::create_dir_all(&worktree).unwrap();
|
||||
std::fs::write(main.join("HEAD"), "ref: refs/heads/main\n").unwrap();
|
||||
std::fs::write(worktree.join("HEAD"), "ref: refs/heads/wt\n").unwrap();
|
||||
std::fs::write(worktree.join("commondir"), "../..\n").unwrap();
|
||||
std::fs::write(f.root.join(".git"), format!("gitdir: {}\n", worktree.display())).unwrap();
|
||||
let idx = f.open();
|
||||
assert_eq!(idx.status().files, 2);
|
||||
drop(idx);
|
||||
|
||||
std::fs::write(main.join("info/exclude"), "generated/\n").unwrap();
|
||||
let idx = f.open();
|
||||
assert_eq!(idx.status().files, 1, "the shared exclude file invalidates the warm snapshot");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn warm_start_detects_a_new_file_in_an_existing_empty_directory() {
|
||||
let f = Fixture::new(&[("src/a.rs", "fn a() {}\n")]);
|
||||
|
||||
@@ -482,7 +482,8 @@ mod tests {
|
||||
std::fs::create_dir_all(output.join("test001")).unwrap();
|
||||
// As jdtls writes it: the class's source file name in the path, the library's
|
||||
// classpath attributes after the folder.
|
||||
let escaped = output.to_string_lossy().replace('/', "\\/");
|
||||
// JDT writes the folder as a portable path, `/` on Windows too, each `/` escaped.
|
||||
let escaped = output.to_string_lossy().replace('\\', "/").replace('/', "\\/");
|
||||
let handle = format!("=demo/{escaped}=/ai.openidea.kotlin=/true=/<test001(Db.class");
|
||||
let uri = format!("jdt://contents/main-0/test001/Db.kt?{}", utf8_percent_encode(&handle, PATH));
|
||||
assert_eq!(folder_class(&uri), Some(("test001".into(), "Db".into())));
|
||||
|
||||
+47
-13
@@ -40,22 +40,37 @@ const LOOSE: &AsciiSet = &CONTROLS
|
||||
.add(b'|')
|
||||
.add(b'}');
|
||||
|
||||
/// Percent-encodes the characters URIs don't allow in every `file:` URI in `value`, string
|
||||
/// values and object keys alike (a workspace edit's `changes`). Eclipse's jdtls sends a path
|
||||
/// as is (`file:///H:/项目/…`), which `lsp_types::Uri` rejects, failing the whole response.
|
||||
/// Fields of LSP messages whose value is a URI.
|
||||
const URI_FIELDS: [&str; 9] =
|
||||
["uri", "targetUri", "newUri", "oldUri", "baseUri", "scopeUri", "rootUri", "target", "href"];
|
||||
|
||||
/// Percent-encodes the characters URIs don't allow in the `file:` URIs of `value`: the URI
|
||||
/// fields and the keys of a workspace edit's `changes`. Eclipse's jdtls sends a path as is
|
||||
/// (`file:///H:/项目/…`), which `lsp_types::Uri` rejects, failing the whole response. Other
|
||||
/// strings stay as sent: an edit's `newText` may well start with `file:` (YAML, `.env`).
|
||||
pub fn encode_loose_file_uris(value: &mut Value) {
|
||||
match value {
|
||||
Value::String(s) => {
|
||||
if let Some(encoded) = encode_loose(s) {
|
||||
*s = encoded;
|
||||
}
|
||||
}
|
||||
Value::Array(items) => items.iter_mut().for_each(encode_loose_file_uris),
|
||||
Value::Object(map) => {
|
||||
if map.keys().any(|k| encode_loose(k).is_some()) {
|
||||
*map = std::mem::take(map).into_iter().map(|(k, v)| (encode_loose(&k).unwrap_or(k), v)).collect();
|
||||
for (key, value) in map.iter_mut() {
|
||||
match value {
|
||||
Value::String(s) if URI_FIELDS.contains(&key.as_str()) => {
|
||||
if let Some(encoded) = encode_loose(s) {
|
||||
*s = encoded;
|
||||
}
|
||||
}
|
||||
Value::Object(changes) if key == "changes" => {
|
||||
if changes.keys().any(|k| encode_loose(k).is_some()) {
|
||||
*changes = std::mem::take(changes)
|
||||
.into_iter()
|
||||
.map(|(k, v)| (encode_loose(&k).unwrap_or(k), v))
|
||||
.collect();
|
||||
}
|
||||
changes.values_mut().for_each(encode_loose_file_uris);
|
||||
}
|
||||
_ => encode_loose_file_uris(value),
|
||||
}
|
||||
}
|
||||
map.values_mut().for_each(encode_loose_file_uris);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
@@ -161,9 +176,28 @@ mod tests {
|
||||
assert!(v["edit"]["changes"].get("file:///tmp/%E7%9B%AE%E5%BD%95/b.java").is_some());
|
||||
assert_eq!(v["text"], "项目", "only file: URIs change");
|
||||
// Already encoded: untouched.
|
||||
let mut encoded = serde_json::json!("file:///a%20b/%E9%A1%B9.java");
|
||||
let mut encoded = serde_json::json!({ "uri": "file:///a%20b/%E9%A1%B9.java" });
|
||||
encode_loose_file_uris(&mut encoded);
|
||||
assert_eq!(encoded, "file:///a%20b/%E9%A1%B9.java");
|
||||
assert_eq!(encoded["uri"], "file:///a%20b/%E9%A1%B9.java");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn text_that_starts_with_file_is_not_a_uri() {
|
||||
// A YAML formatting edit and a completion whose text begins with `file:`.
|
||||
let mut v = serde_json::json!({ "result": [
|
||||
{ "range": { "start": { "line": 0, "character": 0 }, "end": { "line": 1, "character": 0 } }, "newText": "file: a b\n - c\n" },
|
||||
{ "label": "file:", "insertText": "file: ${1:path}", "documentation": "file: the input" }
|
||||
], "edit": { "changes": { "file:///tmp/a b.yaml": [{ "newText": "file: x y" }] } } });
|
||||
encode_loose_file_uris(&mut v);
|
||||
assert_eq!(v["result"][0]["newText"], "file: a b\n - c\n");
|
||||
assert_eq!(v["result"][1]["insertText"], "file: ${1:path}");
|
||||
assert_eq!(v["result"][1]["documentation"], "file: the input");
|
||||
let changes = &v["edit"]["changes"]["file:///tmp/a%20b.yaml"];
|
||||
assert_eq!(changes[0]["newText"], "file: x y");
|
||||
// A diagnostic's help link is a URI too.
|
||||
let mut d = serde_json::json!({ "codeDescription": { "href": "file:///tmp/help files/rule.html" } });
|
||||
encode_loose_file_uris(&mut d);
|
||||
assert_eq!(d["codeDescription"]["href"], "file:///tmp/help%20files/rule.html");
|
||||
}
|
||||
|
||||
#[cfg(unix)]
|
||||
|
||||
@@ -403,7 +403,7 @@ async fn download_into_copies_only_the_selected_items() {
|
||||
assert!(std::fs::read_dir(&elsewhere).unwrap().next().is_none(), "nothing written through the links");
|
||||
}
|
||||
|
||||
let missing = [server.join("gone").to_str().unwrap().to_owned()];
|
||||
let missing = [server.join("gone").to_str().unwrap().replace('\\', "/")];
|
||||
let report = service
|
||||
.download_into(&FsConnection::Local, &missing, &project, &CancellationToken::new(), &mut |_, _, _| {})
|
||||
.await
|
||||
|
||||
@@ -1830,10 +1830,17 @@ pub fn without_derived_in(config: &RunConfig, root: &Path, fallback: Option<&Pat
|
||||
if path.is_absolute()
|
||||
&& let Some(name) = path.file_name().map(|n| n.to_string_lossy().into_owned())
|
||||
{
|
||||
let mut probe = out.clone();
|
||||
probe.command = name.clone();
|
||||
if applied(&probe).command == config.command {
|
||||
out.command = name;
|
||||
// Generated configurations name the bare program (`java`), also on Windows where the
|
||||
// derived path ends in `java.exe`.
|
||||
let bare =
|
||||
name.len().checked_sub(4).filter(|&at| name[at..].eq_ignore_ascii_case(".exe")).map(|at| &name[..at]);
|
||||
for candidate in bare.into_iter().chain([name.as_str()]) {
|
||||
let mut probe = out.clone();
|
||||
probe.command = candidate.to_owned();
|
||||
if applied(&probe).command == config.command {
|
||||
out.command = candidate.to_owned();
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
out
|
||||
|
||||
@@ -1136,7 +1136,10 @@ pub(crate) fn stash_push(
|
||||
paths: &[PathBuf],
|
||||
) -> IdeResult<()> {
|
||||
let rel = r.rel_paths(paths)?;
|
||||
let mut args = vec!["--literal-pathspecs", "stash", "push", "-q"];
|
||||
// Literal pathspecs only for the chosen files: git's whole-tree stash passes itself `:/`,
|
||||
// which a literal pathspec turns into a file of that name.
|
||||
let mut args = if rel.is_empty() { vec![] } else { vec!["--literal-pathspecs"] };
|
||||
args.extend(["stash", "push", "-q"]);
|
||||
if include_untracked {
|
||||
args.push("--include-untracked");
|
||||
}
|
||||
|
||||
@@ -769,11 +769,11 @@ fn stash_push_list_apply_pop() {
|
||||
let repo = fx.repo();
|
||||
|
||||
fx.write("s.txt", "change 1\n");
|
||||
repo.stash_push(Some("first stash"), false, false).unwrap();
|
||||
repo.stash_push(Some("first stash"), false, false, &[]).unwrap();
|
||||
assert_eq!(fx.read("s.txt"), "base\n");
|
||||
fx.write("s.txt", "change 2\n");
|
||||
fx.write("u.txt", "untracked\n");
|
||||
repo.stash_push(None, true, false).unwrap();
|
||||
repo.stash_push(None, true, false, &[]).unwrap();
|
||||
assert!(!fx.path("u.txt").exists());
|
||||
|
||||
let stashes = repo.stashes().unwrap();
|
||||
@@ -808,7 +808,7 @@ fn stash_keep_index_reinstate_index_and_branch() {
|
||||
fx.write("a.txt", "a staged\n");
|
||||
fx.git(&["add", "a.txt"]);
|
||||
fx.write("b.txt", "b unstaged\n");
|
||||
repo.stash_push(Some("keep"), false, true).unwrap();
|
||||
repo.stash_push(Some("keep"), false, true, &[]).unwrap();
|
||||
// Keep index: the staged change stays, the unstaged one is stashed.
|
||||
assert_eq!(fx.read("a.txt"), "a staged\n");
|
||||
assert_eq!(fx.read("b.txt"), "b\n");
|
||||
|
||||
@@ -75,7 +75,7 @@ Pick **VS Code (macOS)** or **VS Code (Windows)** as the keymap; then `⇧⌘P`
|
||||
| Extensions | **Settings › Plugins** |
|
||||
| `settings.json` | **Settings** (`⌘,` / `Ctrl+Alt+S`), stored in `settings.toml`; per-project values in `.openidea/settings.toml` |
|
||||
| `launch.json` | Run configurations: **Import Run Configurations from .vscode/launch.json** |
|
||||
| Multi-root workspace | **File › New Workspace…** and **Attach Project…** |
|
||||
| Multi-root workspace | **File › New › Workspace…** and **Attach Project…** |
|
||||
|
||||
`.editorconfig` files are applied. VS Code settings and extensions are not imported.
|
||||
|
||||
@@ -84,7 +84,7 @@ Pick **VS Code (macOS)** or **VS Code (Windows)** as the keymap; then `⇧⌘P`
|
||||
Pick **Eclipse (macOS)** or **Eclipse** as the keymap.
|
||||
|
||||
- **Formatter.** To keep using an Eclipse formatter profile for Java, open **Settings › Editor › Code Style › Java**, set **Formatting profile** to **Custom Eclipse formatter XML** and choose the exported XML file.
|
||||
- **Workspaces and projects.** Eclipse opens many projects in one workspace. OpenIDEA opens one project per window; to work on several folders together, create a workspace with **File › New Workspace…** or add folders with **Attach Project…**.
|
||||
- **Workspaces and projects.** Eclipse opens many projects in one workspace. OpenIDEA opens one project per window; to work on several folders together, create a workspace with **File › New › Workspace…** or add folders with **Attach Project…**.
|
||||
- **Perspectives.** OpenIDEA has no perspectives. Arrange tool windows the way you like and save the arrangement with **Window › Tool Window Layouts › Save Current Layout as…**.
|
||||
|
||||
## Concepts at a glance
|
||||
|
||||
@@ -13,7 +13,7 @@ A scratch file is a throwaway file in any language: a place to try a snippet, ke
|
||||
|
||||
<Steps>
|
||||
<Step title="Create one">
|
||||
Choose **File › New Scratch File…** (or **Scratch File** at the top of the Project view's **New** menu).
|
||||
Choose **File › New › Scratch File** (or **Scratch File** at the top of the Project view's **New** menu).
|
||||
</Step>
|
||||
<Step title="Pick a language">
|
||||
Type to filter the language list and press `↵` / `Enter`.
|
||||
|
||||
@@ -73,7 +73,7 @@ The page also has **Expand abbreviations with Tab** and **Show live templates in
|
||||
|
||||
Live templates, postfix settings and macros are stored per user on this machine, not in the project.
|
||||
|
||||
For new-file templates (what **File › New…** creates), see **Settings › Editor › File and Code Templates**.
|
||||
For new-file templates (what **File › New › File…** creates), see **Settings › Editor › File and Code Templates**.
|
||||
|
||||
## Macros
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@ This page covers how a plugin works with files:
|
||||
projects.
|
||||
- **Other files** (`fs.wit`, API 1.3): files outside the projects, under explicit grants,
|
||||
and the plugin's own private directory.
|
||||
- **File templates**: entries of the **File › New…** menu, no code needed.
|
||||
- **File templates**: entries of the **File › New › File…** menu, no code needed.
|
||||
|
||||
## File actions
|
||||
|
||||
@@ -180,7 +180,7 @@ as an argument to an approved process.
|
||||
|
||||
## File templates
|
||||
|
||||
`[[contributes.fileTemplates]]` adds entries to the **File › New…** menu. They need no code and grant
|
||||
`[[contributes.fileTemplates]]` adds entries to the **File › New › File…** menu. They need no code and grant
|
||||
no file access: files are created only when the user invokes a template, through the IDE's
|
||||
normal New File flow.
|
||||
|
||||
|
||||
@@ -75,7 +75,7 @@ Vim 模式会读取 `~/.ideavimrc`(或 `~/.openideavimrc`)。通过 **工具
|
||||
| 扩展 | **设置 › 插件** |
|
||||
| `settings.json` | **设置**(`⌘,` / `Ctrl+Alt+S`),保存在 `settings.toml`;项目级的值保存在 `.openidea/settings.toml` |
|
||||
| `launch.json` | 运行配置:**从 .vscode/launch.json 导入运行配置** |
|
||||
| 多根工作区 | **文件 › 新建工作区…** 和 **附加项目…** |
|
||||
| 多根工作区 | **文件 › 新建 › 工作区…** 和 **附加项目…** |
|
||||
|
||||
项目中的 `.editorconfig` 会生效。VS Code 的设置和扩展不会导入。
|
||||
|
||||
@@ -84,7 +84,7 @@ Vim 模式会读取 `~/.ideavimrc`(或 `~/.openideavimrc`)。通过 **工具
|
||||
把快捷键方案切换为 **Eclipse (macOS)** 或 **Eclipse**。
|
||||
|
||||
- **格式化器。** 想继续用 Eclipse 的 Java 格式化配置,打开 **设置 › 编辑器 › 代码样式 › Java**,把 **格式化方案** 设为 **自定义 Eclipse 格式化 XML**,然后选择导出的 XML 文件。
|
||||
- **工作空间与项目。** Eclipse 在一个工作空间里打开多个项目;OpenIDEA 每个窗口打开一个项目。需要同时处理多个文件夹时,用 **文件 › 新建工作区…** 创建工作区,或用 **附加项目…** 添加文件夹。
|
||||
- **工作空间与项目。** Eclipse 在一个工作空间里打开多个项目;OpenIDEA 每个窗口打开一个项目。需要同时处理多个文件夹时,用 **文件 › 新建 › 工作区…** 创建工作区,或用 **附加项目…** 添加文件夹。
|
||||
- **透视图。** OpenIDEA 没有透视图。按自己的习惯摆放工具窗口,再用 **窗口 › 工具窗口布局 › 将当前布局另存为…** 保存。
|
||||
|
||||
## 概念对照
|
||||
|
||||
@@ -13,7 +13,7 @@ description: "在项目之外保留临时文件,并在 TODO 工具窗口中汇
|
||||
|
||||
<Steps>
|
||||
<Step title="新建">
|
||||
选择 **文件 › 新建临时文件…**(或项目视图 **新建** 菜单最上面的 **临时文件**)。
|
||||
选择 **文件 › 新建 › 临时文件**(或项目视图 **新建** 菜单最上面的 **临时文件**)。
|
||||
</Step>
|
||||
<Step title="选择语言">
|
||||
输入文字过滤语言列表,按 `↵` / `Enter` 确认。
|
||||
|
||||
@@ -67,7 +67,7 @@ items.for → for (var item : items) { … }
|
||||
|
||||
实时模板、后缀补全设置和宏都按用户保存在本机,不保存在项目里。
|
||||
|
||||
新建文件用的模板(**文件 › 新建…** 创建的内容)在 **设置 › 编辑器 › 文件和代码模板** 中设置。
|
||||
新建文件用的模板(**文件 › 新建 › 文件…** 创建的内容)在 **设置 › 编辑器 › 文件和代码模板** 中设置。
|
||||
|
||||
## 宏
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ description: "创建、重命名或删除文件的快速修复,读写项目文
|
||||
- **文件操作**(`file-actions.wit`,API 1.3):创建、重命名或删除文件的快速修复和重构,作为一次可撤销的工作区编辑应用。
|
||||
- **项目文件**(`workspace.wit`):读取、写入、查找和搜索打开项目中的文件。
|
||||
- **其他文件**(`fs.wit`,API 1.3):在明确授权下访问项目之外的文件,以及插件自己的私有目录。
|
||||
- **文件模板**:**文件 › 新建…** 菜单中的条目,不需要代码。
|
||||
- **文件模板**:**文件 › 新建 › 文件…** 菜单中的条目,不需要代码。
|
||||
|
||||
## 文件操作
|
||||
|
||||
@@ -162,7 +162,7 @@ fs::write_file("~/.config/mytool/state.json", "{}")?;
|
||||
|
||||
## 文件模板
|
||||
|
||||
`[[contributes.fileTemplates]]` 在 **文件 › 新建…** 菜单中添加条目。不需要代码,也不授予任何文件访问权限:
|
||||
`[[contributes.fileTemplates]]` 在 **文件 › 新建 › 文件…** 菜单中添加条目。不需要代码,也不授予任何文件访问权限:
|
||||
只有用户调用模板时,才通过 IDE 正常的新建文件流程创建文件。
|
||||
|
||||
```toml
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
import type { Page } from "@playwright/test";
|
||||
import type { AgentTask } from "../src/bindings";
|
||||
import { expect, test } from "./fixtures";
|
||||
|
||||
const task: AgentTask = {
|
||||
id: "source-a",
|
||||
title: "Source task in A",
|
||||
provider: "codex",
|
||||
status: "ready",
|
||||
isolation: "local",
|
||||
model: null,
|
||||
cwd: "/dev/acme-api",
|
||||
branch: null,
|
||||
base: null,
|
||||
baseCommit: null,
|
||||
error: null,
|
||||
createdMs: 0,
|
||||
updatedMs: 0,
|
||||
config: [],
|
||||
commands: [],
|
||||
usage: null,
|
||||
queue: [],
|
||||
capabilities: { fork: true },
|
||||
};
|
||||
|
||||
async function prepare(page: Page, kind: "create" | "fork", failure: boolean, holdClose = false, closeFailure = false) {
|
||||
await page.evaluate(
|
||||
async ({ task, kind, failure, holdClose, closeFailure }) => {
|
||||
const storePath = "/src/features/agents/store.ts";
|
||||
const ipcPath = "/src/platform/ipc.ts";
|
||||
const projectPath = "/src/platform/project.ts";
|
||||
const trustPath = "/src/platform/projectTrust.ts";
|
||||
const contributionsPath = "/src/workbench/contributions.ts";
|
||||
const store = await import(storePath);
|
||||
const { commands } = await import(ipcPath);
|
||||
const project = await import(projectPath);
|
||||
const initial = project.useProject.getState().project;
|
||||
(await import(trustPath)).provideProjectTrustPrompt(async () => true);
|
||||
commands.openProject = async (root: string) => ({
|
||||
status: "ok",
|
||||
data: {
|
||||
...initial,
|
||||
root,
|
||||
name: root === task.cwd ? "acme-api" : "project-b",
|
||||
trusted: true,
|
||||
},
|
||||
});
|
||||
commands.closeProject = async () => {};
|
||||
const provider = {
|
||||
id: "codex",
|
||||
name: "Codex",
|
||||
command: "codex",
|
||||
program: "codex",
|
||||
args: [],
|
||||
defaultProgram: null,
|
||||
defaultArgs: [],
|
||||
loginHint: null,
|
||||
commandOverridden: false,
|
||||
commandEditable: true,
|
||||
commandReadOnlyReason: null,
|
||||
installed: true,
|
||||
env: {},
|
||||
commands: [],
|
||||
source: { kind: "custom" },
|
||||
config: [],
|
||||
thoughtLevels: {},
|
||||
};
|
||||
commands.agentProviders = async () => ({ status: "ok", data: [provider] });
|
||||
commands.agentProbe = async () => ({ status: "ok", data: null });
|
||||
commands.agentEntries = async () => ({ status: "ok", data: [] });
|
||||
commands.agentChanges = async () => ({ status: "ok", data: [] });
|
||||
const complete = () => {
|
||||
document.documentElement.dataset.taskRequest = "pending";
|
||||
return new Promise((resolve) =>
|
||||
document.addEventListener(
|
||||
"test:task-complete",
|
||||
() => {
|
||||
resolve(
|
||||
failure
|
||||
? { status: "error", error: { kind: "internal", message: "Local operation failed" } }
|
||||
: { status: "ok", data: { ...task, id: "completed-a", title: "Task from project A" } },
|
||||
);
|
||||
setTimeout(() => {
|
||||
document.documentElement.dataset.taskRequest = "settled";
|
||||
}, 0);
|
||||
},
|
||||
{ once: true },
|
||||
),
|
||||
);
|
||||
};
|
||||
commands.agentCreate = complete;
|
||||
commands.agentFork = complete;
|
||||
if (holdClose) {
|
||||
const editors = (await import(contributionsPath)).editorService();
|
||||
const close = editors.closeInput;
|
||||
editors.closeInput = async (key: string) => {
|
||||
const closed = await close(key);
|
||||
if (key !== "agent:new") return closed;
|
||||
document.documentElement.dataset.homeClosing = "pending";
|
||||
await new Promise((resolve, reject) =>
|
||||
document.addEventListener(
|
||||
"test:close-complete",
|
||||
() => {
|
||||
if (closeFailure) reject(new Error("Local close failed"));
|
||||
else resolve(null);
|
||||
setTimeout(() => {
|
||||
document.documentElement.dataset.homeClosing = "settled";
|
||||
}, 0);
|
||||
},
|
||||
{ once: true },
|
||||
),
|
||||
);
|
||||
return closed;
|
||||
};
|
||||
}
|
||||
store.useAgents.setState({
|
||||
loaded: true,
|
||||
tasks: new Map([[task.id, task]]),
|
||||
providers: [provider],
|
||||
composers: new Map(),
|
||||
history: [],
|
||||
entries: new Map([[task.id, [{ type: "user", text: "Existing prompt in A", attachments: [] }]]]),
|
||||
draft: { provider: "codex", config: {}, isolation: "local", base: null },
|
||||
sessionLocation: "editor",
|
||||
});
|
||||
if (kind === "create") store.openHome("Submitted task in A");
|
||||
else store.openTask(task.id);
|
||||
},
|
||||
{ task, kind, failure, holdClose, closeFailure },
|
||||
);
|
||||
if (kind === "create") await page.getByRole("button", { name: "Start", exact: true }).click();
|
||||
else {
|
||||
await page.getByText("Existing prompt in A", { exact: true }).hover();
|
||||
await page.getByRole("button", { name: "Fork", exact: true }).click();
|
||||
}
|
||||
await expect(page.locator("html")).toHaveAttribute("data-task-request", "pending");
|
||||
}
|
||||
|
||||
async function changeProject(page: Page, change: "A to B" | "A to B to A" | "reopen A") {
|
||||
await page.evaluate(
|
||||
async ({ change, task }) => {
|
||||
const storePath = "/src/features/agents/store.ts";
|
||||
const projectPath = "/src/platform/project.ts";
|
||||
const store = await import(storePath);
|
||||
const project = await import(projectPath);
|
||||
if (change === "reopen A") await project.closeProject();
|
||||
else await project.openProject("/dev/project-b");
|
||||
if (change !== "A to B") await project.openProject(task.cwd);
|
||||
const root = project.useProject.getState().project.root;
|
||||
store.useAgents.setState({
|
||||
loaded: true,
|
||||
tasks: new Map([
|
||||
["current-project", { ...task, id: "current-project", title: "Current project's task", cwd: root }],
|
||||
]),
|
||||
entries: new Map(),
|
||||
history: ["Current project history"],
|
||||
});
|
||||
store.openHome("Current project draft");
|
||||
},
|
||||
{ change, task },
|
||||
);
|
||||
await expect(page.getByRole("textbox", { name: "Message", exact: true })).toHaveText("Current project draft");
|
||||
}
|
||||
|
||||
async function expectCurrentProject(page: Page) {
|
||||
await expect(page.getByRole("textbox", { name: "Message", exact: true })).toHaveText("Current project draft");
|
||||
await expect(page.getByRole("tab", { name: "New Agent Task" })).toBeVisible();
|
||||
await expect(page.getByRole("tab", { name: "Task from project A" })).toHaveCount(0);
|
||||
await expect(page.getByText(/Local (operation|close) failed/)).toHaveCount(0);
|
||||
expect(
|
||||
await page.evaluate(async () => {
|
||||
const storePath = "/src/features/agents/store.ts";
|
||||
const store = await import(storePath);
|
||||
return { tasks: [...store.useAgents.getState().tasks.keys()], history: store.useAgents.getState().history };
|
||||
}),
|
||||
).toEqual({ tasks: ["current-project"], history: ["Current project history"] });
|
||||
}
|
||||
|
||||
for (const kind of ["create", "fork"] as const) {
|
||||
for (const failure of [false, true]) {
|
||||
for (const change of ["A to B", "A to B to A", "reopen A"] as const) {
|
||||
test(`${kind}: old ${failure ? "failure" : "success"} after ${change}`, async ({ workbench: page }) => {
|
||||
await prepare(page, kind, failure);
|
||||
await changeProject(page, change);
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:task-complete")));
|
||||
await expect(page.locator("html")).toHaveAttribute("data-task-request", "settled");
|
||||
await expectCurrentProject(page);
|
||||
});
|
||||
}
|
||||
test(`${kind}: ${failure ? "failure" : "success"} in the current project`, async ({ workbench: page }) => {
|
||||
await prepare(page, kind, failure);
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:task-complete")));
|
||||
await expect(page.locator("html")).toHaveAttribute("data-task-request", "settled");
|
||||
if (failure) await expect(page.getByText(/Local operation failed/).first()).toBeVisible();
|
||||
else await expect(page.getByRole("tab", { name: "Task from project A" })).toBeVisible();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (const closeFailure of [false, true]) {
|
||||
test(`create: project changes while Home closes (${closeFailure ? "failure" : "success"})`, async ({
|
||||
workbench: page,
|
||||
}) => {
|
||||
await prepare(page, "create", false, true, closeFailure);
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:task-complete")));
|
||||
await expect(page.locator("html")).toHaveAttribute("data-home-closing", "pending");
|
||||
await changeProject(page, "A to B to A");
|
||||
await page.evaluate(() => document.dispatchEvent(new Event("test:close-complete")));
|
||||
await expect(page.locator("html")).toHaveAttribute("data-home-closing", "settled");
|
||||
await expectCurrentProject(page);
|
||||
});
|
||||
}
|
||||
+3
-3
@@ -19,9 +19,9 @@ test("an unresolved module gets a startup timeout", async ({ page }) => {
|
||||
);
|
||||
await page.goto("/", { waitUntil: "commit" });
|
||||
await page.locator("#splash").waitFor({ state: "attached" });
|
||||
await page.clock.runFor(30_000);
|
||||
await page.clock.runFor(60_000);
|
||||
await expect(page.getByRole("textbox", { name: "Startup error details" })).toHaveValue(
|
||||
/Startup did not finish within 30 seconds/,
|
||||
/Startup did not finish within 60 seconds/,
|
||||
);
|
||||
});
|
||||
|
||||
@@ -83,7 +83,7 @@ test("a slow module load succeeds before the deadline and cancels the startup ti
|
||||
await expect(page.locator("#root")).not.toBeEmpty();
|
||||
await page.clock.runFor(4000);
|
||||
await expect(page.locator("#splash")).toHaveCount(0);
|
||||
await page.clock.runFor(35_000);
|
||||
await page.clock.runFor(50_000);
|
||||
await expect(page.locator("#boot-error")).toHaveCount(0);
|
||||
expect(await page.evaluate(() => sessionStorage.getItem("boot-error-seen"))).toBeNull();
|
||||
});
|
||||
+3
-1
@@ -20,7 +20,9 @@ test("Search Everywhere finds and runs an action", async ({ workbench: page }) =
|
||||
await expect(option).toBeVisible();
|
||||
await page.keyboard.press("Enter");
|
||||
await expect(page.getByRole("dialog", { name: "Settings" })).toBeVisible();
|
||||
await expect(page.getByRole("list", { name: /language servers/i })).toBeVisible();
|
||||
await expect(
|
||||
page.getByRole("dialog", { name: "Settings" }).getByRole("list", { name: "Languages", exact: true }),
|
||||
).toBeVisible();
|
||||
});
|
||||
|
||||
const ROOT = "/dev/acme-api";
|
||||
|
||||
@@ -86,20 +86,20 @@ test("Language Servers page installs a tool with progress (in-memory installer)"
|
||||
// The page tree is virtualized; search brings the page into view.
|
||||
await dialog.getByRole("textbox", { name: "Search settings" }).fill("Language Servers");
|
||||
await dialog.getByRole("treeitem", { name: "Language Servers", exact: true }).click();
|
||||
const list = dialog.getByRole("list", { name: /language servers/i });
|
||||
await expect(list).toBeVisible();
|
||||
|
||||
await list.locator('[data-tool="gopls"]').click();
|
||||
const languages = dialog.getByRole("list", { name: "Languages", exact: true });
|
||||
await languages.getByRole("button", { name: /^Go\b/ }).click();
|
||||
const gopls = dialog.getByLabel("Go tools").locator('[data-tool="gopls"]');
|
||||
await gopls.click();
|
||||
await expect(gopls).toContainText("Missing");
|
||||
const details = dialog.getByLabel("gopls details");
|
||||
await expect(details).toContainText("Missing");
|
||||
await details.getByRole("button", { name: "Install gopls" }).click();
|
||||
await expect(details.getByRole("progressbar", { name: "Installing gopls" })).toBeVisible();
|
||||
await expect(details).toContainText("Installed");
|
||||
await expect(details).toContainText("1.0.0");
|
||||
await expect(gopls).toContainText("Installed");
|
||||
await expect(gopls).toContainText("1.0.0");
|
||||
await expect(details.getByRole("button", { name: "Uninstall" })).toBeVisible();
|
||||
|
||||
// Tools without an installer explain how to get them.
|
||||
await list.locator('[data-tool="solargraph"]').click();
|
||||
await languages.getByRole("button", { name: /^Ruby\b/ }).click();
|
||||
await expect(dialog.getByLabel("solargraph details")).toContainText("gem install solargraph");
|
||||
});
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ import { expect, test } from "./fixtures";
|
||||
for (const [id, selector] of [
|
||||
["build.deployment", "[class*='layout'] > [class*='note']"],
|
||||
["editor.inspections", "[class*='split'] > [class*='details']"],
|
||||
["languages.servers", "[class*='body'] > [class*='details']"],
|
||||
["languages.servers", "[class*='body'] > [class*='language'][aria-label]"],
|
||||
["plugins", "[class*='body'] > [class*='details']"],
|
||||
["agents.list", "section[aria-label='Codex']"],
|
||||
]) {
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
"name": "openidea",
|
||||
"private": true,
|
||||
"description": "An open-source IDE inspired by IntelliJ IDEA",
|
||||
"version": "0.1.44",
|
||||
"version": "0.1.45",
|
||||
"license": "Apache-2.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
|
||||
+3
-3
@@ -11,7 +11,7 @@
|
||||
copied: "已复制",
|
||||
manual: "无法复制。请选择下方详情并手动复制。",
|
||||
details: "启动错误详情",
|
||||
timeout: "启动未在 30 秒内完成。",
|
||||
timeout: "启动未在 60 秒内完成。",
|
||||
outdatedMac:
|
||||
"这台 Mac 的系统网页引擎过旧:OpenIDEA 的界面运行在 macOS 自带的 WebKit 引擎上,需要 macOS 13 Ventura 或更高版本。在 macOS 11、12 上更新 Safari 不会更新其他应用使用的引擎,需要升级 macOS。",
|
||||
outdated:
|
||||
@@ -25,7 +25,7 @@
|
||||
copied: "Copied",
|
||||
manual: "Could not copy. Select the details below and copy them.",
|
||||
details: "Startup error details",
|
||||
timeout: "Startup did not finish within 30 seconds.",
|
||||
timeout: "Startup did not finish within 60 seconds.",
|
||||
outdatedMac:
|
||||
"The system web engine on this Mac is too old: OpenIDEA's interface runs on macOS's built-in WebKit and needs macOS 13 Ventura or later. On macOS 11 and 12 a Safari update doesn't update the engine other apps use, so macOS itself needs upgrading.",
|
||||
outdated:
|
||||
@@ -146,7 +146,7 @@
|
||||
};
|
||||
// The timeout counts only while the window shows: a hidden or covered window gets no
|
||||
// animation frames, and the splash waits for those to finish startup.
|
||||
let remaining = 30_000;
|
||||
let remaining = 60_000;
|
||||
let armedAt = 0;
|
||||
let timer;
|
||||
const arm = () => {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// The commit being prepared in the window the current command or event came
|
||||
/// from (the Commit tool window, or the Commit dialog while it is open): the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Plugin-owned project data sources. Requires database.sources and project trust.
|
||||
/// Runs on the Database subsystem's host, including on remote project servers.
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Project-scoped decorations (API 1.4). Requires project.read; paths must be inside
|
||||
/// an open project. Sets belong to the plugin and disappear when it stops.
|
||||
/// Editor and project-tree decorations (API 1.4). Requires project.read. An editor set
|
||||
/// follows its file: the file's own project, or the nearest one when it is outside them all.
|
||||
/// Tree sets are rooted in an open project. Sets belong to the plugin and disappear when it stops.
|
||||
/// Styles: highlight, search, added, modified, removed, warning, error, info,
|
||||
/// underline, strikethrough, muted. Unknown styles are ignored. Theme tokens only.
|
||||
/// typo, weak, underline, strikethrough, muted. Unknown styles are ignored. Theme tokens only.
|
||||
interface decorations {
|
||||
use types.{error, range};
|
||||
/// An editor annotation; after is plain text shown after the range.
|
||||
@@ -22,4 +23,9 @@ interface decorations {
|
||||
/// Replace this set's tree annotation for a file with a note shown after its name (API 1.7):
|
||||
/// one line of at most 200 characters, with an optional tooltip.
|
||||
set-file-note: func(path: string, set-id: string, note: string, tooltip: option<string>) -> result<_, error>;
|
||||
/// Replace this set's tree icon for a file or folder with an id declared under
|
||||
/// `[[contributes.fileIcons]]` (API 1.8), with an optional tooltip.
|
||||
set-file-icon: func(path: string, set-id: string, icon: string, tooltip: option<string>) -> result<_, error>;
|
||||
/// Replace all `(path, icon)` entries of a tree set at once (API 1.8; at most 10,000 entries).
|
||||
set-file-icons: func(set-id: string, items: list<tuple<string, string>>) -> result<_, error>;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// What the pane beside the Services tree shows for a plugin's node.
|
||||
interface detail-types {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Optional export (world `plugin-diagnostics`): problems in the current,
|
||||
/// possibly unsaved document, for the languages declared with the
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// HTTP endpoints found in a project (`[[contributes.endpoints]]`).
|
||||
interface endpoints-provider {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Workbench events, delivered in batches to `event-handler.handle`.
|
||||
interface events {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
interface lifecycle {
|
||||
use types.{context, error};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// What other plugins contributed to the extension points this plugin declares
|
||||
/// (`[[extension-points]]` in `plugin.toml`; the contributors list this plugin
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Optional export (world `plugin-file-actions`): quick fixes and
|
||||
/// refactorings that create, rename or delete files, next to the text edits
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Files outside the open projects: the configuration of the program a
|
||||
/// plugin integrates with, a tool installed elsewhere, a licence file.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Writes to the IDE log, tagged with the plugin id.
|
||||
interface log {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Optional export (world `plugin-hover`): Markdown added to the hover of
|
||||
/// documents of the languages declared with the `hover` provider kind,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Cross-file associations a plugin publishes for the files it declares under
|
||||
/// `[[contributes.documentIndexers]]`. The host calls `index` in cancellable
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Embedded languages. The host routes plugin providers and configured language
|
||||
/// servers inside these ranges, preserving host-document UTF-16 coordinates.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Optional export (world `plugin-inlay-hints`): inline hints in documents of
|
||||
/// the languages declared with the `inlay-hints` provider kind, including
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Problems in files, shown in the editor and the Problems view.
|
||||
interface diagnostics {
|
||||
use types.{error, range, location};
|
||||
/// Problems reported by a source for a file in this window's project.
|
||||
/// Problems one producer reported for a file, wherever the file is: the host records every
|
||||
/// diagnostics event it emits, so this follows the file, not the invoking window.
|
||||
record file-problems { path: string, source: string, diagnostics: list<diagnostic> }
|
||||
/// Current Problems view snapshot, optionally filtered to a project file.
|
||||
/// The diagnostics the host recorded, one entry per producer, optionally
|
||||
/// filtered to a file: language servers, builds, spelling and plugin
|
||||
/// providers alike, whatever window or project opened the file.
|
||||
/// Requires project.read and an invoking window. Empty for remote projects.
|
||||
problems: func(path: option<string>) -> result<list<file-problems>, error>;
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Additional language features, called only for declared API 1.4 provider kinds.
|
||||
/// Editor calls have a 50 ms soft / 500 ms hard budget; formatting has 5 seconds.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Discovery of the IDE's built-in MCP server; never exposes its URL or token.
|
||||
interface mcp {
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
/// `fs` and `workspace`, and everything else goes through the imports below,
|
||||
/// gated by the capabilities granted in `plugin.toml` (a missing one returns
|
||||
/// `error::denied`).
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
world plugin {
|
||||
import log;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Editor features a plugin provides for the languages it declares under
|
||||
/// `[[contributes.providers]]` (the host calls only declared kinds). They run
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Project-scoped targets owned by the registering plugin (API 1.4).
|
||||
interface run-targets {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Launches this plugin's configurations in the invoking window's Run tool window.
|
||||
interface run {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Optional export (world `plugin-semantic-tokens`): semantic colouring of
|
||||
/// documents of the languages declared with the `semantic-tokens` provider
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Shared types. Positions are 0-based lines and UTF-16 code unit columns,
|
||||
/// as in the editor and LSP.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
/// Declarative views: tool windows declared
|
||||
/// under `[[contributes.views]]` and custom editors under
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package openidea:plugin@1.7.0;
|
||||
package openidea:plugin@1.8.0;
|
||||
|
||||
interface workspace {
|
||||
use types.{error, location};
|
||||
@@ -135,7 +135,9 @@ interface editor {
|
||||
|
||||
/// Applies versioned edits to an open project document from a background
|
||||
/// event. The path is project-relative and requires `project.read` and
|
||||
/// `editor.write`. Stale versions are rejected without changing text.
|
||||
/// `editor.write`. The host refuses VCS/IDE control directories and every
|
||||
/// symlink, junction or reparse-point component before it finds the open
|
||||
/// document. Stale versions are rejected without changing text.
|
||||
/// These background edits are non-undoable and are not re-emitted as
|
||||
/// `document-changed` events.
|
||||
apply-edits-at: func(project: borrow<project>, path: string, version: u64, edits: list<text-edit>) -> result<u64, error>;
|
||||
|
||||
@@ -65,8 +65,9 @@ pub fn apply(state: &AppState) {
|
||||
}
|
||||
// Another address, port or token: clients connect anew.
|
||||
if let Some(running) = server.take() {
|
||||
let held = (running.address(), running.port());
|
||||
running.stop();
|
||||
if let Some(port) = wanted.port {
|
||||
if let Some(port) = port_to_wait_for(held, wanted.port) {
|
||||
wait_until_free(address, port);
|
||||
}
|
||||
}
|
||||
@@ -104,6 +105,14 @@ pub fn apply(state: &AppState) {
|
||||
}
|
||||
}
|
||||
|
||||
/// The port a restart listening on `wanted` waits for after stopping the server that listened
|
||||
/// on `held`: only its own, at any address (`127.0.0.1` and `0.0.0.0` overlap). A port another
|
||||
/// program holds (the run fell back to a free one) stays taken, and waiting for it would block
|
||||
/// the window.
|
||||
fn port_to_wait_for(held: (IpAddr, u16), wanted: Option<u16>) -> Option<u16> {
|
||||
wanted.filter(|port| held.1 == *port)
|
||||
}
|
||||
|
||||
/// Waits briefly for a stopped server's port to close, so the restart gets it again.
|
||||
fn wait_until_free(address: IpAddr, port: u16) {
|
||||
for _ in 0..100 {
|
||||
@@ -243,3 +252,21 @@ pub fn mcp_respond(
|
||||
) -> IdeResult<()> {
|
||||
state.host.mcp_requests.answer(window.label(), id, allow, error)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::net::Ipv4Addr;
|
||||
|
||||
#[test]
|
||||
fn a_restart_waits_only_for_the_port_the_stopped_server_held() {
|
||||
let local = IpAddr::V4(Ipv4Addr::LOCALHOST);
|
||||
let any = IpAddr::V4(Ipv4Addr::UNSPECIFIED);
|
||||
assert_eq!(port_to_wait_for((local, 64342), Some(64342)), Some(64342));
|
||||
// Another address on the same port overlaps the old listener: wait for it too.
|
||||
assert_eq!(port_to_wait_for((any, 64342), Some(64342)), Some(64342));
|
||||
// The fixed port was taken by another program: the server ran on a free one.
|
||||
assert_eq!(port_to_wait_for((local, 51234), Some(64342)), None);
|
||||
assert_eq!(port_to_wait_for((local, 64342), None), None);
|
||||
}
|
||||
}
|
||||
+67
-8
@@ -217,14 +217,18 @@ pub fn spec(os: Os) -> Vec<Entry> {
|
||||
}
|
||||
|
||||
let mut file = vec![
|
||||
act("file.newProject", "New Project…"),
|
||||
act("workspace.create", "New Workspace…"),
|
||||
act("workspace.open", "Open Workspace…"),
|
||||
act("workspace.manage", "Manage Workspace…"),
|
||||
act("file.new", "New…"),
|
||||
act("file.newScratchFile", "New Scratch File…"),
|
||||
sub(
|
||||
"new",
|
||||
"New",
|
||||
vec![
|
||||
act("file.newProject", "Project…"),
|
||||
act("workspace.create", "Workspace…"),
|
||||
SEP,
|
||||
act("file.new", "File…"),
|
||||
act("file.newScratchFile", "Scratch File"),
|
||||
],
|
||||
),
|
||||
act("file.openProject", "Open…"),
|
||||
act("project.attach", "Attach Project…"),
|
||||
act("file.openFile", "Open File…"),
|
||||
act("file.openInNewWindow", "Open in New Window…"),
|
||||
sub(
|
||||
@@ -232,6 +236,11 @@ pub fn spec(os: Os) -> Vec<Entry> {
|
||||
"Open Recent",
|
||||
vec![Entry::RecentProjects, SEP, act("welcome.recentProjects", "Manage Projects…")],
|
||||
),
|
||||
act("project.attach", "Attach Project…"),
|
||||
SEP,
|
||||
act("workspace.open", "Open Workspace…"),
|
||||
act("workspace.manage", "Manage Workspace…"),
|
||||
SEP,
|
||||
act("file.closeProject", "Close Project"),
|
||||
act("file.renameProject", "Rename Project…"),
|
||||
SEP,
|
||||
@@ -1612,7 +1621,7 @@ pub fn install<R: Runtime>(app: &AppHandle<R>, menu_state: &MenuState, recent: &
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use std::collections::HashSet;
|
||||
use std::collections::{BTreeSet, HashSet};
|
||||
|
||||
const ALL_OS: [Os; 3] = [Os::Mac, Os::Windows, Os::Linux];
|
||||
|
||||
@@ -1972,6 +1981,56 @@ mod tests {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn file_menu_starts_with_a_new_submenu() {
|
||||
for os in ALL_OS {
|
||||
let menus = spec(os);
|
||||
let Some(Entry::Submenu { children: file, .. }) =
|
||||
menus.iter().find(|e| matches!(e, Entry::Submenu { id: "file", .. }))
|
||||
else {
|
||||
panic!("File menu missing on {os:?}")
|
||||
};
|
||||
let Some(Entry::Submenu { id: "new", children: new, .. }) = file.first() else {
|
||||
panic!("File menu does not start with New on {os:?}")
|
||||
};
|
||||
assert_eq!(
|
||||
action_ids(new),
|
||||
["file.newProject", "workspace.create", "file.new", "file.newScratchFile"],
|
||||
"{os:?}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn every_menu_item_has_a_catalog_label() {
|
||||
fn walk(entries: &[Entry], out: &mut BTreeSet<&'static str>) {
|
||||
for e in entries {
|
||||
match e {
|
||||
Entry::Submenu { id, children, .. } => {
|
||||
out.insert(id);
|
||||
walk(children, out);
|
||||
}
|
||||
Entry::Action { id, .. } => {
|
||||
out.insert(id);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
let mut ids = BTreeSet::new();
|
||||
for os in ALL_OS {
|
||||
walk(&spec(os), &mut ids);
|
||||
}
|
||||
for (locale, catalog) in [
|
||||
("en", include_str!("../../src/platform/locales/en.json")),
|
||||
("zh", include_str!("../../src/platform/locales/zh.json")),
|
||||
] {
|
||||
let catalog: serde_json::Map<String, serde_json::Value> = serde_json::from_str(catalog).unwrap();
|
||||
let missing: Vec<_> = ids.iter().filter(|id| !catalog.contains_key(&format!("menu.{id}"))).collect();
|
||||
assert!(missing.is_empty(), "{locale}.json lacks menu labels for {missing:?}");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn recent_labels_tildify_home() {
|
||||
let recent = vec![ide_workspace::RecentProject {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "OpenIDEA",
|
||||
"version": "0.1.44",
|
||||
"version": "0.1.45",
|
||||
"identifier": "ai.l0ng.openidea",
|
||||
"build": {
|
||||
"beforeDevCommand": "pnpm dev",
|
||||
|
||||
@@ -682,6 +682,10 @@ export function setShownLine(path: string, line: number | null) {
|
||||
}, true);
|
||||
}
|
||||
|
||||
export function shownLine(path: string): number | null {
|
||||
return useShownLines.getState()[path] ?? null;
|
||||
}
|
||||
|
||||
export function useShownLine(path: string | null): number | null {
|
||||
return useShownLines((s) => (path ? (s[path] ?? null) : null));
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import { evaluateWhen, getContext, setContext } from "@/platform/context";
|
||||
import { installKeyboardDispatcher } from "@/platform/keymap";
|
||||
import { TEXT_WHEN } from "./actions";
|
||||
import { EDITOR_WHEN } from "@/editor/lsp/actions";
|
||||
import { setShownLine } from "@/editor/api";
|
||||
|
||||
let ctrl: EditorController | null = null;
|
||||
|
||||
@@ -33,6 +34,24 @@ describe("EditorController", () => {
|
||||
expect(useProjectViewLead.getState().lead).toBeNull();
|
||||
});
|
||||
|
||||
it("goes back to the line a stand-in view shows (Markdown Preview only), not the hidden caret", async () => {
|
||||
const text = Array.from({ length: 50 }, (_, i) => `line ${i}`).join("\n");
|
||||
ctrl = new EditorController(createMemoryBackend({ "/p/a.md": text, "/p/b.md": "b\n" }));
|
||||
ctrl.start();
|
||||
await ctrl.openFile("/p/a.md", { selection: { line: 45, col: 0 }, focus: false });
|
||||
// The preview was scrolled after the file opened; then a link opens another file.
|
||||
setShownLine("/p/a.md", 20);
|
||||
try {
|
||||
await ctrl.openFile("/p/b.md", { focus: false });
|
||||
await ctrl.back();
|
||||
const slot = ctrl.activeSlot!;
|
||||
expect(slot.model.path).toBe("/p/a.md");
|
||||
expect(slot.caret().line).toBe(20);
|
||||
} finally {
|
||||
setShownLine("/p/a.md", null);
|
||||
}
|
||||
});
|
||||
|
||||
it("autosaves on blur, but not while focus is in a popup over the editor", async () => {
|
||||
const backend = createMemoryBackend({ "/p/a.c": "int main() {\n \n}\n" });
|
||||
const save = vi.spyOn(backend, "save");
|
||||
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
_provideNavigationHistory,
|
||||
_provideOpenEditorPaths,
|
||||
_setActiveEditor,
|
||||
shownLine,
|
||||
type NavigationLocation,
|
||||
} from "@/editor/api";
|
||||
import {
|
||||
@@ -972,7 +973,10 @@ export class EditorController implements SlotHost {
|
||||
private recordNav(slot: EditorSlot, navigation = false) {
|
||||
if (this.navSuppress > 0 || slot.disposed) return;
|
||||
const c = slot.caret();
|
||||
this.nav.update({ path: slot.model.path, line: c.line, col: c.col }, navigation);
|
||||
// A view standing in for the editor (Markdown Preview only) is where the reader is.
|
||||
const shown = shownLine(slot.model.path);
|
||||
const loc = shown === null || shown === c.line ? { line: c.line, col: c.col } : { line: shown, col: 0 };
|
||||
this.nav.update({ path: slot.model.path, ...loc }, navigation);
|
||||
}
|
||||
|
||||
async navigateTo(loc: NavigationLocation | null) {
|
||||
@@ -1055,6 +1059,8 @@ export class EditorController implements SlotHost {
|
||||
}
|
||||
|
||||
async openFile(path: string, o: OpenOptions = {}): Promise<void> {
|
||||
// The place left behind, as it is now (a preview may have scrolled since it was recorded).
|
||||
if (this.navSuppress === 0 && this.activeSlot) this.recordNav(this.activeSlot);
|
||||
return this.openFileRequest(path, o, this.openingGeneration(o));
|
||||
}
|
||||
|
||||
@@ -1335,7 +1341,10 @@ export class EditorController implements SlotHost {
|
||||
* (`EditorKindContribution.isBusy`): asks before ending what runs in them,
|
||||
* like closing a busy terminal session. Resolves false to keep the tabs.
|
||||
*/
|
||||
private async confirmBusyClose(removal: (s: TabsState) => TabsState): Promise<boolean> {
|
||||
private async confirmBusyClose(
|
||||
removal: (s: TabsState) => TabsState,
|
||||
confirmed: Set<string> = new Set(),
|
||||
): Promise<boolean> {
|
||||
const kinds = useContributions.getState().editorKinds;
|
||||
const current = useTabs.getState();
|
||||
const remaining = openKeys(removal(current));
|
||||
@@ -1343,15 +1352,19 @@ export class EditorController implements SlotHost {
|
||||
for (const pane of Object.values(current.panes))
|
||||
for (const tab of pane.tabs)
|
||||
if (!remaining.has(tab.input.key) && kinds.get(tab.input.kind)?.isBusy) closing.set(tab.input.key, tab.input);
|
||||
const busy: string[] = [];
|
||||
for (const input of closing.values()) if (await inputBusy(input, kinds)) busy.push(tabTitle(input, kinds));
|
||||
// Tabs whose ending was confirmed earlier in this close aren't asked about again.
|
||||
const busy: EditorInput[] = [];
|
||||
for (const input of closing.values())
|
||||
if (!confirmed.has(input.key) && (await inputBusy(input, kinds))) busy.push(input);
|
||||
if (!busy.length) return true;
|
||||
const name = busy.join(", ");
|
||||
return confirm({
|
||||
const name = busy.map((input) => tabTitle(input, kinds)).join(", ");
|
||||
const ok = await confirm({
|
||||
title: t("editor.closeBusy.title", { name }),
|
||||
message: t("editor.closeBusy.message", { name }),
|
||||
ok: t("editor.closeBusy.terminate"),
|
||||
});
|
||||
if (ok) for (const input of busy) confirmed.add(input.key);
|
||||
return ok;
|
||||
}
|
||||
|
||||
/** Close exactly the originally selected tabs, evaluating references after every await. */
|
||||
@@ -1388,6 +1401,8 @@ export class EditorController implements SlotHost {
|
||||
try {
|
||||
const authorized = new Set<string>();
|
||||
const discards = new Map<string, CustomDocument>();
|
||||
const confirmedBusy = new Set<string>();
|
||||
let busyAsked = false;
|
||||
for (;;) {
|
||||
const current = useTabs.getState();
|
||||
const d = closedDocuments(current, currentRemoval(current), useContributions.getState().editorKinds).find(
|
||||
@@ -1397,6 +1412,13 @@ export class EditorController implements SlotHost {
|
||||
// A later Cancel/save failure must not discard earlier documents.
|
||||
const discard = [...discards.values()].find(stillLast);
|
||||
if (!discard) break;
|
||||
// Nor may a Cancel on ending a busy tab's session: ask before discarding anything.
|
||||
if (!busyAsked) {
|
||||
if (!(await this.confirmBusyClose(currentRemoval, confirmedBusy))) return false;
|
||||
if (generation !== this.projectGeneration) return false;
|
||||
busyAsked = true;
|
||||
continue;
|
||||
}
|
||||
discards.delete(discard.input.key);
|
||||
await discard.lifecycle.discard(discard.input);
|
||||
// The await may have changed which documents lose their last tab.
|
||||
@@ -1427,7 +1449,8 @@ export class EditorController implements SlotHost {
|
||||
}
|
||||
authorized.add(d.input.key);
|
||||
}
|
||||
if (!(await this.confirmBusyClose(currentRemoval))) return false;
|
||||
// Again after the discards: a tab may have become busy while they ran.
|
||||
if (!(await this.confirmBusyClose(currentRemoval, confirmedBusy))) return false;
|
||||
if (generation !== this.projectGeneration) return false;
|
||||
if (options.beforeRemove && !(await options.beforeRemove())) return false;
|
||||
// Commit only the original target ids against the latest tab state.
|
||||
|
||||
@@ -4,7 +4,7 @@ import { createMemoryBackend } from "./backend";
|
||||
import { findTab, initialTabsState, paneIds } from "./model/tabs";
|
||||
import { useDocMeta } from "./model/document";
|
||||
import { useProject } from "@/platform/project";
|
||||
import { ask } from "@/workbench/messages";
|
||||
import { ask, confirm } from "@/workbench/messages";
|
||||
import type * as Messages from "@/workbench/messages";
|
||||
import * as virtualDocs from "@/platform/virtualDocs";
|
||||
import type { VirtualDocument } from "@/platform/ipc";
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
vi.mock("@/workbench/messages", async (original) => ({
|
||||
...(await original<typeof Messages>()),
|
||||
ask: vi.fn(),
|
||||
confirm: vi.fn(),
|
||||
}));
|
||||
|
||||
class TestDocument implements EditorDocumentLifecycle {
|
||||
@@ -248,6 +249,57 @@ describe("custom editor document lifetime", () => {
|
||||
expect(findTab(useTabs.getState(), input().key)).toBeNull();
|
||||
});
|
||||
|
||||
it("keeps discarded changes when ending a busy tab's session is cancelled", async () => {
|
||||
const busy = registerEditorKind({
|
||||
kind: "busy-test",
|
||||
component: () => null,
|
||||
title: (i) => i.key,
|
||||
isBusy: () => true,
|
||||
});
|
||||
try {
|
||||
const doc = await open();
|
||||
await ctrl.openInput({ kind: "busy-test", key: "busy:1" }, { focus: false });
|
||||
vi.mocked(ask).mockResolvedValue({ button: "discard", checked: false });
|
||||
vi.mocked(confirm).mockResolvedValue(false);
|
||||
const pane = useTabs.getState().activePane;
|
||||
expect(await ctrl.closeAll(pane)).toBe(false);
|
||||
expect(confirm).toHaveBeenCalledOnce();
|
||||
expect(doc.text).toBe("edited");
|
||||
expect(useTabs.getState().panes[pane]!.tabs.map((tab) => tab.input.key)).toEqual(["custom:a", "busy:1"]);
|
||||
} finally {
|
||||
busy();
|
||||
vi.mocked(confirm).mockReset();
|
||||
}
|
||||
});
|
||||
|
||||
it("asks about a tab that becomes busy while changes are discarded", async () => {
|
||||
let busyNow = false;
|
||||
const busy = registerEditorKind({
|
||||
kind: "busy-test",
|
||||
component: () => null,
|
||||
title: (i) => i.key,
|
||||
isBusy: () => busyNow,
|
||||
});
|
||||
try {
|
||||
const doc = await open();
|
||||
doc.discard = async () => {
|
||||
busyNow = true;
|
||||
doc.pending = "";
|
||||
doc.text = doc.saved;
|
||||
};
|
||||
await ctrl.openInput({ kind: "busy-test", key: "busy:1" }, { focus: false });
|
||||
vi.mocked(ask).mockResolvedValue({ button: "discard", checked: false });
|
||||
vi.mocked(confirm).mockResolvedValue(false);
|
||||
const pane = useTabs.getState().activePane;
|
||||
expect(await ctrl.closeAll(pane)).toBe(false);
|
||||
expect(confirm).toHaveBeenCalledOnce();
|
||||
expect(useTabs.getState().panes[pane]!.tabs.map((tab) => tab.input.key)).toContain("busy:1");
|
||||
} finally {
|
||||
busy();
|
||||
vi.mocked(confirm).mockReset();
|
||||
}
|
||||
});
|
||||
|
||||
it("discards without a removal-triggered autosave", async () => {
|
||||
const doc = await open();
|
||||
useProject.setState({ settings: { files: { autoSave: true } } as never });
|
||||
|
||||
@@ -438,7 +438,10 @@
|
||||
.suggestion:focus-visible {
|
||||
outline: 2px solid var(--focus-ring);
|
||||
}
|
||||
/* The file name truncates first; the hint stays on one line. */
|
||||
.suggestionHint {
|
||||
flex: none;
|
||||
white-space: nowrap;
|
||||
color: var(--fg-faint);
|
||||
}
|
||||
.removeChip {
|
||||
@@ -458,6 +461,7 @@
|
||||
color: var(--fg-strong);
|
||||
}
|
||||
.attachmentName {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
|
||||
@@ -88,3 +88,16 @@
|
||||
max-width: 45%;
|
||||
margin-left: auto;
|
||||
}
|
||||
|
||||
.notes {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
height: 0;
|
||||
}
|
||||
.docked .notes {
|
||||
height: auto;
|
||||
}
|
||||
.docked .notes:empty {
|
||||
display: none;
|
||||
}
|
||||
@@ -221,26 +221,29 @@ export function HomeEditor({ docked = false }: { docked?: boolean; input?: Edito
|
||||
/>
|
||||
}
|
||||
/>
|
||||
{probe && (!docked || probe.error) && (
|
||||
<p className={probe.error ? styles.warning : styles.note}>
|
||||
{probe.error
|
||||
? txTemplate(`${provider?.name ?? probe.provider} didn't start: ${probe.error}`)
|
||||
: [probe.name, probe.version, probe.protocol].filter(Boolean).join(" · ")}
|
||||
</p>
|
||||
)}
|
||||
{(error || (provider && !provider.installed) || (provider && !provider.config.length)) && (
|
||||
<p
|
||||
className={error || !provider?.installed ? styles.warning : styles.note}
|
||||
role={error ? "alert" : undefined}
|
||||
>
|
||||
{error ??
|
||||
(provider && !provider.installed ? (
|
||||
txTemplate(`${provider.command} was not found on PATH`)
|
||||
) : (
|
||||
<T>Models and modes appear after this agent's first task.</T>
|
||||
))}
|
||||
</p>
|
||||
)}
|
||||
{/* Notes under the box don't take part in centring, so the box stays put as they come and go. */}
|
||||
<div className={styles.notes}>
|
||||
{probe && (!docked || probe.error) && (
|
||||
<p className={probe.error ? styles.warning : styles.note}>
|
||||
{probe.error
|
||||
? txTemplate(`${provider?.name ?? probe.provider} didn't start: ${probe.error}`)
|
||||
: [probe.name, probe.version, probe.protocol].filter(Boolean).join(" · ")}
|
||||
</p>
|
||||
)}
|
||||
{(error || (provider && !provider.installed) || (provider && !provider.config.length)) && (
|
||||
<p
|
||||
className={error || !provider?.installed ? styles.warning : styles.note}
|
||||
role={error ? "alert" : undefined}
|
||||
>
|
||||
{error ??
|
||||
(provider && !provider.installed ? (
|
||||
txTemplate(`${provider.command} was not found on PATH`)
|
||||
) : (
|
||||
<T>Models and modes appear after this agent's first task.</T>
|
||||
))}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -43,6 +43,27 @@
|
||||
color: var(--fg-muted);
|
||||
font-variant-numeric: tabular-nums;
|
||||
}
|
||||
/* In the composer: a × at the end removes the reference, as on the attached blocks. */
|
||||
.removable {
|
||||
padding-right: 2px;
|
||||
}
|
||||
.chipRemove {
|
||||
display: grid;
|
||||
flex: none;
|
||||
place-items: center;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
border-radius: var(--radius-small);
|
||||
background: none;
|
||||
color: var(--fg-muted);
|
||||
cursor: pointer;
|
||||
}
|
||||
.chipRemove:hover {
|
||||
background: var(--bg-hover);
|
||||
color: var(--fg-strong);
|
||||
}
|
||||
/* The file is gone (renamed or deleted since it was referenced). */
|
||||
.missing {
|
||||
color: var(--fg-muted);
|
||||
|
||||
@@ -55,8 +55,8 @@ export function openReference(path: string, mention: Mention) {
|
||||
const nameOf = (m: Mention) => basename(m.rel.replace(/\/$/, "")) || m.rel;
|
||||
const iconOf = (m: Mention) => (m.dir ? "folder" : fileIconName(nameOf(m), m.rel));
|
||||
|
||||
/** The chip as DOM, for the composer's editor. */
|
||||
export function chipElement(path: string, mention: Mention): HTMLElement {
|
||||
/** The chip as DOM, for the composer's editor; `onRemove` adds its × button. */
|
||||
export function chipElement(path: string, mention: Mention, onRemove?: () => void): HTMLElement {
|
||||
const chip = document.createElement("span");
|
||||
chip.className = styles.chip!;
|
||||
chip.dataset.refPath = path;
|
||||
@@ -74,6 +74,20 @@ export function chipElement(path: string, mention: Mention): HTMLElement {
|
||||
lines.textContent = linesLabel(mention.lines);
|
||||
chip.append(lines);
|
||||
}
|
||||
if (onRemove) {
|
||||
chip.classList.add(styles.removable!);
|
||||
const remove = document.createElement("button");
|
||||
remove.type = "button";
|
||||
remove.className = styles.chipRemove!;
|
||||
remove.setAttribute("aria-label", tx("Remove"));
|
||||
remove.append(iconNode("close", 10));
|
||||
remove.addEventListener("mousedown", (e) => e.preventDefault());
|
||||
remove.addEventListener("click", (e) => {
|
||||
e.stopPropagation();
|
||||
onRemove();
|
||||
});
|
||||
chip.append(remove);
|
||||
}
|
||||
if (!mention.dir)
|
||||
void fileExists(path).then((exists) => {
|
||||
if (!exists) chip.classList.add(styles.missing!);
|
||||
|
||||
@@ -41,9 +41,11 @@
|
||||
/* The task's state and its terminal and changes, just above the composer. */
|
||||
.statusBar {
|
||||
display: flex;
|
||||
/* What doesn't fit moves to the next line whole, instead of every fact shrinking to a letter. */
|
||||
flex-wrap: wrap;
|
||||
/* The changes chip sits above the line; the facts stay on that line's baseline. */
|
||||
align-items: flex-end;
|
||||
gap: 6px;
|
||||
gap: 2px 6px;
|
||||
min-width: 0;
|
||||
padding: 0 2px;
|
||||
overflow: hidden;
|
||||
@@ -54,6 +56,7 @@
|
||||
.agent {
|
||||
display: inline-flex;
|
||||
flex: 0 1 auto;
|
||||
max-width: 100%;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
height: 22px;
|
||||
@@ -70,6 +73,7 @@
|
||||
.where {
|
||||
display: inline-flex;
|
||||
flex: 0 1 auto;
|
||||
max-width: 100%;
|
||||
align-items: center;
|
||||
/* The chips' own padding spaces them. */
|
||||
gap: 2px;
|
||||
@@ -87,20 +91,21 @@
|
||||
height: 22px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
/* The changes sit above the meter, time and terminal; those keep their one row at the right. */
|
||||
/* The rest of the line: the changes at its start, the meter, time and terminal at its end.
|
||||
On a line of its own (a narrow session) the changes line up with the facts above. */
|
||||
.statusEnd {
|
||||
display: inline-flex;
|
||||
flex: 0 1 auto;
|
||||
flex-direction: column;
|
||||
align-items: flex-end;
|
||||
gap: 2px;
|
||||
flex: 1 1 auto;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 2px 8px;
|
||||
min-width: 0;
|
||||
margin-left: auto;
|
||||
}
|
||||
/* Shrinks before the terminal buttons do: in a narrow docked session the meters clip, not the controls. */
|
||||
.statusMeters {
|
||||
display: inline-flex;
|
||||
flex: 0 1 auto;
|
||||
margin-left: auto;
|
||||
align-items: center;
|
||||
height: 22px;
|
||||
gap: 8px;
|
||||
|
||||
@@ -387,7 +387,7 @@ function SessionStatus({
|
||||
<T>{statusLabel(task.status)}</T>
|
||||
{task.status === "limited" && task.resetsMs != null && ` · ${tx`resets ${formatSentAt(task.resetsMs)}`}`}
|
||||
</span>
|
||||
{/* What changed sits above the meter, time and terminal; those keep their one row at the right. */}
|
||||
{/* What changed sits before the meter, time and terminal, or above them when the row is full. */}
|
||||
<span className={styles.statusEnd}>
|
||||
{(!!changes?.length || !!commits.length) && (
|
||||
<span className={styles.statusChips}>
|
||||
|
||||
@@ -79,8 +79,16 @@ class ChipWidget extends WidgetType {
|
||||
eq(other: ChipWidget) {
|
||||
return other.path === this.path && other.text === this.text;
|
||||
}
|
||||
toDOM() {
|
||||
const chip = chipElement(this.path, this.mention);
|
||||
toDOM(view: EditorView) {
|
||||
const chip = chipElement(this.path, this.mention, () => {
|
||||
const from = view.posAtDOM(chip);
|
||||
const at = view.state.field(painted).chips.find((c) => c.from === from);
|
||||
if (!at) return;
|
||||
// The space typed after the reference goes with it.
|
||||
const end = view.state.sliceDoc(at.to, at.to + 1) === " " ? at.to + 1 : at.to;
|
||||
view.dispatch({ changes: { from: at.from, to: end }, userEvent: "delete" });
|
||||
view.focus();
|
||||
});
|
||||
// Keep the editor's focus and caret; a click opens the file.
|
||||
chip.addEventListener("mousedown", (e) => e.preventDefault());
|
||||
chip.addEventListener("click", (e) => {
|
||||
|
||||
@@ -814,25 +814,31 @@ export async function startTask(
|
||||
: (draft.config[o.id] ?? defaults[o.id] ?? null);
|
||||
return value !== null && o.values.some((v) => v.value === value) ? [{ id: o.id, value }] : [];
|
||||
});
|
||||
const task = await call(
|
||||
commands.agentCreate({
|
||||
projectRoot,
|
||||
prompt: toPrompt(composer),
|
||||
provider: draft.provider,
|
||||
config,
|
||||
isolation,
|
||||
base: isolation === "worktree" ? draft.base : null,
|
||||
}),
|
||||
);
|
||||
// Its events can arrive before this reply: keep the newer state they carried.
|
||||
useAgents.setState((s) => ({
|
||||
tasks: s.tasks.has(task.id) ? s.tasks : new Map(s.tasks).set(task.id, task),
|
||||
entries: new Map(s.entries).set(task.id, s.entries.get(task.id) ?? []),
|
||||
}));
|
||||
updateDraft({ projectRoot });
|
||||
remember(composer.text.trim());
|
||||
clearSubmittedComposer(HOME, composer, started);
|
||||
if ((await editorService().closeInput?.(HOME_KEY)) !== false) openTask(task.id);
|
||||
try {
|
||||
const task = await call(
|
||||
commands.agentCreate({
|
||||
projectRoot,
|
||||
prompt: toPrompt(composer),
|
||||
provider: draft.provider,
|
||||
config,
|
||||
isolation,
|
||||
base: isolation === "worktree" ? draft.base : null,
|
||||
}),
|
||||
);
|
||||
if (generation !== started) return;
|
||||
// Its events can arrive before this reply: keep the newer state they carried.
|
||||
useAgents.setState((s) => ({
|
||||
tasks: s.tasks.has(task.id) ? s.tasks : new Map(s.tasks).set(task.id, task),
|
||||
entries: new Map(s.entries).set(task.id, s.entries.get(task.id) ?? []),
|
||||
}));
|
||||
updateDraft({ projectRoot });
|
||||
remember(composer.text.trim());
|
||||
clearSubmittedComposer(HOME, composer, started);
|
||||
const closed = await editorService().closeInput?.(HOME_KEY);
|
||||
if (generation === started && closed !== false) openTask(task.id);
|
||||
} catch (e) {
|
||||
if (generation === started) throw e;
|
||||
}
|
||||
}
|
||||
|
||||
/** Sessions on this machine that no task holds yet (a terminal, another editor: #312). */
|
||||
@@ -955,11 +961,17 @@ export function quoteInComposer(task: string, text: string) {
|
||||
|
||||
/** Copies the task's conversation into a new task (up to its first `turns` turns) and opens it. */
|
||||
export async function forkTask(task: string, turns: number | null): Promise<void> {
|
||||
const copy = await call(commands.agentFork(task, turns));
|
||||
useAgents.setState((s) => ({
|
||||
tasks: s.tasks.has(copy.id) ? s.tasks : new Map(s.tasks).set(copy.id, copy),
|
||||
}));
|
||||
openTask(copy.id);
|
||||
const started = generation;
|
||||
try {
|
||||
const copy = await call(commands.agentFork(task, turns));
|
||||
if (generation !== started) return;
|
||||
useAgents.setState((s) => ({
|
||||
tasks: s.tasks.has(copy.id) ? s.tasks : new Map(s.tasks).set(copy.id, copy),
|
||||
}));
|
||||
openTask(copy.id);
|
||||
} catch (e) {
|
||||
if (generation === started) throw e;
|
||||
}
|
||||
}
|
||||
|
||||
/** Puts a message back in the task's composer, above anything typed meanwhile. */
|
||||
|
||||
@@ -0,0 +1,399 @@
|
||||
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
||||
import type { AgentTask, ProjectInfo } from "@/bindings";
|
||||
import { useProject } from "@/platform/project";
|
||||
import { HOME_KEY, SESSION_KIND, TOOL_WINDOW, sessionKey } from "./model";
|
||||
import {
|
||||
HOME,
|
||||
composerDraft,
|
||||
connect,
|
||||
disconnect,
|
||||
forkTask,
|
||||
startTask,
|
||||
updateComposer,
|
||||
updateDraft,
|
||||
useAgents,
|
||||
} from "./store";
|
||||
|
||||
const backend = vi.hoisted(() => ({
|
||||
create: vi.fn(),
|
||||
fork: vi.fn(),
|
||||
subscribe: vi.fn(),
|
||||
open: vi.fn(),
|
||||
close: vi.fn(),
|
||||
show: vi.fn(),
|
||||
closeAvailable: true,
|
||||
tasks: [] as AgentTask[],
|
||||
}));
|
||||
vi.mock("@tauri-apps/api/core", async (original) => ({
|
||||
...(await original<typeof import("@tauri-apps/api/core")>()),
|
||||
Channel: class {
|
||||
onmessage = () => {};
|
||||
},
|
||||
}));
|
||||
vi.mock("@/platform/ipc", async (original) => ({
|
||||
...(await original<typeof import("@/platform/ipc")>()),
|
||||
isTauri: () => true,
|
||||
commands: {
|
||||
agentCreate: backend.create,
|
||||
agentFork: backend.fork,
|
||||
agentSubscribe: backend.subscribe,
|
||||
agentProviders: async () => ({ status: "ok", data: [] }),
|
||||
},
|
||||
}));
|
||||
vi.mock("@/workbench/contributions", async (original) => ({
|
||||
...(await original<typeof import("@/workbench/contributions")>()),
|
||||
editorService: () => ({
|
||||
openInput: backend.open,
|
||||
closeInput: backend.closeAvailable ? backend.close : undefined,
|
||||
openTabs: () => [],
|
||||
}),
|
||||
toolWindowService: () => ({ show: backend.show }),
|
||||
}));
|
||||
|
||||
const ok = <T>(data: T) => ({ status: "ok" as const, data });
|
||||
function deferred() {
|
||||
let resolve!: (value: unknown) => void;
|
||||
let reject!: (reason: Error) => void;
|
||||
const promise = new Promise((done, fail) => {
|
||||
resolve = done;
|
||||
reject = fail;
|
||||
});
|
||||
return { promise, resolve, reject };
|
||||
}
|
||||
const task = (id: string, cwd = "/project-a"): AgentTask => ({
|
||||
id,
|
||||
cwd,
|
||||
title: id,
|
||||
provider: "codex",
|
||||
status: "ready",
|
||||
isolation: "local",
|
||||
model: null,
|
||||
branch: null,
|
||||
base: null,
|
||||
baseCommit: null,
|
||||
error: null,
|
||||
createdMs: 0,
|
||||
updatedMs: 0,
|
||||
config: [],
|
||||
commands: [],
|
||||
usage: null,
|
||||
queue: [],
|
||||
});
|
||||
const setProject = (root: string | null) =>
|
||||
useProject.setState({
|
||||
project: root === null ? null : ({ root, trusted: true } as ProjectInfo),
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
disconnect();
|
||||
vi.resetAllMocks();
|
||||
backend.closeAvailable = true;
|
||||
backend.close.mockResolvedValue(true);
|
||||
backend.tasks = [task("source")];
|
||||
backend.subscribe.mockImplementation(async () => ok(backend.tasks));
|
||||
setProject("/project-a");
|
||||
useProject.setState({ settings: null });
|
||||
useAgents.setState({
|
||||
loaded: true,
|
||||
tasks: new Map([["source", task("source")]]),
|
||||
entries: new Map(),
|
||||
providers: [],
|
||||
draft: { provider: "codex", config: {}, isolation: "local", base: "main" },
|
||||
history: [],
|
||||
composers: new Map(),
|
||||
lastComposer: HOME,
|
||||
focus: null,
|
||||
sessionLocation: "editor",
|
||||
docked: null,
|
||||
lastTask: null,
|
||||
homeOpen: true,
|
||||
});
|
||||
updateComposer(HOME, { text: "submitted in A" });
|
||||
});
|
||||
afterEach(() => disconnect());
|
||||
|
||||
const transitions = [
|
||||
"disconnect",
|
||||
"reconnect",
|
||||
"replace connection",
|
||||
"trust change",
|
||||
"A to B",
|
||||
"A to B to A",
|
||||
"A to B to C",
|
||||
"close project",
|
||||
] as const;
|
||||
async function transition(change: (typeof transitions)[number]) {
|
||||
if (change !== "replace connection") disconnect();
|
||||
if (change.startsWith("A to B")) setProject("/project-b");
|
||||
if (change === "trust change")
|
||||
useProject.setState({ project: { root: "/project-a", trusted: false } as ProjectInfo });
|
||||
if (change === "close project") setProject(null);
|
||||
backend.tasks = [task("current", useProject.getState().project?.root ?? "")];
|
||||
if (change !== "disconnect" && change !== "close project") await connect();
|
||||
if (change === "A to B to A" || change === "A to B to C") {
|
||||
disconnect();
|
||||
setProject(change === "A to B to A" ? "/project-a" : "/project-c");
|
||||
backend.tasks = [task("current", useProject.getState().project!.root)];
|
||||
await connect();
|
||||
}
|
||||
updateDraft({ projectRoot: "/current/member", provider: "current-agent", config: { model: "current-model" } });
|
||||
updateComposer(HOME, {
|
||||
text: "current project draft",
|
||||
files: [{ path: "/current/next.ts", rel: "next.ts", attached: true }],
|
||||
images: [{ mimeType: "image/png", data: "next", name: "next.png" }],
|
||||
});
|
||||
useAgents.setState({ history: ["current history"], docked: "current", homeOpen: true, lastTask: "current" });
|
||||
}
|
||||
|
||||
const paths = [
|
||||
{ name: "create local task", create: true, run: () => startTask("local"), mock: backend.create, turns: null },
|
||||
{ name: "create worktree task", create: true, run: () => startTask("worktree"), mock: backend.create, turns: null },
|
||||
{ name: "fork entire task", create: false, run: () => forkTask("source", null), mock: backend.fork, turns: null },
|
||||
{ name: "fork selected turns", create: false, run: () => forkTask("source", 2), mock: backend.fork, turns: 2 },
|
||||
];
|
||||
|
||||
describe.each(paths)("$name project ownership", (path) => {
|
||||
function begin() {
|
||||
const response = deferred();
|
||||
path.mock.mockReturnValueOnce(response.promise);
|
||||
return { ...response, pending: path.run() };
|
||||
}
|
||||
|
||||
it.each(["editor", "toolWindow"] as const)("opens a successful task in the current %s", async (location) => {
|
||||
useAgents.setState({ sessionLocation: location });
|
||||
const response = begin();
|
||||
expect(path.mock).toHaveBeenCalledTimes(1);
|
||||
if (path.create)
|
||||
expect(backend.create).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
prompt: { text: "submitted in A", files: [], images: [] },
|
||||
}),
|
||||
);
|
||||
else expect(backend.fork).toHaveBeenCalledWith("source", path.turns);
|
||||
response.resolve(ok(task("completed")));
|
||||
await response.pending;
|
||||
expect(useAgents.getState().tasks.get("completed")).toEqual(task("completed"));
|
||||
if (location === "editor") {
|
||||
expect(backend.open).toHaveBeenCalledWith(
|
||||
{ kind: SESSION_KIND, key: sessionKey("completed"), data: { task: "completed", title: "completed" } },
|
||||
{ focus: true },
|
||||
);
|
||||
} else {
|
||||
expect(useAgents.getState().docked).toBe("completed");
|
||||
expect(backend.show).toHaveBeenCalledWith(TOOL_WINDOW, true);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
}
|
||||
expect(composerDraft(HOME).text).toBe(path.create ? "" : "submitted in A");
|
||||
expect(useAgents.getState().history).toEqual(path.create ? ["submitted in A"] : []);
|
||||
});
|
||||
|
||||
it.each(transitions)("ignores a successful reply after %s", async (change) => {
|
||||
const response = begin();
|
||||
await transition(change);
|
||||
const current = useAgents.getState();
|
||||
response.resolve(ok(task("old-task")));
|
||||
await response.pending;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(backend.close).not.toHaveBeenCalled();
|
||||
expect(backend.show).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("leaves a current task with a colliding id and its conversation untouched", async () => {
|
||||
const response = begin();
|
||||
await transition("A to B");
|
||||
const currentTask = { ...task("completed", "/project-b"), title: "B's task" };
|
||||
useAgents.setState({
|
||||
tasks: new Map([[currentTask.id, currentTask]]),
|
||||
entries: new Map([[currentTask.id, [{ type: "agent", text: "B's conversation" }]]]),
|
||||
});
|
||||
const current = useAgents.getState();
|
||||
response.resolve(ok(task("completed")));
|
||||
await response.pending;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each([false, true])("preserves state on command failure (switched project=%s)", async (switched) => {
|
||||
const response = begin();
|
||||
if (switched) await transition("A to B");
|
||||
const current = useAgents.getState();
|
||||
const failure = switched
|
||||
? expect(response.pending).resolves.toBeUndefined()
|
||||
: expect(response.pending).rejects.toThrow("operation failed");
|
||||
response.resolve({ status: "error", error: { kind: "internal", message: "operation failed" } });
|
||||
await failure;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(backend.close).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it.each([false, true])("preserves state on transport failure (switched project=%s)", async (switched) => {
|
||||
const response = begin();
|
||||
if (switched) await transition("A to B");
|
||||
const current = useAgents.getState();
|
||||
const failure = switched
|
||||
? expect(response.pending).resolves.toBeUndefined()
|
||||
: expect(response.pending).rejects.toThrow("connection lost");
|
||||
response.reject(new Error("connection lost"));
|
||||
await failure;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(backend.close).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("keeps task and conversation events that arrived before the same-project reply", async () => {
|
||||
const response = begin();
|
||||
const newer = { ...task("completed"), title: "Newer title", status: "running" as const };
|
||||
useAgents.setState({
|
||||
tasks: new Map([[newer.id, newer]]),
|
||||
entries: new Map([[newer.id, [{ type: "agent", text: "new entry" }]]]),
|
||||
});
|
||||
response.resolve(ok(task("completed")));
|
||||
await response.pending;
|
||||
expect(useAgents.getState().tasks.get(newer.id)).toBe(newer);
|
||||
expect(useAgents.getState().entries.get(newer.id)).toEqual([{ type: "agent", text: "new entry" }]);
|
||||
});
|
||||
|
||||
it.each(["old first", "new first"])(
|
||||
"accepts only the new project's request when acknowledgements arrive %s",
|
||||
async (order) => {
|
||||
const old = begin();
|
||||
await transition("A to B");
|
||||
const current = begin();
|
||||
const finishOld = async () => {
|
||||
old.resolve(ok(task("old-task")));
|
||||
await old.pending;
|
||||
};
|
||||
const finishCurrent = async () => {
|
||||
current.resolve(ok(task("new-task", "/project-b")));
|
||||
await current.pending;
|
||||
};
|
||||
if (order === "old first") {
|
||||
await finishOld();
|
||||
await finishCurrent();
|
||||
} else {
|
||||
await finishCurrent();
|
||||
await finishOld();
|
||||
}
|
||||
expect([...useAgents.getState().tasks.keys()]).toEqual(["current", "new-task"]);
|
||||
expect(useAgents.getState().lastTask).toBe("new-task");
|
||||
expect(backend.open).toHaveBeenCalledTimes(1);
|
||||
expect(backend.open).toHaveBeenCalledWith(expect.objectContaining({ key: sessionKey("new-task") }), {
|
||||
focus: true,
|
||||
});
|
||||
expect(useAgents.getState().history).toEqual(
|
||||
path.create ? ["current project draft", "current history"] : ["current history"],
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
it.each(["first then second", "second then first"])(
|
||||
"keeps both legitimate same-project requests (%s)",
|
||||
async (order) => {
|
||||
const first = begin();
|
||||
const second = begin();
|
||||
const finishFirst = async () => {
|
||||
first.resolve(ok(task("first")));
|
||||
await first.pending;
|
||||
};
|
||||
const finishSecond = async () => {
|
||||
second.resolve(ok(task("second")));
|
||||
await second.pending;
|
||||
};
|
||||
if (order === "first then second") {
|
||||
await finishFirst();
|
||||
await finishSecond();
|
||||
} else {
|
||||
await finishSecond();
|
||||
await finishFirst();
|
||||
}
|
||||
expect(useAgents.getState().tasks.has("first")).toBe(true);
|
||||
expect(useAgents.getState().tasks.has("second")).toBe(true);
|
||||
expect(backend.open).toHaveBeenCalledTimes(2);
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
describe.each(paths.filter((path) => path.create))("$name after closing Home", (path) => {
|
||||
async function waitingForClose() {
|
||||
const closing = deferred();
|
||||
backend.close.mockReturnValueOnce(closing.promise);
|
||||
backend.create.mockResolvedValueOnce(ok(task("completed")));
|
||||
const pending = path.run();
|
||||
await vi.waitFor(() => expect(backend.close).toHaveBeenCalledWith(HOME_KEY));
|
||||
return { ...closing, pending };
|
||||
}
|
||||
|
||||
it.each(transitions)("does not navigate after %s while the page is closing", async (change) => {
|
||||
const closing = await waitingForClose();
|
||||
await transition(change);
|
||||
const current = useAgents.getState();
|
||||
closing.resolve(true);
|
||||
await closing.pending;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(backend.show).not.toHaveBeenCalled();
|
||||
expect(backend.close).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it.each(transitions)("does not surface an old close failure after %s", async (change) => {
|
||||
const closing = await waitingForClose();
|
||||
await transition(change);
|
||||
const current = useAgents.getState();
|
||||
const done = expect(closing.pending).resolves.toBeUndefined();
|
||||
closing.reject(new Error("old close failed"));
|
||||
await done;
|
||||
expect(useAgents.getState()).toBe(current);
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(backend.show).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("still navigates after closing when only settings or another composer changed", async () => {
|
||||
const closing = await waitingForClose();
|
||||
updateDraft({ config: { model: "different" } });
|
||||
updateComposer("other", { text: "another conversation" });
|
||||
closing.resolve(true);
|
||||
await closing.pending;
|
||||
expect(backend.open).toHaveBeenCalledWith(expect.objectContaining({ key: sessionKey("completed") }), {
|
||||
focus: true,
|
||||
});
|
||||
expect(composerDraft("other").text).toBe("another conversation");
|
||||
});
|
||||
|
||||
it("respects a cancelled close", async () => {
|
||||
const closing = await waitingForClose();
|
||||
closing.resolve(false);
|
||||
await closing.pending;
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(useAgents.getState().tasks.has("completed")).toBe(true);
|
||||
});
|
||||
|
||||
it("does not navigate when closing fails", async () => {
|
||||
const closing = await waitingForClose();
|
||||
const failure = expect(closing.pending).rejects.toThrow("could not close");
|
||||
closing.reject(new Error("could not close"));
|
||||
await failure;
|
||||
expect(backend.open).not.toHaveBeenCalled();
|
||||
expect(useAgents.getState().tasks.has("completed")).toBe(true);
|
||||
});
|
||||
|
||||
it("opens the task when the editor service has no close operation", async () => {
|
||||
backend.closeAvailable = false;
|
||||
backend.create.mockResolvedValueOnce(ok(task("completed")));
|
||||
await path.run();
|
||||
expect(backend.open).toHaveBeenCalledWith(expect.objectContaining({ key: sessionKey("completed") }), {
|
||||
focus: true,
|
||||
});
|
||||
});
|
||||
|
||||
it("keeps the workspace member selected for the request", async () => {
|
||||
const root = "/workspace/member-a";
|
||||
const result = task("completed", root);
|
||||
backend.create.mockResolvedValueOnce(ok(result));
|
||||
await startTask(path.name === "create worktree task" ? "worktree" : "local", root);
|
||||
expect(backend.create).toHaveBeenCalledWith(expect.objectContaining({ projectRoot: root }));
|
||||
expect(useAgents.getState().tasks.get(result.id)).toEqual(result);
|
||||
expect(backend.open).toHaveBeenCalledWith(expect.objectContaining({ key: sessionKey(result.id) }), { focus: true });
|
||||
});
|
||||
});
|
||||
@@ -246,12 +246,6 @@
|
||||
margin: 0 4px;
|
||||
background: var(--border);
|
||||
}
|
||||
.treeFilter {
|
||||
flex: 1;
|
||||
min-width: 80px;
|
||||
max-width: 280px;
|
||||
margin-left: 4px;
|
||||
}
|
||||
.treeHost {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
|
||||
@@ -41,7 +41,6 @@ beforeEach(() => {
|
||||
sequences: [],
|
||||
},
|
||||
},
|
||||
treeFilter: "",
|
||||
separateProceduresAndFunctions: false,
|
||||
treeExpanded: new Set(["pg", "pg/public", "pg/public/routines"]),
|
||||
});
|
||||
@@ -60,9 +59,6 @@ describe("routine grouping", () => {
|
||||
expect(tree.queryByText("functions")).toBeNull();
|
||||
fireEvent.mouseDown(tree.getAllByText("calculate")[1]!, { button: 0 });
|
||||
expect(useDatabase.getState().selectedNode?.key).toBe("pg/public/routines/calculate(text)");
|
||||
act(() => useDatabase.setState({ treeFilter: "refresh" }));
|
||||
expect(tree.queryAllByText("calculate")).toHaveLength(0);
|
||||
expect(tree.getByText("refresh_data")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("toggles through the action, persists the option, and restores the old expansion", async () => {
|
||||
@@ -91,7 +87,7 @@ describe("routine grouping", () => {
|
||||
});
|
||||
});
|
||||
|
||||
it.each([false, true])("applies object and quick filters before grouping (separate: %s)", (separate) => {
|
||||
it.each([false, true])("applies the object filter before grouping (separate: %s)", (separate) => {
|
||||
const source = useDatabase.getState().sources[0]!;
|
||||
useDatabase.setState({
|
||||
separateProceduresAndFunctions: separate,
|
||||
@@ -105,10 +101,6 @@ describe("routine grouping", () => {
|
||||
expect(tree.getAllByText("calculate")).toHaveLength(2);
|
||||
const folder = tree.getByText(separate ? "functions" : "routines").closest('[role="treeitem"]')!;
|
||||
expect(within(folder as HTMLElement).getByText("2")).toBeInTheDocument();
|
||||
act(() => useDatabase.setState({ treeFilter: "refresh" }));
|
||||
expect(tree.queryByText("public")).toBeNull();
|
||||
expect(tree.queryByText("routines")).toBeNull();
|
||||
expect(tree.queryByText("functions")).toBeNull();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
@@ -12,25 +12,17 @@ import { shortcutLabel } from "@/platform/keymap";
|
||||
import {
|
||||
Button,
|
||||
EmptyState,
|
||||
HighlightedText,
|
||||
Icon,
|
||||
IconButton,
|
||||
Menu,
|
||||
SearchField,
|
||||
Tree,
|
||||
showContextMenu,
|
||||
tooltipAttrs,
|
||||
type TreeHandle,
|
||||
T,
|
||||
} from "@/ui";
|
||||
import {
|
||||
databaseKey,
|
||||
passesObjectFilter,
|
||||
passesTreeFilter,
|
||||
shownNames,
|
||||
sourceIcon,
|
||||
splitTarget,
|
||||
targetOf,
|
||||
} from "./model";
|
||||
import { databaseKey, passesObjectFilter, shownNames, sourceIcon, splitTarget, targetOf } from "./model";
|
||||
import {
|
||||
nodeTarget,
|
||||
isOtherFolder,
|
||||
@@ -168,25 +160,10 @@ export function DatabaseView() {
|
||||
[st.sources],
|
||||
);
|
||||
|
||||
// While a quick filter is on, the schemas of expanded sources load their objects, so
|
||||
// tables / routines matching the filter show up without expanding every schema node.
|
||||
useEffect(() => {
|
||||
if (!st.treeFilter.trim()) return;
|
||||
const s = useDatabase.getState();
|
||||
for (const [target, list] of Object.entries(s.schemas)) {
|
||||
if (list.status !== "ok") continue;
|
||||
const { id, database } = splitTarget(target);
|
||||
if (!s.treeExpanded.has(database ? databaseKey(id, database) : id)) continue;
|
||||
for (const schema of list.value) {
|
||||
if (!s.tables[tablesKey(target, schema)]) void loadTables(target, schema);
|
||||
}
|
||||
}
|
||||
}, [st.treeFilter, st.treeExpanded, st.schemas]);
|
||||
|
||||
/** Schemas tab › Object filter, plus the toolbar's quick filter, of the data source of target `id`. */
|
||||
/** Schemas tab › Object filter of the data source of target `id`. */
|
||||
const shown = (id: string) => {
|
||||
const filter = sourceOf(id)?.introspection?.objectFilter;
|
||||
return (o: { name: string }) => passesObjectFilter(o.name, filter) && passesTreeFilter(o.name, st.treeFilter);
|
||||
return (o: { name: string }) => passesObjectFilter(o.name, filter);
|
||||
};
|
||||
const tablesOf = (id: string, schema: string) => {
|
||||
const t = st.tables[tablesKey(id, schema)];
|
||||
@@ -200,7 +177,7 @@ export function DatabaseView() {
|
||||
(st.objects[tablesKey(id, schema)]?.packages ?? []).filter(shown(id));
|
||||
const othersOf = (id: string, schema: string, folder: Folder) =>
|
||||
(st.objects[tablesKey(id, schema)]?.others ?? []).filter((o) => otherFolder(o.kind) === folder).filter(shown(id));
|
||||
/** Members of a schema folder, after object and quick filtering. */
|
||||
/** Members of a schema folder, after object filtering. */
|
||||
const folderSize = (id: string, schema: string, folder: Folder): number => {
|
||||
if (isOtherFolder(folder)) return othersOf(id, schema, folder).length;
|
||||
if (folder === "routines" || folder === "procedures" || folder === "functions")
|
||||
@@ -227,19 +204,9 @@ export function DatabaseView() {
|
||||
return shownNames(v.names, i?.allDatabases, i?.databases, v.current);
|
||||
};
|
||||
|
||||
/** Under a quick filter a schema shows when its name matches, or its loaded objects do. */
|
||||
const schemaVisible = (id: string, schema: string) =>
|
||||
passesTreeFilter(schema, st.treeFilter) ||
|
||||
!!tablesOf(id, schema)?.length ||
|
||||
routinesOf(id, schema).length > 0 ||
|
||||
packagesOf(id, schema).length > 0 ||
|
||||
sequencesOf(id, schema).length > 0;
|
||||
|
||||
const schemasOf = (key: string, id: string) =>
|
||||
status(key, st.schemas[id], (v) =>
|
||||
shownSchemas(id, v)
|
||||
.filter((schema) => schemaVisible(id, schema))
|
||||
.map((schema) => ({ kind: "schema", key: `${id}/${schema}`, id, schema }) as Node),
|
||||
shownSchemas(id, v).map((schema) => ({ kind: "schema", key: `${id}/${schema}`, id, schema }) as Node),
|
||||
);
|
||||
|
||||
const children = (n: Node): readonly Node[] | undefined => {
|
||||
@@ -563,7 +530,8 @@ export function DatabaseView() {
|
||||
const color = target ? sourceOf(target)?.color : null;
|
||||
return color ? `${styles.tintedRow} ${ROW_TINTS[color]}` : undefined;
|
||||
}}
|
||||
renderNode={(n: Node) => {
|
||||
speedSearchField
|
||||
renderNode={(n: Node, state) => {
|
||||
const i = icon(n);
|
||||
const d = detail(n);
|
||||
const counted = n.kind === "source" || n.kind === "database" || n.kind === "folder" || n.kind === "group";
|
||||
@@ -586,7 +554,7 @@ export function DatabaseView() {
|
||||
{live && <span className={styles.connectedDot} title={tx("Connected")} />}
|
||||
</span>
|
||||
)}
|
||||
<span className={labelClass}>{label(n)}</span>
|
||||
<HighlightedText className={labelClass} text={label(n)} indices={state.matches} />
|
||||
{n.kind === "source" && n.source.global && (
|
||||
<span className={styles.treeDetail} title={tx("Available in all projects")}>
|
||||
{tx("global")}
|
||||
@@ -643,7 +611,6 @@ function DatabaseToolbar() {
|
||||
const node = useDatabase((s) => s.selectedNode);
|
||||
const connected = useDatabase((s) => s.connected);
|
||||
const sources = useDatabase((s) => s.sources);
|
||||
const treeFilter = useDatabase((s) => s.treeFilter);
|
||||
const plus = useRef<HTMLButtonElement>(null);
|
||||
const newOpen = useDatabase((s) => s.newMenuOpen);
|
||||
const setNewOpen = (v: boolean) => useDatabase.setState({ newMenuOpen: v });
|
||||
@@ -689,13 +656,6 @@ function DatabaseToolbar() {
|
||||
>
|
||||
<T>DDL</T>
|
||||
</button>
|
||||
<SearchField
|
||||
className={styles.treeFilter}
|
||||
value={treeFilter}
|
||||
onChange={(treeFilter) => useDatabase.setState({ treeFilter })}
|
||||
placeholder={tx("Filter objects")}
|
||||
aria-label={tx("Filter objects")}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -4,7 +4,16 @@
|
||||
* a toolbar (re-run, export / copy as CSV, JSON, SQL…), the grid and a floating row count.
|
||||
*/
|
||||
import { copySelectionOnKeyDown } from "@/ui/selectableText";
|
||||
import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState, type MouseEvent } from "react";
|
||||
import {
|
||||
useCallback,
|
||||
useEffect,
|
||||
useLayoutEffect,
|
||||
useMemo,
|
||||
useRef,
|
||||
useState,
|
||||
useSyncExternalStore,
|
||||
type MouseEvent,
|
||||
} from "react";
|
||||
import clsx from "clsx";
|
||||
import { call, commands, type DbPlanNode, type DbQueryResult } from "@/platform/ipc";
|
||||
import { shortcutLabel } from "@/platform/keymap";
|
||||
@@ -198,8 +207,32 @@ function Pager({ tab }: { tab: ResultTab }) {
|
||||
);
|
||||
}
|
||||
|
||||
/** Unsubmitted edits by the rows they were made on, kept while another result tab is shown. */
|
||||
/**
|
||||
* Unsubmitted edits by the rows they were made on, and the results whose edits are being
|
||||
* submitted. They live outside the pane, which remounts when another result tab is selected,
|
||||
* so a submit that ends while its pane is unmounted still clears what the remounted one shows.
|
||||
*/
|
||||
const keptEdits = new WeakMap<DbQueryResult, PendingEdits>();
|
||||
const submittingResults = new Set<DbQueryResult>();
|
||||
const NO_EDITS = emptyEdits();
|
||||
const resultListeners = new Set<() => void>();
|
||||
function notifyResults() {
|
||||
for (const listener of resultListeners) listener();
|
||||
}
|
||||
function subscribeResults(listener: () => void) {
|
||||
resultListeners.add(listener);
|
||||
return () => void resultListeners.delete(listener);
|
||||
}
|
||||
function setKeptEdits(result: DbQueryResult, edits: PendingEdits) {
|
||||
if (hasEdits(edits)) keptEdits.set(result, edits);
|
||||
else keptEdits.delete(result);
|
||||
notifyResults();
|
||||
}
|
||||
function setSubmittingResult(result: DbQueryResult, on: boolean) {
|
||||
if (on) submittingResults.add(result);
|
||||
else submittingResults.delete(result);
|
||||
notifyResults();
|
||||
}
|
||||
|
||||
function Result({ tab }: { tab: ResultTab }) {
|
||||
const [view, setView] = useState<"table" | "chart">("table");
|
||||
@@ -275,20 +308,12 @@ function Result({ tab }: { tab: ResultTab }) {
|
||||
driver !== "clickhouse" &&
|
||||
sources.some((s) => s !== null);
|
||||
|
||||
// The pending edits belong to the result they were made on: fresh rows (a
|
||||
// re-run, another page) start over, without an effect. They outlive the pane,
|
||||
// which remounts when another result tab is selected.
|
||||
const [pending, setPending] = useState<{ outcome: DbQueryResult | null; edits: PendingEdits }>(() => ({
|
||||
outcome: r ?? null,
|
||||
edits: (r && keptEdits.get(r)) ?? emptyEdits(),
|
||||
}));
|
||||
const edits = pending.outcome === r ? pending.edits : emptyEdits();
|
||||
const setEdits = (f: (e: PendingEdits) => PendingEdits) =>
|
||||
setPending((previous) => {
|
||||
const next = f(previous.outcome === r ? previous.edits : emptyEdits());
|
||||
if (r) keptEdits.set(r, next);
|
||||
return { outcome: r ?? null, edits: next };
|
||||
});
|
||||
// The pending edits belong to the result they were made on: fresh rows (a re-run,
|
||||
// another page) start over.
|
||||
const edits = useSyncExternalStore(subscribeResults, () => (r && keptEdits.get(r)) ?? NO_EDITS);
|
||||
const setEdits = (f: (e: PendingEdits) => PendingEdits) => {
|
||||
if (r) setKeptEdits(r, f(keptEdits.get(r) ?? NO_EDITS));
|
||||
};
|
||||
const loaded = r?.rows.length ?? 0;
|
||||
const rowCount = loaded + edits.inserts.length;
|
||||
const value = useCallback(
|
||||
@@ -341,14 +366,12 @@ function Result({ tab }: { tab: ResultTab }) {
|
||||
});
|
||||
|
||||
const dirty = hasEdits(edits);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const submitGuard = useRef(false);
|
||||
const submitting = useSyncExternalStore(subscribeResults, () => !!r && submittingResults.has(r));
|
||||
const busy = submitting || !!tab.busy;
|
||||
|
||||
const submit = async () => {
|
||||
if (!r || !target || !pk || !editable || busy || submitGuard.current) return;
|
||||
submitGuard.current = true;
|
||||
setSubmitting(true);
|
||||
if (!r || !target || !pk || !editable || busy || submittingResults.has(r)) return;
|
||||
setSubmittingResult(r, true);
|
||||
const list = buildRowEdits(resultNames, r.rows, pk, edits);
|
||||
try {
|
||||
// The Output log shows what the submit is about to change.
|
||||
@@ -358,7 +381,8 @@ function Result({ tab }: { tab: ResultTab }) {
|
||||
);
|
||||
log("result", `${target.table}: ${n} row(s) changed`);
|
||||
notifications().notify({ level: "info", title: `${target.table}: ${n} row(s) changed`, key: "db-submit" });
|
||||
setEdits(() => emptyEdits());
|
||||
// Also when this pane was unmounted meanwhile: the applied edits must not come back.
|
||||
setKeptEdits(r, NO_EDITS);
|
||||
await rerunResult(tab.id);
|
||||
} catch (e) {
|
||||
log("error", e instanceof Error ? e.message : String(e));
|
||||
@@ -369,8 +393,7 @@ function Result({ tab }: { tab: ResultTab }) {
|
||||
key: "db-submit",
|
||||
});
|
||||
} finally {
|
||||
submitGuard.current = false;
|
||||
setSubmitting(false);
|
||||
setSubmittingResult(r, false);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -3,10 +3,18 @@ import { describe, expect, it, vi } from "vitest";
|
||||
import { SourceDialog } from "./SourceDialog";
|
||||
|
||||
const ipc = vi.hoisted(() => ({ call: vi.fn() }));
|
||||
vi.mock("@/platform/ipc", async (importOriginal) => ({
|
||||
...(await importOriginal<typeof import("@/platform/ipc")>()),
|
||||
call: ipc.call,
|
||||
}));
|
||||
vi.mock("@/platform/ipc", async (importOriginal) => {
|
||||
const real = await importOriginal<typeof import("@/platform/ipc")>();
|
||||
// The commands `call` receives must not reach Tauri's invoke, which jsdom lacks.
|
||||
const request =
|
||||
(name: string) =>
|
||||
(...args: unknown[]) => [name, ...args];
|
||||
return {
|
||||
...real,
|
||||
call: ipc.call,
|
||||
commands: { ...real.commands, dbTest: request("dbTest"), dbTestTunnel: request("dbTestTunnel") },
|
||||
};
|
||||
});
|
||||
|
||||
const savePassword = () => screen.getByRole("checkbox", { name: "Save password" }) as HTMLInputElement;
|
||||
|
||||
@@ -63,6 +71,7 @@ describe("Test SSH Tunnel", () => {
|
||||
await waitFor(() =>
|
||||
expect(screen.getByRole("status").textContent).toBe("SSH tunnel works: dev@bastion:22 reaches 127.0.0.1:5432"),
|
||||
);
|
||||
expect(ipc.call.mock.calls[0]?.[0]?.[0]).toBe("dbTestTunnel");
|
||||
ipc.call.mockClear();
|
||||
});
|
||||
});
|
||||
@@ -12,7 +12,6 @@ import {
|
||||
idleTargets,
|
||||
matchesPattern,
|
||||
parseSourceUrl,
|
||||
passesTreeFilter,
|
||||
schemaSwitchable,
|
||||
shownNames,
|
||||
sourceLabel,
|
||||
@@ -392,16 +391,6 @@ describe("Schemas tab", () => {
|
||||
expect(shownNames(names, false, ["app*"], "postgres")).toEqual(["app", "app_test", "postgres"]);
|
||||
expect(shownNames(names, false, [])).toEqual([]);
|
||||
});
|
||||
|
||||
it("quick-filters tree objects by a case-insensitive substring", () => {
|
||||
expect(passesTreeFilter("users", "user")).toBe(true);
|
||||
expect(passesTreeFilter("Users", "user")).toBe(true);
|
||||
expect(passesTreeFilter("order_items", " IT ")).toBe(true);
|
||||
expect(passesTreeFilter("users", "orders")).toBe(false);
|
||||
expect(passesTreeFilter("users", "")).toBe(true);
|
||||
expect(passesTreeFilter("users", " ")).toBe(true);
|
||||
expect(passesTreeFilter("users", null)).toBe(true);
|
||||
});
|
||||
});
|
||||
|
||||
describe("active schema", () => {
|
||||
|
||||
@@ -205,15 +205,6 @@ export function passesObjectFilter(name: string, filter: string | null | undefin
|
||||
return !patterns.length || patterns.some((p) => matchesPattern(name.toLowerCase(), p.toLowerCase()));
|
||||
}
|
||||
|
||||
/**
|
||||
* The tree's quick filter (the toolbar's field): `name` contains it,
|
||||
* case-insensitively (`*` / `?` still work through `matchesPattern` callers).
|
||||
*/
|
||||
export function passesTreeFilter(name: string, filter: string | null | undefined): boolean {
|
||||
const q = (filter ?? "").trim().toLowerCase();
|
||||
return !q || name.toLowerCase().includes(q);
|
||||
}
|
||||
|
||||
/**
|
||||
* Whether a console of `driver` gets the active-schema dropdown (a server with
|
||||
* several schemas / databases to switch between; SQLite has one database only).
|
||||
|
||||
@@ -231,6 +231,66 @@ describe("editable result grid", () => {
|
||||
await act(async () => finish({ status: "ok", data: 1 }));
|
||||
});
|
||||
|
||||
it("keeps a submission in flight from being repeated after switching result tabs", async () => {
|
||||
let finish!: (value: { status: string; data: number }) => void;
|
||||
backend.applyEdits.mockImplementation(
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
finish = resolve;
|
||||
}),
|
||||
);
|
||||
backend.execute.mockImplementation(() => new Promise(() => {}));
|
||||
const first = show("SELECT * FROM users", [{ name: "id" }, { name: "name" }], [["1", "Ann"]]);
|
||||
const second: ResultTab = {
|
||||
...first,
|
||||
id: nextId++,
|
||||
title: "Result 2",
|
||||
outcome: { ...first.outcome, result: { ...first.outcome.result! } },
|
||||
};
|
||||
useDatabase.setState((s) => ({ results: [...s.results, second] }));
|
||||
await act(async () => render(<ResultsView />));
|
||||
fireEvent.click(screen.getByRole("button", { name: "Add Row" }));
|
||||
await act(async () => fireEvent.click(screen.getByRole("button", { name: "Submit" })));
|
||||
|
||||
await act(async () => useDatabase.setState({ activeResult: second.id }));
|
||||
await act(async () => useDatabase.setState({ activeResult: first.id }));
|
||||
expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
|
||||
fireEvent.click(screen.getByRole("button", { name: "Submit" }));
|
||||
expect(backend.applyEdits).toHaveBeenCalledTimes(1);
|
||||
|
||||
await act(async () => finish({ status: "ok", data: 1 }));
|
||||
// The applied row is not offered again while the result re-runs.
|
||||
expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
|
||||
});
|
||||
|
||||
it("drops applied edits from a remounted pane even when the refresh fails", async () => {
|
||||
let finish!: (value: { status: string; data: number }) => void;
|
||||
backend.applyEdits.mockImplementation(
|
||||
() =>
|
||||
new Promise((resolve) => {
|
||||
finish = resolve;
|
||||
}),
|
||||
);
|
||||
backend.execute.mockResolvedValue({ status: "error", error: { kind: "invalid", message: "gone" } });
|
||||
const first = show("SELECT * FROM users", [{ name: "id" }, { name: "name" }], [["1", "Ann"]]);
|
||||
const second: ResultTab = {
|
||||
...first,
|
||||
id: nextId++,
|
||||
title: "Result 2",
|
||||
outcome: { ...first.outcome, result: { ...first.outcome.result! } },
|
||||
};
|
||||
useDatabase.setState((s) => ({ results: [...s.results, second] }));
|
||||
await act(async () => render(<ResultsView />));
|
||||
fireEvent.click(screen.getByRole("button", { name: "Add Row" }));
|
||||
await act(async () => fireEvent.click(screen.getByRole("button", { name: "Submit" })));
|
||||
await act(async () => useDatabase.setState({ activeResult: second.id }));
|
||||
await act(async () => useDatabase.setState({ activeResult: first.id }));
|
||||
|
||||
await act(async () => finish({ status: "ok", data: 1 }));
|
||||
expect(screen.getByRole("button", { name: "Submit" })).toBeDisabled();
|
||||
expect(backend.applyEdits).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it("uses the execution schema even after the console selection changes", async () => {
|
||||
const tab = show("SELECT * FROM users", [{ name: "id" }, { name: "name" }], [["1", "Ann"]]);
|
||||
Object.assign(tab, { schema: "s2" });
|
||||
|
||||
@@ -164,8 +164,6 @@ interface DatabaseState {
|
||||
consoles: Record<string, string>;
|
||||
/** Console path → its active schema (unqualified names resolve there; see `consoleSchema`). */
|
||||
consoleSchemas: Record<string, string>;
|
||||
/** The Database tree's quick object filter (empty: everything shows). */
|
||||
treeFilter: string;
|
||||
separateProceduresAndFunctions: boolean;
|
||||
completion: Record<string, DbCompletion>;
|
||||
results: ResultTab[];
|
||||
@@ -233,7 +231,6 @@ export const useDatabase = create<DatabaseState>(() => ({
|
||||
objects: {},
|
||||
consoles: readBindings(),
|
||||
consoleSchemas: readConsoleSchemas(),
|
||||
treeFilter: "",
|
||||
separateProceduresAndFunctions: readSeparateProceduresAndFunctions(),
|
||||
completion: {},
|
||||
results: [],
|
||||
|
||||
@@ -66,6 +66,24 @@ beforeEach(() => {
|
||||
});
|
||||
});
|
||||
|
||||
/** Where the page goes when it runs `expression`; null when it stays. Tracks the address. */
|
||||
let pageAt = "http://localhost:5173/";
|
||||
function run(expression: string): string | null {
|
||||
let went: string | null = null;
|
||||
const location = {
|
||||
get href() {
|
||||
return pageAt;
|
||||
},
|
||||
assign: (url: string) => {
|
||||
went = url;
|
||||
pageAt = url;
|
||||
},
|
||||
};
|
||||
// The page's own globals may shadow the browser's (`const URL = "/api"`).
|
||||
new Function("location", "URL", `return ${expression}`)(location, "/api");
|
||||
return went;
|
||||
}
|
||||
|
||||
describe("the browser of a project under the debugger", () => {
|
||||
it("is started once: a second launch sends its page to the new address and selects it", async () => {
|
||||
const first = await startBrowserSession(browserLaunch("a", "http://localhost:5173/", "chrome", "/p"));
|
||||
@@ -76,13 +94,18 @@ describe("the browser of a project under the debugger", () => {
|
||||
const again = await startBrowserSession(browserLaunch("b", "http://localhost:5173/cart", "chrome", "/p"));
|
||||
expect(again).toBe(first);
|
||||
expect(ipc.debugStart).toHaveBeenCalledTimes(1);
|
||||
expect(ipc.debugEvaluateIn).toHaveBeenCalledWith(2, null, 'location.assign("http://localhost:5173/cart")', "repl");
|
||||
const sentTo = () => ipc.debugEvaluateIn.mock.calls.map(([, , expression]) => run(String(expression)));
|
||||
expect(sentTo()).toEqual(["http://localhost:5173/cart"]);
|
||||
expect(useDebug.getState().active).toBe(2);
|
||||
|
||||
// The address it was started on: the page is where it is.
|
||||
// Back to the address it was started on: the page is at /cart now, so it goes back.
|
||||
ipc.debugEvaluateIn.mockClear();
|
||||
await startBrowserSession(browserLaunch("a", "http://localhost:5173/", "chrome", "/p"));
|
||||
expect(ipc.debugEvaluateIn).not.toHaveBeenCalled();
|
||||
expect(sentTo()).toEqual(["http://localhost:5173/"]);
|
||||
// A page already at the address stays as it is.
|
||||
ipc.debugEvaluateIn.mockClear();
|
||||
await startBrowserSession(browserLaunch("a", "http://localhost:5173/", "chrome", "/p"));
|
||||
expect(sentTo()).toEqual([null]);
|
||||
});
|
||||
|
||||
it("is another one for another browser, another project, or after the first has ended", async () => {
|
||||
|
||||
@@ -113,7 +113,7 @@ describe("run config → launch config", () => {
|
||||
)!;
|
||||
expect(script.program).toBe("/p/manage.py");
|
||||
expect(script.args).toEqual(["runserver"]);
|
||||
expect(extra(script)).toMatchObject({ python: "/p/.venv/bin/python", django: true, console: "internalConsole" });
|
||||
expect(extra(script)).toMatchObject({ python: "/p/.venv/bin/python", django: true, console: "integratedTerminal" });
|
||||
|
||||
const mod = launchConfigFor(
|
||||
rc({ kind: "python", command: "python3", args: ["-m", "app", "-v"], debugAdapter: "debugpy" }),
|
||||
|
||||
@@ -52,6 +52,13 @@ describe("watches while the program runs", () => {
|
||||
]);
|
||||
});
|
||||
|
||||
it("evaluates a multi-line watch as one expression", async () => {
|
||||
const multiline = "items\n .filter((i) => i.done)\n .length";
|
||||
renderHook(() => useLiveWatches(session(), [multiline, "b"], true));
|
||||
await settle();
|
||||
expect(asked.map((a) => a[2])).toEqual([multiline, "b"]);
|
||||
});
|
||||
|
||||
it("refreshes every second and not faster", async () => {
|
||||
expect(LIVE_WATCH_INTERVAL_MS).toBe(1000);
|
||||
renderHook(() => useLiveWatches(session(), ["a"], true));
|
||||
|
||||
@@ -42,7 +42,8 @@ export function useLiveWatches(
|
||||
const [data, setData] = useState<{ session: number; rows: LiveWatch[] }>({ session: -1, rows: NONE });
|
||||
const apply = visible && watches.length > 0 && liveWatchesApply(session);
|
||||
const id = session?.id ?? -1;
|
||||
const expressions = watches.join("\n");
|
||||
// A stable dependency for the list; a watch may span several lines.
|
||||
const expressions = JSON.stringify(watches);
|
||||
useEffect(() => {
|
||||
if (!apply) return;
|
||||
let current = true;
|
||||
@@ -51,7 +52,7 @@ export function useLiveWatches(
|
||||
if (evaluating.has(id)) return;
|
||||
evaluating.add(id);
|
||||
const rows = await Promise.all(
|
||||
expressions.split("\n").map(async (expression): Promise<LiveWatch> => {
|
||||
(JSON.parse(expressions) as string[]).map(async (expression): Promise<LiveWatch> => {
|
||||
try {
|
||||
return {
|
||||
expression,
|
||||
|
||||
@@ -95,10 +95,11 @@ function debugpyLaunch(rc: RunConfig, cwd: string): LaunchConfig {
|
||||
const dbg = workflowSettings().debugger;
|
||||
const extra: Record<string, unknown> = {
|
||||
python: pythonFor(rc, cwd),
|
||||
console: "internalConsole",
|
||||
// On a terminal the program reads what is typed in the debug console (`input()`); its
|
||||
// output reaches the console from there, so debugpy doesn't capture it a second time.
|
||||
console: "integratedTerminal",
|
||||
justMyCode: dbg.skipLibraryCode,
|
||||
subProcess: dbg.python.attachSubprocess,
|
||||
redirectOutput: true,
|
||||
};
|
||||
if (dbg.python.gevent) extra.gevent = true;
|
||||
const name = (rc.command.split("/").pop() ?? rc.command).replace(/\.exe$/, "");
|
||||
|
||||
@@ -510,6 +510,15 @@ function selectBrowserPage(launch: DebugSessionId) {
|
||||
publishContext();
|
||||
}
|
||||
|
||||
/** `url` as `location.href` spells it (`http://localhost:5173` → `http://localhost:5173/`). */
|
||||
function canonicalUrl(url: string): string {
|
||||
try {
|
||||
return new URL(url).href;
|
||||
} catch {
|
||||
return url;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Debugs the page `launch` opens. A project has one browser of a kind under the debugger (a
|
||||
* second one can't share its profile), so when it is already running its page goes to the URL
|
||||
@@ -529,8 +538,12 @@ export async function startBrowserSession(
|
||||
if (!page) return running.id;
|
||||
selectSession(page.id);
|
||||
const url = launchedUrl(launch);
|
||||
if (url && url !== launchedUrl(running.launch!)) {
|
||||
const go = `location.assign(${JSON.stringify(url)})`;
|
||||
if (url) {
|
||||
// The page may have moved on since the browser started (an earlier launch, a link): it
|
||||
// compares its own address, so a page already there isn't reloaded. The address is made
|
||||
// canonical here, the page's own `URL` may be anything.
|
||||
const target = JSON.stringify(canonicalUrl(url));
|
||||
const go = `location.href !== ${target} && location.assign(${target})`;
|
||||
await call(commands.debugEvaluateIn(page.id, null, go, "repl")).catch(() => undefined);
|
||||
}
|
||||
return running.id;
|
||||
|
||||
@@ -39,6 +39,7 @@ import {
|
||||
HighlightedText,
|
||||
Icon,
|
||||
Popup,
|
||||
beginDrag,
|
||||
dragSession,
|
||||
registerDropTarget,
|
||||
Tree,
|
||||
@@ -641,6 +642,7 @@ export function ProjectView() {
|
||||
// editor opens only files, so folders carry the trailing slash `findDirs`
|
||||
// uses and the editor leaves them out.
|
||||
let files: DragSession | null = null;
|
||||
let endDrag: (() => void) | null = null;
|
||||
const move = (ev: PointerEvent) => {
|
||||
// A press with no button held is a reordered macOS tap, not a drag (see pointerDrag.ts).
|
||||
if (!(ev.buttons & 1)) {
|
||||
@@ -651,6 +653,7 @@ export function ProjectView() {
|
||||
if (Math.hypot(ev.clientX - startX, ev.clientY - startY) < DRAG_THRESHOLD) return;
|
||||
active = true;
|
||||
dragged.current = true;
|
||||
endDrag = beginDrag();
|
||||
const m = selectModel(useProjectTree.getState());
|
||||
const keys = before.has(node.key) ? [...before] : [node.key];
|
||||
if (before.has(node.key)) setSelection(before, lead);
|
||||
@@ -697,6 +700,7 @@ export function ProjectView() {
|
||||
window.removeEventListener("pointercancel", cleanup);
|
||||
window.removeEventListener("keydown", key, true);
|
||||
files?.cancel();
|
||||
endDrag?.();
|
||||
setDropTarget(null);
|
||||
setDrag(null);
|
||||
};
|
||||
|
||||
@@ -173,6 +173,14 @@ describe("Settings dialog", () => {
|
||||
expect(within(dialog).getByLabelText("Toolchains file")).toBeInTheDocument();
|
||||
});
|
||||
|
||||
it("selects the page a search names over pages that mention it", async () => {
|
||||
const dialog = await openDialog("appearance");
|
||||
fireEvent.change(within(dialog).getByLabelText("Search settings"), { target: { value: "Font" } });
|
||||
const tree = within(dialog).getByRole("tree", { name: "Settings pages" });
|
||||
expect(within(tree).getAllByRole("treeitem").length).toBeGreaterThan(1);
|
||||
expect(within(tree).getByRole("treeitem", { selected: true }).textContent).toBe("Font");
|
||||
});
|
||||
|
||||
it("searches pages and highlights matching option labels", async () => {
|
||||
const dialog = await openDialog("appearance");
|
||||
fireEvent.change(within(dialog).getByLabelText("Search settings"), { target: { value: "soft wrap" } });
|
||||
|
||||
@@ -8,6 +8,7 @@ import {
|
||||
highlightIndices,
|
||||
matchesTerms,
|
||||
queryTerms,
|
||||
titledPage,
|
||||
} from "../model/pages";
|
||||
import { BEHAVIOR_PAGES } from "../pages/behavior";
|
||||
import { EDITOR_PAGES } from "../pages/editor";
|
||||
@@ -90,3 +91,24 @@ it("indexes toolbar and status bar visibility in Appearance settings", () => {
|
||||
expect(labels).toContain("Show main toolbar");
|
||||
expect(labels).toContain("Show status bar");
|
||||
});
|
||||
|
||||
describe("the page a search names", () => {
|
||||
const notifications = page({
|
||||
id: "notifications",
|
||||
title: "Notifications",
|
||||
keywords: ["Plugins", "Language Servers"],
|
||||
});
|
||||
const tree = buildPageTree([...pages, notifications]);
|
||||
const named = (q: string) => titledPage(filterPageTree(tree, q), q)?.key ?? null;
|
||||
|
||||
it("is the page titled like the query, not one that only mentions it", () => {
|
||||
expect(named("Plugins")).toBe("plugins");
|
||||
expect(named("language servers")).toBe("languages.servers");
|
||||
expect(named("Plu")).toBe("plugins");
|
||||
});
|
||||
|
||||
it("is none when no title starts with the query", () => {
|
||||
expect(named("shortcut")).toBeNull();
|
||||
expect(named("")).toBeNull();
|
||||
});
|
||||
});
|
||||
@@ -28,7 +28,16 @@ import {
|
||||
} from "@/ui";
|
||||
import { PageContext, useSettingsFormFor } from "../components/context";
|
||||
import { SearchLabel } from "../components/Form";
|
||||
import { breadcrumb, buildPageTree, filterPageTree, flatten, groupKey, type PageNode } from "../model/pages";
|
||||
import {
|
||||
breadcrumb,
|
||||
buildPageTree,
|
||||
filterPageTree,
|
||||
flatten,
|
||||
groupKey,
|
||||
titledPage,
|
||||
titleRank,
|
||||
type PageNode,
|
||||
} from "../model/pages";
|
||||
import {
|
||||
applySettings,
|
||||
closeSettings,
|
||||
@@ -264,7 +273,15 @@ export function SettingsLayout() {
|
||||
|
||||
const onQuery = (q: string) => {
|
||||
setQuery(q);
|
||||
const next = flatten(filterPageTree(tree, q, pageLabels));
|
||||
const filtered = filterPageTree(tree, q, pageLabels);
|
||||
const next = flatten(filtered);
|
||||
// A page named like the query wins over pages that only mention it.
|
||||
const titled = titledPage(filtered, q);
|
||||
const rank = (n: PageNode | undefined) => (n ? (titleRank(n, q) ?? 2) : 2);
|
||||
if (titled && titled.key !== current?.key && rank(titled) < rank(current)) {
|
||||
selectPage(titled.key);
|
||||
return;
|
||||
}
|
||||
if (q && current && !next.some((n) => n.key === current.key && n.matched)) {
|
||||
const first = firstPage(next);
|
||||
if (first) selectPage(first);
|
||||
|
||||
@@ -94,6 +94,33 @@ export function matchesTerms(texts: readonly string[], terms: readonly string[])
|
||||
return terms.every((term) => hay.some((h) => h.includes(term)));
|
||||
}
|
||||
|
||||
/**
|
||||
* How well a page's title answers the query: 0 when it is the query, 1 when it starts with
|
||||
* it, null otherwise (English or translated title).
|
||||
*/
|
||||
export function titleRank(node: PageNode, query: string): number | null {
|
||||
const q = query.trim().toLowerCase();
|
||||
if (!q || !node.page) return null;
|
||||
const titles = [node.title.toLowerCase(), tx(node.title).toLowerCase()];
|
||||
if (titles.includes(q)) return 0;
|
||||
if (titles.some((title) => title.startsWith(q))) return 1;
|
||||
return null;
|
||||
}
|
||||
|
||||
/** The matching page whose title answers the query best (see {@link titleRank}), if any. */
|
||||
export function titledPage(nodes: readonly PageNode[], query: string): PageNode | null {
|
||||
let best: PageNode | null = null;
|
||||
let bestRank = Infinity;
|
||||
for (const n of flatten(nodes)) {
|
||||
const rank = n.matched ? titleRank(n, query) : null;
|
||||
if (rank !== null && rank < bestRank) {
|
||||
best = n;
|
||||
bestRank = rank;
|
||||
}
|
||||
}
|
||||
return best;
|
||||
}
|
||||
|
||||
/** Indices of `text` covered by any term (for highlighting option labels), or null. */
|
||||
export function highlightIndices(text: string, query: string): number[] | null {
|
||||
const terms = queryTerms(query);
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import zh from "@/platform/locales/text/zh.json";
|
||||
import { BUILTIN_CODE_TEMPLATES, BUILTIN_FILE_TEMPLATES } from "../files/builtins";
|
||||
|
||||
/** Names that read the same in Chinese. */
|
||||
const AS_WRITTEN = new Set(["Dockerfile", "Jupyter Notebook"]);
|
||||
|
||||
describe("built-in template names", () => {
|
||||
it("are translated where the New menu and dialog show them", () => {
|
||||
const texts = zh as Record<string, string>;
|
||||
const names = [...BUILTIN_FILE_TEMPLATES, ...BUILTIN_CODE_TEMPLATES].map((t) => t.name);
|
||||
expect(names.filter((name) => !AS_WRITTEN.has(name) && !texts[name])).toEqual([]);
|
||||
});
|
||||
});
|
||||
@@ -99,7 +99,7 @@ function TemplateStep({
|
||||
renderItem={(t) => (
|
||||
<span className={styles.templateRow}>
|
||||
<Icon name={t.icon} size={16} className={styles.icon} />
|
||||
{t.name}
|
||||
{tx(t.name)}
|
||||
</span>
|
||||
)}
|
||||
/>
|
||||
@@ -230,10 +230,10 @@ function NameStep({
|
||||
<Dialog
|
||||
open
|
||||
onClose={close}
|
||||
title={tx`New ${template.name}`}
|
||||
title={tx`New ${tx(template.name)}`}
|
||||
width={380}
|
||||
position="top"
|
||||
aria-label={tx`New ${template.name}`}
|
||||
aria-label={tx`New ${tx(template.name)}`}
|
||||
className={variables.length ? styles.variableDialog : undefined}
|
||||
buttons={
|
||||
variables.length
|
||||
@@ -293,7 +293,7 @@ function NameStep({
|
||||
onDoubleClick={() => void submit()}
|
||||
>
|
||||
<Icon name={template.icon} size={14} className={styles.icon} />
|
||||
{k.label}
|
||||
{tx(k.label)}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -78,7 +78,7 @@ function directoryOf(arg: unknown): string | null {
|
||||
function newFileAction(t: FileTemplate): Action {
|
||||
return {
|
||||
id: `templates.new.${t.id}`,
|
||||
title: t.id === "file" ? "New Empty File…" : tx`New ${t.name}…`,
|
||||
title: t.id === "file" ? "New Empty File…" : tx`New ${tx(t.name)}…`,
|
||||
category: "File",
|
||||
icon: t.icon,
|
||||
when: "projectOpen",
|
||||
|
||||
@@ -188,6 +188,7 @@
|
||||
}
|
||||
.stashList {
|
||||
flex: 1;
|
||||
container: stash-list / inline-size;
|
||||
}
|
||||
.stashRow {
|
||||
flex: 1;
|
||||
@@ -196,16 +197,25 @@
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
/* The message identifies a stash: the branch gives way first, the time stays whole. */
|
||||
.stashRow > .detail {
|
||||
flex-shrink: 1;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.stashRow > .stashTime {
|
||||
flex: none;
|
||||
}
|
||||
.stashMessage {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
flex: 1 1 auto;
|
||||
min-width: 4em;
|
||||
overflow: hidden;
|
||||
white-space: nowrap;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
@container stash-list (max-width: 320px) {
|
||||
.stashBranch {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
/* Settings › Commit › Show right margin off. */
|
||||
.noMargin {
|
||||
background: var(--bg-island, var(--bg-app));
|
||||
|
||||
@@ -1309,8 +1309,8 @@ export function StashesPanel() {
|
||||
{repos.length > 1 && s.repo ? `${repoName(s.repo)} · ` : ""}
|
||||
{text}
|
||||
</span>
|
||||
{branch && <span className={styles.detail}>{branch}</span>}
|
||||
<span className={styles.detail}>{formatTime(s.timeMs)}</span>
|
||||
{branch && <span className={clsx(styles.detail, styles.stashBranch)}>{branch}</span>}
|
||||
<span className={clsx(styles.detail, styles.stashTime)}>{formatTime(s.timeMs)}</span>
|
||||
</span>
|
||||
);
|
||||
}}
|
||||
|
||||
@@ -0,0 +1,148 @@
|
||||
/**
|
||||
* The `vcs.rollback` action's targets: the change tree's selection while the Commit
|
||||
* window has focus, the checked changes when the selection holds nothing
|
||||
* rollbackable (unversioned files, stale paths), and the fall-throughs otherwise.
|
||||
*/
|
||||
import { afterEach, describe, expect, it, vi } from "vitest";
|
||||
import { getAction } from "@/platform/actions";
|
||||
import type { FileStatus } from "@/bindings";
|
||||
|
||||
const mocks = vi.hoisted(() => ({ notify: vi.fn(), showDialog: vi.fn() }));
|
||||
|
||||
vi.mock("@/platform/context", () => ({ getContext: () => ({ activeToolWindow: toolWindow }) }));
|
||||
vi.mock("@/editor/api", async (orig) => {
|
||||
const actual = await orig<typeof import("@/editor/api")>();
|
||||
return { ...actual, activeEditor: () => undefined };
|
||||
});
|
||||
vi.mock("@/workbench/contributions", async (orig) => {
|
||||
const actual = await orig<typeof import("@/workbench/contributions")>();
|
||||
return { ...actual, maybeEditorService: () => undefined, notifications: () => ({ notify: mocks.notify }) };
|
||||
});
|
||||
vi.mock("../gutter", async (orig) => {
|
||||
const actual = await orig<typeof import("../gutter")>();
|
||||
return { ...actual, rollbackSelectedLines: () => false };
|
||||
});
|
||||
vi.mock("../dialogs", () => ({ openDialog: vi.fn(), confirmDialog: vi.fn() }));
|
||||
vi.mock("../changeOps", async (orig) => {
|
||||
const actual = await orig<typeof import("../changeOps")>();
|
||||
return { ...actual, showRollbackDialog: mocks.showDialog };
|
||||
});
|
||||
|
||||
const { registerVcsActions } = await import("../actions");
|
||||
const { useVcs } = await import("../store");
|
||||
const { useCommit } = await import("../commitStore");
|
||||
|
||||
let toolWindow: string | null = null;
|
||||
|
||||
const fs = (rel: string, unstaged: FileStatus["unstaged"]): FileStatus => ({
|
||||
path: `/r/${rel}`,
|
||||
relPath: rel,
|
||||
staged: null,
|
||||
unstaged,
|
||||
renamedFrom: null,
|
||||
});
|
||||
|
||||
/** Two modified files and two unversioned ones, as in the recorded session. */
|
||||
const status = [
|
||||
fs("src/ui/icons.tsx", "modified"),
|
||||
fs("src/main.tsx", "modified"),
|
||||
fs("src/ui/fileTypeIcons.ts", "untracked"),
|
||||
fs("perf/startup-improvement-plan.md", "untracked"),
|
||||
];
|
||||
|
||||
afterEach(() => {
|
||||
vi.clearAllMocks();
|
||||
toolWindow = null;
|
||||
useVcs.setState({ status: [], root: null, roots: [] });
|
||||
useCommit.setState({ selection: [], checks: new Map() });
|
||||
});
|
||||
|
||||
describe("vcs.rollback targets", () => {
|
||||
it("rolls back the checked changes when the selection holds unversioned files", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r"] });
|
||||
// The tree selection is the unversioned files; the modified ones are checked.
|
||||
useCommit.setState({ selection: ["/r/src/ui/fileTypeIcons.ts", "/r/perf/startup-improvement-plan.md"] });
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: undefined, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).toHaveBeenCalledWith([status[0], status[1]]);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
|
||||
it("uses the tree selection while it holds rollbackable changes", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r"] });
|
||||
useCommit.setState({ selection: ["/r/src/main.tsx"] });
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: undefined, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).toHaveBeenCalledWith([status[1]]);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
|
||||
it("offers every change when nothing is selected or checked", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r"] });
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: undefined, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).toHaveBeenCalledWith([status[0], status[1]]);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
|
||||
it("falls through to every change when the checked set is empty too", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r"] });
|
||||
// The unversioned file is selected; the modified ones are deliberately unchecked.
|
||||
useCommit.setState({
|
||||
selection: ["/r/src/ui/fileTypeIcons.ts"],
|
||||
checks: new Map([
|
||||
["/r/src/ui/icons.tsx", "none"],
|
||||
["/r/src/main.tsx", "none"],
|
||||
]),
|
||||
});
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: undefined, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).toHaveBeenCalledWith([status[0], status[1]]);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
|
||||
it("still rolls back the explicit paths of a context menu", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r"] });
|
||||
useCommit.setState({ selection: ["/r/src/ui/fileTypeIcons.ts"] });
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: { path: "/r/src/main.tsx" }, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).toHaveBeenCalledWith([status[1]]);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
|
||||
it("explains a nested repository entry chosen explicitly", async () => {
|
||||
const unregister = registerVcsActions();
|
||||
try {
|
||||
const status = [fs("app.txt", "modified"), fs("libs/core", "modified"), fs("libs/core/core.txt", "modified")];
|
||||
useVcs.setState({ status, root: "/r", roots: ["/r", "/r/libs/core"] });
|
||||
toolWindow = "commit";
|
||||
await getAction("vcs.rollback")!.run({ arg: { path: "/r/libs/core" }, ctx: { vcsAvailable: true } });
|
||||
expect(mocks.showDialog).not.toHaveBeenCalled();
|
||||
expect(mocks.notify).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ title: "Submodule changes cannot be rolled back here" }),
|
||||
);
|
||||
} finally {
|
||||
unregister();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -25,6 +25,7 @@ import {
|
||||
showUnstashDialog,
|
||||
} from "./changeOps";
|
||||
import { setAmend, useCommit } from "./commitStore";
|
||||
import { currentPlan } from "./commitSelection";
|
||||
import { gotoConflict, resolveAtCaret, showConflictsDialog } from "./conflictsUi";
|
||||
import { focusedDiffNavigator } from "./diffNavigator";
|
||||
import { showDiffWindow } from "./DiffWindow";
|
||||
@@ -358,9 +359,20 @@ export function registerVcsActions(): () => void {
|
||||
// IDEA: in the editor, with the caret on changed lines, ⌥⌘Z is Rollback Lines.
|
||||
const ed = activeEditor();
|
||||
if (!explicit?.length && ed?.view.hasFocus && rollbackSelectedLines(ed.view)) return;
|
||||
// The Commit window's subject is its tree selection; when the selection holds
|
||||
// nothing rollbackable (unversioned files, stale paths), the checked changes are
|
||||
// instead — as IDEA's toolbar Rollback acts on the checked changes there.
|
||||
const focused = commitWindowFocused();
|
||||
const sel = useCommit.getState().selection;
|
||||
const paths = explicit?.length ? explicit : commitWindowFocused() && sel.length ? sel : undefined;
|
||||
if (paths) {
|
||||
const fromSel = focused && sel.length ? rollbackCandidates(sel) : null;
|
||||
const paths = explicit?.length
|
||||
? explicit
|
||||
: fromSel?.length
|
||||
? sel
|
||||
: focused
|
||||
? currentPlan().included.map((f) => f.path)
|
||||
: undefined;
|
||||
if (paths?.length) {
|
||||
const candidates = rollbackCandidates(paths);
|
||||
const submodule = paths.find((p) => isNestedRepoEntry(p));
|
||||
if (!candidates.length && submodule)
|
||||
|
||||
@@ -233,8 +233,12 @@ function MarkdownPreview({ path, sync }: { path: string; sync: boolean }) {
|
||||
}
|
||||
}
|
||||
}
|
||||
root.scrollTop = previewOffsetForLine(blocksOf(root), caretLine, root.scrollHeight);
|
||||
scrolledTo.current = root.scrollTop;
|
||||
const blocks = blocksOf(root);
|
||||
// Back / Forward return to the line on screen: keep the restored offset within it.
|
||||
if (previewLineAtOffset(blocks, root.scrollTop) !== caretLine) {
|
||||
root.scrollTop = previewOffsetForLine(blocks, caretLine, root.scrollHeight);
|
||||
scrolledTo.current = root.scrollTop;
|
||||
}
|
||||
setShownLine(path, caretLine);
|
||||
}, [caretSeq, caretLine, sync, path, find]);
|
||||
|
||||
|
||||
+13
-13
@@ -35,7 +35,7 @@ it.each(resizeObserverMessages)("keeps waiting for boot-ready after %s", (messag
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
expect(document.documentElement.dataset.boot).toBeUndefined();
|
||||
window.dispatchEvent(new Event("openidea:boot-ready"));
|
||||
vi.advanceTimersByTime(30_000);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
});
|
||||
|
||||
@@ -48,10 +48,10 @@ it.each(resizeObserverMessages)("still reports a real failure after %s", (messag
|
||||
});
|
||||
|
||||
it.each(resizeObserverMessages)("still times out an unresolved startup after %s", (message) => {
|
||||
vi.advanceTimersByTime(15_000);
|
||||
vi.advanceTimersByTime(30_000);
|
||||
window.dispatchEvent(new ErrorEvent("error", { message }));
|
||||
vi.advanceTimersByTime(15_000);
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 30 seconds.");
|
||||
vi.advanceTimersByTime(30_000);
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 60 seconds.");
|
||||
});
|
||||
|
||||
it.each(resizeObserverMessages)("ignores the loop notification delivered as an Error: %s", (message) => {
|
||||
@@ -62,7 +62,7 @@ it.each(resizeObserverMessages)("ignores the loop notification delivered as an E
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
expect(document.documentElement.dataset.boot).toBeUndefined();
|
||||
window.dispatchEvent(new Event("openidea:boot-ready"));
|
||||
vi.advanceTimersByTime(30_000);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
});
|
||||
|
||||
@@ -78,7 +78,7 @@ it("keeps starting after an unhandled rejection", () => {
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
expect(document.documentElement.dataset.boot).toBeUndefined();
|
||||
window.dispatchEvent(new Event("openidea:boot-ready"));
|
||||
vi.advanceTimersByTime(30_000);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
});
|
||||
|
||||
@@ -88,9 +88,9 @@ it("reports the first rejection when startup then times out", () => {
|
||||
Object.defineProperty(error, "stack", { value: undefined });
|
||||
reject(error);
|
||||
reject({ message: "later rejection" });
|
||||
vi.advanceTimersByTime(30_000);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
const details = document.querySelector("textarea")?.value;
|
||||
expect(details).toContain("Startup did not finish within 30 seconds.");
|
||||
expect(details).toContain("Startup did not finish within 60 seconds.");
|
||||
expect(details).toContain("TypeError: Load failed");
|
||||
expect(details).not.toContain("later rejection");
|
||||
});
|
||||
@@ -101,7 +101,7 @@ it("counts the startup timeout only while the window shows", () => {
|
||||
document.dispatchEvent(new Event("visibilitychange"));
|
||||
};
|
||||
try {
|
||||
vi.advanceTimersByTime(20_000);
|
||||
vi.advanceTimersByTime(50_000);
|
||||
// Behind another window: no frames, so the splash can't finish; that isn't a failure.
|
||||
hidden(true);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
@@ -110,7 +110,7 @@ it("counts the startup timeout only while the window shows", () => {
|
||||
vi.advanceTimersByTime(9_000);
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
vi.advanceTimersByTime(1_000);
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 30 seconds.");
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 60 seconds.");
|
||||
} finally {
|
||||
Object.defineProperty(document, "hidden", { configurable: true, value: false });
|
||||
}
|
||||
@@ -156,14 +156,14 @@ it("surfaces initial React render failures through the boot error event", () =>
|
||||
});
|
||||
|
||||
it("reports an unresolved startup instead of waiting forever", () => {
|
||||
vi.advanceTimersByTime(30_000);
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 30 seconds.");
|
||||
vi.advanceTimersByTime(60_000);
|
||||
expect(document.querySelector("textarea")?.value).toContain("Startup did not finish within 60 seconds.");
|
||||
});
|
||||
|
||||
it("stops intercepting failures after a successful startup", () => {
|
||||
window.dispatchEvent(new Event("openidea:boot-ready"));
|
||||
window.dispatchEvent(new ErrorEvent("error", { message: "runtime failure" }));
|
||||
vi.advanceTimersByTime(30_000);
|
||||
vi.advanceTimersByTime(60_000);
|
||||
expect(document.getElementById("boot-error")).toBeNull();
|
||||
});
|
||||
|
||||
|
||||
@@ -193,9 +193,35 @@
|
||||
"menu.file.closeProject": "Close Project",
|
||||
"menu.remote.reopenInContainer": "Reopen in Container",
|
||||
"menu.remote.reloadEnvironment": "Reload Environment",
|
||||
"menu.file.new": "New…",
|
||||
"menu.file.newScratchFile": "New Scratch File…",
|
||||
"menu.file.new": "File…",
|
||||
"menu.file.newScratchFile": "Scratch File",
|
||||
"menu.new": "New",
|
||||
"menu.workspace.create": "Workspace…",
|
||||
"menu.workspace.open": "Open Workspace…",
|
||||
"menu.workspace.manage": "Manage Workspace…",
|
||||
"menu.file.openInNewWindow": "Open in New Window…",
|
||||
"menu.file.openFile": "Open File…",
|
||||
"menu.remote.connect": "Remote Development…",
|
||||
"menu.remote.disconnect": "Disconnect from Remote Host",
|
||||
"menu.navigationBar": "Navigation Bar",
|
||||
"menu.run.updateApplication": "Update Application",
|
||||
"menu.ssh.startSession": "Start SSH Session…",
|
||||
"menu.ssh.configurations": "SSH Configurations…",
|
||||
"menu.deployment": "Deployment",
|
||||
"menu.deployment.uploadToDefault": "Upload to Default Server",
|
||||
"menu.deployment.uploadTo": "Upload to…",
|
||||
"menu.deployment.downloadFromDefault": "Download from Default Server",
|
||||
"menu.deployment.downloadFrom": "Download from…",
|
||||
"menu.deployment.syncWith": "Sync with Deployed…",
|
||||
"menu.deployment.deleteFromServer": "Delete from Server",
|
||||
"menu.deployment.toggleAutoUpload": "Automatic Upload",
|
||||
"menu.deployment.browseRemoteHost": "Browse Remote Host",
|
||||
"menu.deployment.openInBrowser": "Open in Browser",
|
||||
"menu.deployment.configure": "Configuration…",
|
||||
"menu.window.mergeAllWindows": "Merge All Project Windows",
|
||||
"menu.window.detachTab": "Move Tab to New Window",
|
||||
"menu.window.nextTab": "Next Project Tab",
|
||||
"menu.window.previousTab": "Previous Project Tab",
|
||||
"menu.project.attach": "Attach Project…",
|
||||
"menu.file.openProject": "Open…",
|
||||
"menu.file.save": "Save All",
|
||||
@@ -389,7 +415,7 @@
|
||||
"menu.github.createPullRequest": "Create Pull Request…",
|
||||
"menu.github.checkoutPullRequest": "Checkout Pull Request…",
|
||||
"menu.github.openInBrowser": "Open on GitHub",
|
||||
"menu.file.newProject": "New Project…",
|
||||
"menu.file.newProject": "Project…",
|
||||
"menu.file.renameProject": "Rename Project…",
|
||||
"menu.file.reloadAllFromDisk": "Reload All from Disk",
|
||||
"menu.file.invalidateCaches": "Invalidate Caches…",
|
||||
|
||||
Loaded 100 of 117 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user