Порівняти коміти

...
Автор SHA1 Повідомлення Дата
l0ng-ai f78a374520 Merge remote-tracking branch 'origin/main' into ux/plugins-pane-layout 2026-11-20 09:17:20 +08:00
l0ng-ai fd9b20fa05 Give interactive rebase plans and messages separate panes (#4637)
Interactive rebase shows the plan and the commit message in separate resizable panes. Verified with e2e interactiveRebaseLayout, full vitest and typecheck.
2026-11-20 09:17:14 +08:00
l0ng-ai 4f5622d72c refactor(agents): remove playful words from the working status (#4555)
Removes Settings › Agents › Working Status and its playfulStatus / playfulAfterSeconds / playfulWords settings. The line under a working conversation keeps saying what the agent is doing (Reading…, Running a command…); stored values of the removed settings are ignored.
2026-11-20 09:13:57 +08:00
l0ng-ai a1b7572c62 Merge remote-tracking branch 'origin/main' into ux/plugins-pane-layout 2026-11-20 09:13:35 +08:00
l0ng-ai f4a7a7bafb perf(ui): smoother editor scrolling, tab switching and first file open (#4633)
Removes selectors that restyled whole subtrees on every inserted editor line or focus change (CodeMirror via a pnpm patch; selectorCost.test.ts guards them), measures space width once per font, shares one tooltip host, builds tab menus lazily, caches parsed SVG icons, prewarms an off-screen editor at idle, stats project-tree entries in parallel, and keeps the Git tool window at its size during a live window resize. Verified with full vitest, typecheck, ide-vfs cargo test and clippy, gitLog e2e, and a window resize in the app.
2026-11-20 09:13:29 +08:00
l0ng-ai 9dffb50323 Keep plugin list and details visible in narrow settings 2026-11-20 08:34:32 +08:00
58 змінених файлів з 1077 додано та 1069 видалено

No files matched your search

Створено
+1
Переглянути файл
@@ -5017,6 +5017,7 @@ dependencies = [
"ignore",
"notify",
"parking_lot",
"rayon",
"rustix",
"serde",
"serde_json",
-13
Переглянути файл
@@ -100,16 +100,6 @@ pub struct AgentSettings {
pub smooth_text: bool,
/// Conversations and the composer expand to the full width of the pane instead of staying in a centred column.
pub fit_window_width: bool,
/// While the agent works, playful words fill the pauses in what it reports.
pub playful_status: bool,
/// Seconds the agent reports nothing new before the playful words take over; 0 shows them
/// from the start.
pub playful_after_seconds: u32,
/// The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
/// the built-in ones of that activity; an empty list keeps its status factual.
#[serde(deserialize_with = "or_default")]
#[specta(type = BTreeMap<String, Vec<String>>)]
pub playful_words: BTreeMap<String, Vec<String>>,
#[serde(deserialize_with = "or_default")]
#[specta(type = ThinkingDisplay)]
pub thinking: ThinkingDisplay,
@@ -152,9 +142,6 @@ impl Default for AgentSettings {
fold_turns: true,
smooth_text: true,
fit_window_width: false,
playful_status: false,
playful_after_seconds: 0,
playful_words: BTreeMap::new(),
thinking: ThinkingDisplay::Auto,
tool_calls: ToolCallDisplay::Grouped,
expand_tool_output: false,
+1
Переглянути файл
@@ -22,6 +22,7 @@ parking_lot.workspace = true
zip.workspace = true
flate2.workspace = true
tar.workspace = true
rayon.workspace = true
[dev-dependencies]
tempfile.workspace = true
+48 -41
Переглянути файл
@@ -10,6 +10,7 @@ mod rules;
mod watch;
use ide_core::{IdeError, IdeResult};
use rayon::prelude::*;
use serde::{Deserialize, Serialize};
use specta::Type;
use std::cmp::Ordering;
@@ -133,51 +134,57 @@ pub fn read_dir(dir: &Path, excludes: &[String]) -> IdeResult<Vec<FileEntry>> {
let base = gitignore.repo_root().unwrap_or(dir).to_path_buf();
let excludes = ExcludeMatcher::new(excludes);
let mut entries: Vec<(bool, FileEntry)> = Vec::new();
for entry in fs::read_dir(dir)? {
let entry = match entry {
Ok(e) => e,
let paths: Vec<PathBuf> = fs::read_dir(dir)?
.filter_map(|entry| match entry {
Ok(e) => Some(e.path()),
Err(e) => {
tracing::debug!("read_dir {}: {e}", dir.display());
continue;
None
}
};
let path = entry.path();
let name = entry.file_name().to_string_lossy().into_owned();
let Ok(lmeta) = fs::symlink_metadata(&path) else { continue };
let (kind, meta, target_kind) = if lmeta.file_type().is_symlink() {
match fs::metadata(&path) {
Ok(m) => {
let target = if m.is_dir() { EntryKind::Dir } else { EntryKind::File };
(EntryKind::Symlink, m, Some(target))
})
.collect();
// One stat per entry dominates a large folder (and every stat is a round trip on a network
// share): stat in parallel; small folders stay on this thread.
let mut entries: Vec<(bool, FileEntry)> = paths
.into_par_iter()
.with_min_len(256)
.filter_map(|path| {
let name = path.file_name()?.to_string_lossy().into_owned();
let lmeta = fs::symlink_metadata(&path).ok()?;
let (kind, meta, target_kind) = if lmeta.file_type().is_symlink() {
match fs::metadata(&path) {
Ok(m) => {
let target = if m.is_dir() { EntryKind::Dir } else { EntryKind::File };
(EntryKind::Symlink, m, Some(target))
}
Err(_) => (EntryKind::Symlink, lmeta, None),
}
Err(_) => (EntryKind::Symlink, lmeta, None),
}
} else if lmeta.is_dir() {
(EntryKind::Dir, lmeta, None)
} else {
(EntryKind::File, lmeta, None)
};
let is_dir = meta.is_dir();
let rel = path.strip_prefix(&base).unwrap_or(&path);
let excluded = excludes.is_excluded(rel);
let ignored = excluded || gitignore.is_ignored(&path, is_dir);
entries.push((
is_dir,
FileEntry {
hidden: name.starts_with('.'),
size: if is_dir { 0 } else { meta.len() },
mtime_ms: mtime_ms(&meta),
name,
path: path.into(),
kind,
ignored,
excluded,
target_kind,
},
));
}
entries.sort_by(|(da, a), (db, b)| db.cmp(da).then_with(|| natural_cmp(&a.name, &b.name)));
} else if lmeta.is_dir() {
(EntryKind::Dir, lmeta, None)
} else {
(EntryKind::File, lmeta, None)
};
let is_dir = meta.is_dir();
let rel = path.strip_prefix(&base).unwrap_or(&path);
let excluded = excludes.is_excluded(rel);
let ignored = excluded || gitignore.is_ignored(&path, is_dir);
Some((
is_dir,
FileEntry {
hidden: name.starts_with('.'),
size: if is_dir { 0 } else { meta.len() },
mtime_ms: mtime_ms(&meta),
name,
path: path.into(),
kind,
ignored,
excluded,
target_kind,
},
))
})
.collect();
entries.par_sort_by(|(da, a), (db, b)| db.cmp(da).then_with(|| natural_cmp(&a.name, &b.name)));
Ok(entries.into_iter().map(|(_, e)| e).collect())
}
+1 -1
Переглянути файл
@@ -137,7 +137,7 @@ Tasks are saved per project and survive restarts. When the agent supports resumi
- **Agent Configs**: discovers servers already configured in `~/.copilot/mcp-config.json` (and installed Copilot CLI plugins), `~/.claude.json`, `~/.codex/config.toml`, `~/.cursor/mcp.json`, `~/.gemini/settings.json`, `~/.jetbrains/mcp/mcp.json`, `.mcp.json`, and `.vscode/mcp.json` so you can import them into Global or Project settings with one click. You can also add or edit servers via structured fields or raw `mcpServers` JSON (**Add from JSON**), and run **Test Connection** to inspect the tools a server advertises.
- **Per-session (`MCP` / `/mcp`)**: in both **New Agent Task** and active task conversations, open **MCP** in the composer toolbar (or run `/mcp`) to enable or disable individual servers—including the built-in `openidea` server—for that task only, or click **Reset** to return to the inherited defaults.
While the agent works, the line under the conversation says what it is doing: thinking, reading, editing, running a command, writing its reply. **Settings › Agents › Working Status** can show playful words for what it does there instead; they are off by default. Once turned on, they take turns from the moment the work changes, or only after the agent reports nothing new for a number of seconds (0 to 600, 0 by default); screen readers still hear what the agent is doing. Each word stays eight seconds while the agent keeps at the same work, and at least three when it moves on, so the line doesn't flicker. The same page replaces the words: pick what the status says (**Reading…**, **Running a command…**…) and add or remove its words. **Restore Built-in Words** brings back OpenIDEA's; an activity left without words keeps its plain status.
While the agent works, the line under the conversation says what it is doing: thinking, reading, editing, running a command, writing its reply.
## Add a custom agent
+1 -1
Переглянути файл
@@ -137,7 +137,7 @@ agent 运行过一个任务后,新任务会以它自动批准所有操作的
- **智能体配置**:自动发现 `~/.copilot/mcp-config.json`(及已安装的 Copilot CLI 插件)、`~/.claude.json`、`~/.codex/config.toml`、`~/.cursor/mcp.json`、`~/.gemini/settings.json`、`~/.jetbrains/mcp/mcp.json`、`.mcp.json` 和 `.vscode/mcp.json` 中已配置的服务器,可一键导入到全局或项目设置。添加或编辑服务器时既可使用表单,也可直接粘贴 `mcpServers` JSON(**从 JSON 添加**),并可通过 **测试连接** 查看服务器声明的工具列表。
- **按会话覆盖(`MCP` / `/mcp`)**:在 **新建 Agent 任务** 和进行中的任务对话中,单击输入框工具栏的 **MCP**(或输入 `/mcp`),即可仅针对当前任务开启或关闭任意服务器(包括内置的 `openidea` 服务器),或点击 **重置** 恢复继承的默认状态。
agent 工作时,对话下方的状态行显示它正在做什么:思考、读取、编辑、运行命令、输出回复。在 **设置 › 智能体 › 工作状态** 中可以让这里改为显示与当前工作相关的趣味文字,默认关闭。开启后,工作一变化就轮换显示,也可以设置在 agent 无新进展多少秒后才显示(0 到 600,默认 0);屏幕阅读器读出的仍是 agent 实际在做的事。agent 持续做同一类工作时,每条文字停留八秒;转向其他工作时也至少停留三秒,状态行不会频繁跳动。同一页面还可以替换这些文字:选择状态(**正在读取…**、**正在运行命令…**…),再添加或移除对应的文字。**恢复内置文字** 会换回 OpenIDEA 自带的文字;没有任何文字的状态只显示实际进展。
agent 工作时,对话下方的状态行显示它正在做什么:思考、读取、编辑、运行命令、输出回复。
## 添加自定义 agent
+90
Переглянути файл
@@ -0,0 +1,90 @@
import { expect, stubDesktop, test } from "./fixtures";
test("Interactive rebase keeps commit messages and plan controls usable at narrow widths", async ({
workbench: page,
}) => {
const first = "Keep regional settlement references stable when reconciling delayed ledger updates";
const second = "Add settlement summary";
await stubDesktop(page);
await page.evaluate(
async ({ first, second }) => {
const root = "/dev/acme-api";
const id = (n: string) => n.repeat(40);
const commits = [
{ id: id("c"), shortId: "cccccccc", parents: [id("b")], summary: second, timeMs: 1795100200000 },
{ id: id("b"), shortId: "bbbbbbbb", parents: [id("a")], summary: first, timeMs: 1795100100000 },
].map((commit) => ({
...commit,
refs: [],
author: "Sam Rivera",
email: "[email protected]",
message: commit.summary + "\n\nKeep the audit trail linked to the settlement job.",
}));
const h = window.__ipc.handlers;
h.vcs_roots = () => [{ root, operation: null, head: "main", headCommit: id("c") }];
h.vcs_branch_info = () => ({
head: "main",
headCommit: id("c"),
upstream: null,
ahead: 0,
behind: 0,
operation: null,
});
h.vcs_status = () => [];
h.vcs_log = () => commits;
h.vcs_log_refs = () => ({});
h.vcs_log_users = () => ["Sam Rivera <[email protected]>"];
h.vcs_config_get = () => null;
h.vcs_commit_files = () => [];
h.vcs_log_details_batch = () => [];
const vcsPath = "/src/features/vcs/store.ts";
const { useVcs } = await import(/* @vite-ignore */ vcsPath);
useVcs.setState({ available: true, root, roots: [root], repo: root, branchesLoaded: true });
const contextPath = "/src/platform/context.ts";
(await import(/* @vite-ignore */ contextPath)).setContext("vcsAvailable", true);
const actionsPath = "/src/platform/actions.ts";
await (await import(/* @vite-ignore */ actionsPath)).executeAction("vcs.showLog");
},
{ first, second },
);
const log = page.getByRole("listbox", { name: "Commits" });
await log.getByRole("option", { name: new RegExp(first) }).click({ button: "right" });
await page.getByRole("menuitem", { name: /Interactively Rebase from Here/ }).click();
const dialog = page.getByRole("dialog", { name: /Rebasing 2 commits/ });
await expect(dialog).toBeVisible();
await page.setViewportSize({ width: 440, height: 640 });
const list = dialog.getByRole("list", { name: "Commits to rebase" });
const originalRows = list.getByRole("listitem");
await dialog.getByRole("button", { name: "Action for bbbbbbbb" }).click();
await page.getByRole("option", { name: "Reword", exact: true }).click();
const reword = dialog.getByRole("textbox", { name: "New message for bbbbbbbb" });
await expect(reword).toHaveValue(first + "\n\nKeep the audit trail linked to the settlement job.");
const editor = (await reword.boundingBox())!;
expect(editor.width).toBeGreaterThan(260);
expect(editor.height).toBeGreaterThan(160);
const divider = dialog.getByRole("separator", { name: "Resize rebase panes" });
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
const start = dialog.getByRole("button", { name: "Start Rebasing" });
await expect(start).toBeDisabled();
const message = "Keep settlement references stable\n\nPreserve the audit trail.";
await reword.fill(message);
await expect(start).toBeEnabled();
await dialog.getByRole("button", { name: "Move Down" }).click();
await expect(originalRows.first()).toContainText(second);
await expect(reword).toHaveValue(message);
await originalRows
.first()
.getByRole("button", { name: new RegExp(second) })
.click();
const details = dialog.getByRole("region", { name: "Commit details" });
await expect(details).toContainText("Keep the audit trail linked to the settlement job.");
await page.setViewportSize({ width: 1120, height: 760 });
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
await expect(details).toContainText(second);
await dialog.getByRole("button", { name: "Cancel", exact: true }).click();
await expect(dialog).toBeHidden();
});
+62
Переглянути файл
@@ -0,0 +1,62 @@
import { expect, test } from "./fixtures";
test("Plugin management keeps the selected details reachable when Settings narrows", async ({ workbench: page }) => {
const name = "ReconciliationTimelineInspectorEnterprise";
const notes = "SettlementTimeline".repeat(18);
await page.evaluate(
async ({ name, notes }) => {
const path = "/src/features/plugins/backend.ts";
const { createMemoryPluginsBackend, setPluginsBackend } = await import(/* @vite-ignore */ path);
const { plugins } = await createMemoryPluginsBackend().list();
const longPlugin = { ...plugins[0], id: "settlement-inspector", name, changeNotes: notes };
setPluginsBackend(createMemoryPluginsBackend([longPlugin, ...plugins.slice(1)]));
},
{ name, notes },
);
await page.setViewportSize({ width: 1080, height: 760 });
await page.keyboard.press("Meta+,");
const settings = page.getByRole("dialog", { name: "Settings", exact: true });
await settings.getByRole("treeitem", { name: "Plugins", exact: true }).click();
await settings.getByRole("tab", { name: "Installed", exact: true }).click();
const filter = settings.getByRole("textbox", { name: "Filter plugins" });
const list = settings.getByRole("list", { name: "Installed plugins" });
const details = settings.getByLabel(`${name} details`);
const heading = details.getByRole("heading", { name, exact: true });
await expect(heading).toBeVisible();
const filterBox = (await filter.boundingBox())!;
const headingBox = (await heading.boundingBox())!;
expect(headingBox.x).toBeGreaterThan(filterBox.x + filterBox.width);
await page.setViewportSize({ width: 520, height: 760 });
const body = settings.locator("[class*='pageBody']");
await expect.poll(() => body.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
const divider = settings.getByRole("separator", { name: "Resize plugin panes" });
await expect(divider).toHaveAttribute("aria-orientation", "horizontal");
const sources = settings.getByRole("tablist", { name: "Plugin sources" });
await expect(sources.getByRole("tab", { name: "Marketplace" })).toBeVisible();
await expect(sources.getByRole("tab", { name: "Installed" })).toBeVisible();
expect(await sources.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
const before = (await divider.boundingBox())!.y;
await divider.focus();
await page.keyboard.press("ArrowDown");
await expect.poll(async () => (await divider.boundingBox())!.y).toBeGreaterThan(before);
await expect(details.getByRole("button", { name: "Disable", exact: true })).toBeVisible();
await details.getByRole("tab", { name: "What's New" }).click();
await expect(details.getByText(notes, { exact: true })).toBeVisible();
expect(await details.evaluate((el) => el.scrollWidth - el.clientWidth)).toBeLessThanOrEqual(1);
await filter.click();
await expect(filter).toBeFocused();
await filter.pressSequentially("Harbor");
await list.getByRole("button", { name: /Harbor Night Theme/ }).click();
await expect(settings.getByRole("heading", { name: "Harbor Night Theme", exact: true })).toBeVisible();
await page.setViewportSize({ width: 1080, height: 760 });
await expect(divider).toHaveAttribute("aria-orientation", "vertical");
await expect(filter).toHaveValue("Harbor");
await expect(settings.getByRole("heading", { name: "Harbor Night Theme", exact: true })).toBeVisible();
});
+30
Переглянути файл
@@ -0,0 +1,30 @@
diff --git a/dist/index.cjs b/dist/index.cjs
index b20aa9d84be6ff4b85b126bdd930065277668a26..e677ab06ca9668407e202979e14b75ab7641d6b1 100644
--- a/dist/index.cjs
+++ b/dist/index.cjs
@@ -9675,7 +9675,9 @@ const hideNativeSelection = state.Prec.highest(EditorView.theme({
"& :focus": {
caretColor: "initial !important",
...drawMainRange ? {
- "&::selection, & ::selection": {
+ // Not `& ::selection` too: a pseudo-class with a universal descendant restyles the
+ // whole subtree of every element that gains or loses focus.
+ "&::selection": {
backgroundColor: "Highlight !important"
}
} : {}
diff --git a/dist/index.js b/dist/index.js
index 216f754db06f65f7f17f056b47d8f6fab45067bf..22282993239d836ea1da19af10ccfc61b6480cc5 100644
--- a/dist/index.js
+++ b/dist/index.js
@@ -9670,7 +9670,9 @@ const hideNativeSelection = /*@__PURE__*/Prec.highest(/*@__PURE__*/EditorView.th
"& :focus": {
caretColor: "initial !important",
...drawMainRange ? {
- "&::selection, & ::selection": {
+ // Not `& ::selection` too: a pseudo-class with a universal descendant restyles the
+ // whole subtree of every element that gains or loses focus.
+ "&::selection": {
backgroundColor: "Highlight !important"
}
} : {}
+34 -25
Переглянути файл
@@ -323,6 +323,18 @@ const scroll: Scenario = {
},
};
/**
* Runs an action without a default shortcut from a key press: the press is the measured input,
* and the action runs in its handler, as from a key binding. Pause is bound to nothing.
*/
async function runActionOnKey(h: Harness, id: string) {
await h.page.evaluate((id) => {
const probe = (window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf;
addEventListener("keydown", () => void probe.runAction(id), { capture: true, once: true });
}, id);
await h.page.keyboard.press("Pause");
}
/**
* Git Log with 20,000 commits on branching lanes, loaded page by page as the
* backend does (150 ms a page, like `git log`): showing it, walking the
@@ -339,12 +351,7 @@ const gitLog: Scenario = {
).__openideaPerf.fakeGitLog(20_000, 150),
);
const showMs = await h.measure(
() =>
h.page.evaluate(() =>
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
"vcs.showLog",
),
),
() => runActionOnKey(h, "vcs.showLog"),
'[role="listbox"][aria-label="Commits"]',
"order flow step 0",
);
@@ -430,16 +437,13 @@ const resizePanels: Scenario = {
await h.page.evaluate(() =>
(window as never as { __openideaPerf: { fakeGitLog(n: number): void } }).__openideaPerf.fakeGitLog(2_000),
);
await h.measure(
() =>
h.page.evaluate(() =>
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
"vcs.showLog",
),
),
'[role="listbox"][aria-label="Commits"]',
"order flow step 0",
await h.page.evaluate(() =>
(window as never as { __openideaPerf: { runAction(id: string): Promise<boolean> } }).__openideaPerf.runAction(
"vcs.showLog",
),
);
// Set-up, not measured: the splitters are dragged once the log is shown.
await h.inPage((p) => p.waitShown('[role="listbox"][aria-label="Commits"]', "order flow step 0", 10_000));
const refresh = await h.refreshMs();
const drag = async (name: string, dx: number, dy: number) => {
const box = (await h.page.getByRole("separator", { name }).boundingBox())!;
@@ -560,7 +564,9 @@ const agentTabs: Scenario = {
window as never as { __openideaPerf: { runAction(id: string, arg?: unknown): Promise<boolean> } }
).__openideaPerf.runAction("agents.openSampleConversations", { tasks: 2, turns: 150 }),
);
const shown = (n: number) => `[data-editor-focus] span[title="Sample task ${n}"]`;
// The conversation shown: its requests end with its task's title.
const SHOWN = "[data-editor-focus] [data-message]";
const title = (n: number) => `(Sample task ${n})`;
// Both conversations get their earlier entries painted in background batches, also the
// first one, hidden behind the second as soon as it opened.
await h.page.waitForFunction(
@@ -575,25 +581,28 @@ const agentTabs: Scenario = {
// Rows painted while hidden are laid out the first time their conversation shows.
for (const n of [1, 2]) {
await h.page.getByRole("tab", { name: `Sample task ${n}` }).click();
await h.page.locator(shown(n)).waitFor();
await h.page
.locator(SHOWN, { hasText: title(n) })
.first()
.waitFor();
await h.page.waitForTimeout(300);
}
// WebKit restyles a hidden conversation in full when it is shown again (Chromium keeps its
// style): what bounds that there is the history's DOM, and rows skipping rendering off screen.
const { conversationNodes, rowsAlwaysRendered } = await h.page.evaluate((selector) => {
const conversation = document.querySelector(selector)!.closest("[data-editor-focus]")!;
const conversation = document.querySelector(selector)!;
const rows = [...conversation.querySelector("[data-message]")!.parentElement!.children];
return {
conversationNodes: conversation.querySelectorAll("*").length,
rowsAlwaysRendered: rows.filter((r) => getComputedStyle(r).contentVisibility !== "auto").length,
};
}, shown(2));
}, "[data-editor-focus]");
const t0 = await h.now();
const before = await h.counters();
const switches: number[] = [];
for (let i = 0; i < 10; i++) {
switches.push(await h.measure(() => h.pressAction("navigate.switcher"), shown(i % 2 ? 2 : 1)));
switches.push(await h.measure(() => h.pressAction("navigate.switcher"), SHOWN, title(i % 2 ? 2 : 1)));
await h.page.waitForTimeout(150);
}
const work = Harness.delta(before, await h.counters());
@@ -602,10 +611,7 @@ const agentTabs: Scenario = {
// Scrolling up from the end, a step at a time: how far the text under the pointer moves
// beyond the scroll itself.
const scrollJumps = await h.page.evaluate(async (selector) => {
const stream = document
.querySelector(selector)!
.closest("[data-editor-focus]")!
.querySelector("[data-message]")!.parentElement!;
const stream = document.querySelector(selector)!.parentElement!;
const frame = () => new Promise(requestAnimationFrame);
stream.scrollTop = stream.scrollHeight;
await frame();
@@ -626,7 +632,7 @@ const agentTabs: Scenario = {
}
stream.scrollTop = stream.scrollHeight;
return jumps;
}, shown(2));
}, SHOWN);
const refresh = await h.refreshMs();
const box = (await h.page.locator("[data-editor-focus]").boundingBox())!;
@@ -732,6 +738,9 @@ const projectTree: Scenario = {
async run(h) {
const generated = h.page.locator('[role="treeitem"][aria-level="2"]', { hasText: "generated" }).first();
await generated.click();
// Measure from a settled selection: a key pressed in the click's own frame also pays for that frame.
await generated.and(h.page.locator('[aria-selected="true"]')).waitFor();
await h.page.evaluate(() => new Promise((r) => requestAnimationFrame(() => requestAnimationFrame(r))));
const expandMs = await h.measure(
() => h.page.keyboard.press("ArrowRight"),
'[role="tree"][aria-label="Project"]',
Створено
+20 -24
Переглянути файл
@@ -7,6 +7,9 @@ settings:
overrides:
mermaid>katex: ^0.18.2
patchedDependencies:
'@codemirror/view': 0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5
importers:
.:
@@ -61,7 +64,7 @@ importers:
version: 6.7.6
'@codemirror/view':
specifier: ^6.43.14
version: 6.43.14
version: 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@floating-ui/react-dom':
specifier: ^2.1.9
version: 2.1.9([email protected]([email protected]))([email protected])
@@ -85,7 +88,7 @@ importers:
version: 1.2.0
'@replit/codemirror-vim':
specifier: 6.4.0
version: 6.4.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])
version: 6.4.0(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5))
'@tanstack/react-virtual':
specifier: ^3.14.21
version: 3.14.21([email protected]([email protected]))([email protected])
@@ -591,7 +594,6 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64]
os: [linux]
libc: [glibc]
'@oxc-parser/[email protected]':
resolution: {integrity: sha512-JSlhgoK+/g1TGJI5NuADx2+6syhxnQNLCWLXyO5QLFyetomcr/vIxSdiNlmyAv963YXUzCuwAwRG6npZ5xyJ1A==}
@@ -1069,7 +1071,6 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64]
os: [linux]
libc: [musl]
'@rolldown/[email protected]':
resolution: {integrity: sha512-4+Kl8daPV8NDHaD7mfCcc1pRM+Qg7ab8DyMm5FG5WoZgv4h2i3KFN1CybYBNbQqmuYm7ftJLvmMI1eHYJ22S/Q==}
@@ -1083,14 +1084,12 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x]
os: [linux]
libc: [glibc]
'@rolldown/[email protected]':
resolution: {integrity: sha512-WxalXzgrLVpKC93xfpaJ3gCXUWzeCr+FRCbDVD2mUAy4L6Vo3lNVz0epUEUpxPWJkLNYUwM4OSIikv36OJ9mLg==}
engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64]
os: [linux]
libc: [glibc]
'@rolldown/[email protected]':
resolution: {integrity: sha512-3G3tnAmTpdk9jO3GQtyHXqeFD2SlecfTws/Y3M2mmj9nMBwwuLT4kur8sZKeu7ENUHSpVO3cIsm5A52LEWWwlg==}
@@ -1864,7 +1863,6 @@ packages:
engines: {node: '>= 12.0.0'}
cpu: [arm64]
os: [linux]
libc: [glibc]
[email protected]:
resolution: {integrity: sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==}
@@ -1878,14 +1876,12 @@ packages:
engines: {node: '>= 12.0.0'}
cpu: [x64]
os: [linux]
libc: [glibc]
[email protected]:
resolution: {integrity: sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==}
engines: {node: '>= 12.0.0'}
cpu: [x64]
os: [linux]
libc: [musl]
[email protected]:
resolution: {integrity: sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==}
@@ -2391,14 +2387,14 @@ snapshots:
dependencies:
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@codemirror/[email protected]':
dependencies:
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@codemirror/[email protected]':
@@ -2438,7 +2434,7 @@ snapshots:
'@codemirror/lang-javascript': 6.2.5
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/css': 1.3.9
'@lezer/html': 1.3.13
@@ -2454,7 +2450,7 @@ snapshots:
'@codemirror/language': 6.13.1
'@codemirror/lint': 6.9.7
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/javascript': 1.5.6
@@ -2464,7 +2460,7 @@ snapshots:
'@codemirror/lang-html': 6.4.12
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/highlight': 1.2.5
'@lezer/lr': 1.4.11
@@ -2488,7 +2484,7 @@ snapshots:
'@codemirror/lang-html': 6.4.12
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/highlight': 1.2.5
'@lezer/lr': 1.4.11
@@ -2499,7 +2495,7 @@ snapshots:
'@codemirror/lang-html': 6.4.12
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/markdown': 1.8.0
@@ -2562,7 +2558,7 @@ snapshots:
'@codemirror/autocomplete': 6.20.3
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/xml': 1.0.6
@@ -2606,7 +2602,7 @@ snapshots:
dependencies:
'@codemirror/state': 6.7.6
'@codemirror/streamparser': 6.0.0
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/common': 1.5.3
'@lezer/highlight': 1.2.5
'@lezer/lr': 1.4.11
@@ -2619,21 +2615,21 @@ snapshots:
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
crelt: 1.0.7
'@codemirror/[email protected]':
dependencies:
'@codemirror/language': 6.13.1
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@lezer/highlight': 1.2.5
style-mod: 4.1.4
'@codemirror/[email protected]':
dependencies:
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
crelt: 1.0.7
'@codemirror/[email protected]':
@@ -2642,7 +2638,7 @@ snapshots:
'@codemirror/[email protected]': {}
'@codemirror/[email protected]':
'@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)':
dependencies:
'@codemirror/state': 6.7.6
crelt: 1.0.7
@@ -3105,13 +3101,13 @@ snapshots:
'@replit/[email protected]': {}
'@replit/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])':
'@replit/[email protected](@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected])(@codemirror/[email protected](patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5))':
dependencies:
'@codemirror/commands': 6.11.1
'@codemirror/language': 6.13.1
'@codemirror/search': 6.7.2
'@codemirror/state': 6.7.6
'@codemirror/view': 6.43.14
'@codemirror/view': 6.43.14(patch_hash=0ee18e0fe711bd749ccc9f89f3566c74b5e08910f2892e166d207f286b0da0c5)
'@replit/codemirror-vim-core': 0.1.0
'@rolldown/[email protected]':
+2
Переглянути файл
@@ -3,3 +3,5 @@ allowBuilds:
overrides:
# GHSA-238p-pmpm-9mq7 (fixed in 0.18.2); mermaid 12.1 still asks for katex ^0.16.
mermaid>katex: ^0.18.2
patchedDependencies:
"@codemirror/view": patches/@codemirror__view.patch
-24
Переглянути файл
@@ -2602,18 +2602,6 @@ export type AgentSettings_Deserialize = {
smoothText?: boolean,
/** Conversations and the composer expand to the full width of the pane instead of staying in a centred column. */
fitWindowWidth?: boolean,
/** While the agent works, playful words fill the pauses in what it reports. */
playfulStatus?: boolean,
/**
* Seconds the agent reports nothing new before the playful words take over; 0 shows them
* from the start.
*/
playfulAfterSeconds?: number,
/**
* The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
* the built-in ones of that activity; an empty list keeps its status factual.
*/
playfulWords?: { [key in string]: string[] },
thinking?: ThinkingDisplay,
toolCalls?: ToolCallDisplay,
/** A tool call's output (a command's, a diff) is shown without opening it. */
@@ -2654,18 +2642,6 @@ export type AgentSettings_Serialize = {
smoothText: boolean,
/** Conversations and the composer expand to the full width of the pane instead of staying in a centred column. */
fitWindowWidth: boolean,
/** While the agent works, playful words fill the pauses in what it reports. */
playfulStatus: boolean,
/**
* Seconds the agent reports nothing new before the playful words take over; 0 shows them
* from the start.
*/
playfulAfterSeconds: number,
/**
* The user's playful words by activity (`working`, `thinking`, `reading`, …), replacing
* the built-in ones of that activity; an empty list keeps its status factual.
*/
playfulWords: { [key in string]: string[] },
thinking: ThinkingDisplay,
toolCalls: ToolCallDisplay,
/** A tool call's output (a command's, a diff) is shown without opening it. */
+3 -1
Переглянути файл
@@ -51,7 +51,9 @@ class CornerInset {
private measure() {
const corner = this.corner;
if (!corner) return;
// A hidden tab's view is detached and measures 0: keeping the inset spares every line
// a restyle when the tab hides and another when it shows again.
if (!corner || !this.view.dom.isConnected) return;
const width = corner.getBoundingClientRect().width;
let inset = width > 0 ? round(width) + CORNER_GAP : 0;
// A narrow window or a wide corner: keep at least half of the width for text.
+2 -26
Переглянути файл
@@ -20,16 +20,12 @@ import { countColumn, Facet, RangeSetBuilder, type EditorState, type Extension }
import { Decoration, EditorView, ViewPlugin, type DecorationSet, type ViewUpdate } from "@codemirror/view";
import { getIndentUnit, matchBrackets, syntaxTree } from "@codemirror/language";
import { LINE_INSET } from "./lineInset";
import { SPACE, spaceWidth } from "./spaceWidth";
import { BRACKET_COLORS, LONG_LINE, bracketScanner, type BracketScanner } from "./rainbowBrackets";
/** How far (px) a guide sits left of its column, so a caret in that column is right of it (IDEA's indent guide shift). */
const GUIDE_SHIFT = 2;
/** One column of indentation: a space in the editor font, as measured by the guides plugin. */
const SPACE = "var(--openidea-space, 1ch)";
const SPACE_SAMPLE = 64;
/** Number of `--openidea-guide-<n>` rainbow colours; deeper guides repeat them. */
export const GUIDE_COLORS = 5;
@@ -325,37 +321,20 @@ function build(
}
export const indentGuides: Extension = [
spaceWidth,
ViewPlugin.fromClass(
class {
decorations: DecorationSet;
private probe: HTMLElement;
private brackets: BracketCache[] = [];
/** Guide variables of each decorated line, by its start: code lens rows above it repeat them. */
private lineVars = new Map<number, { images: string; positions: string }>();
private scanner: BracketScanner | null;
constructor(readonly view: EditorView) {
// Inherits the editor font from the scroller, outside the content CodeMirror observes;
// the measured width goes on the scroller, where lines and code lens rows pick it up.
this.probe = document.createElement("span");
this.probe.setAttribute("aria-hidden", "true");
this.probe.style.cssText = "position: absolute; top: 0; left: 0; visibility: hidden; white-space: pre";
this.probe.textContent = " ".repeat(SPACE_SAMPLE);
view.scrollDOM.appendChild(this.probe);
const scanner = bracketScanner(view);
this.scanner = scanner;
this.decorations = build(view, scanner, this.brackets, this.lineVars);
this.measure();
this.syncLenses();
}
measure() {
this.view.requestMeasure({
key: this,
read: (view) => this.probe.getBoundingClientRect().width / (view.scaleX || 1) / SPACE_SAMPLE,
write: (width, view) => {
if (width > 0) view.scrollDOM.style.setProperty("--openidea-space", `${+width.toFixed(3)}px`);
},
});
}
/** Gives code lens rows the guides of the line they annotate, once they are in the DOM. */
syncLenses() {
this.view.requestMeasure({
@@ -379,15 +358,12 @@ export const indentGuides: Extension = [
});
}
destroy() {
this.probe.remove();
this.view.scrollDOM.style.removeProperty("--openidea-space");
for (const el of this.view.contentDOM.querySelectorAll<HTMLElement>(".cm-openidea-lens")) {
el.style.removeProperty("--openidea-guide-images");
el.style.removeProperty("--openidea-guide-positions");
}
}
update(u: ViewUpdate) {
if (u.geometryChanged) this.measure();
const scanner = bracketScanner(u.view);
// A new scanner (rainbow brackets toggled or reconfigured) may colour blocks differently.
const bracketsChanged = scanner !== this.scanner;
+31
Переглянути файл
@@ -0,0 +1,31 @@
import { afterEach, expect, it, vi } from "vitest";
import { registerEditorContribution } from "@/editor/api";
import { prewarmEditor } from "./prewarm";
afterEach(() => vi.unstubAllGlobals());
it("builds an off-screen editor with embedded contributions only, then removes it", () => {
let frame: FrameRequestCallback | undefined;
vi.stubGlobal("requestAnimationFrame", (f: FrameRequestCallback) => ((frame = f), 1));
const seen: string[] = [];
const offEmbedded = registerEditorContribution({
id: "test.embedded",
embedded: true,
extensions: (ctx) => (seen.push(`embedded ${ctx.doc}`), []),
});
const offFile = registerEditorContribution({
id: "test.file",
extensions: () => (seen.push("file"), []),
});
try {
prewarmEditor();
expect(document.querySelectorAll(".cm-editor")).toHaveLength(1);
expect(seen).toEqual(["embedded -1"]);
frame!(0);
expect(document.querySelector(".cm-editor")).toBeNull();
expect(document.body.children).toHaveLength(0);
} finally {
offEmbedded();
offFile();
}
});
+55
Переглянути файл
@@ -0,0 +1,55 @@
import { EditorState, type Extension } from "@codemirror/state";
import { EditorView } from "@codemirror/view";
import { editorContributions, type EditorDocContext } from "@/editor/api";
import { baseExtensions } from "./setup";
/**
* Builds and drops an off-screen editor with the file editors' setup, so the first file opened
* does not also pay for compiling the editor code and mounting its stylesheets. The document is
* virtual and empty, and only contributions that accept such editors (`embedded`) take part:
* nothing reaches a language server or the file system.
*/
export function prewarmEditor(): void {
const host = document.createElement("div");
host.setAttribute("aria-hidden", "true");
host.style.cssText = "position:fixed;left:-10000px;top:0;width:480px;height:240px;visibility:hidden;contain:strict";
document.body.appendChild(host);
const ctx: EditorDocContext = {
doc: -1,
path: "prewarm.txt",
language: "plaintext",
uiMode: null,
readOnly: true,
virtual: true,
};
const contributions: Extension[] = [];
for (const c of editorContributions()) {
if (!c.embedded) continue;
try {
contributions.push(c.extensions(ctx));
} catch {
// Warming is best effort: the real editor reports a failing contribution.
}
}
const view = new EditorView({
parent: host,
state: EditorState.create({
doc: "",
extensions: baseExtensions({
ctx,
settings: undefined,
info: undefined,
language: null,
docLength: 0,
indent: { tabSize: 4, insertSpaces: true },
wrapOverride: false,
contributions,
}),
}),
});
// One frame so its measure pass runs too, then nothing of it is left behind.
requestAnimationFrame(() => {
view.destroy();
host.remove();
});
}
+1 -1
Переглянути файл
@@ -189,7 +189,7 @@ it("indents by the code's character width, so a font size change keeps it in lin
const v = open(true, ["class A {", "\t/**", "\t * Books.", "\t */", "\tvoid book() {}", "}"].join("\n"));
const body = v.dom.querySelector<HTMLElement>(".cm-openidea-renderedDoc")!;
// A tab is a tab size of columns, not one character.
expect(body.style.marginLeft).toContain(`${v.state.tabSize} * var(--openidea-doc-char`);
expect(body.style.marginLeft).toContain(`${v.state.tabSize} * var(--openidea-space`);
});
it("forgets a flip whose comment is deleted, so the feature turns off again", async () => {
+14 -20
Переглянути файл
@@ -61,6 +61,7 @@ import { tx, useI18n } from "@/platform/i18n";
import { loadMarkdown, markupToHtml } from "@/editor/lsp/markdown";
import { hasContent, renderDoc, type DocComment, type DocStyle, type RenderedDoc } from "./docRender";
import { LINE_INSET } from "./lineInset";
import { SPACE, spaceWidth } from "./spaceWidth";
/** The file's default: render its doc comments or not. */
export const renderDocComments = Facet.define<boolean, boolean>({
@@ -320,9 +321,9 @@ class DocWidget extends WidgetType {
const titles = doc.sections.map(sectionTitle);
const dom = document.createElement("div");
dom.className = "cm-openidea-renderedDoc";
// In the code's character width, which `docMetrics` keeps current: the DOM stays
// right through a font size change or zoom, which does not draw the widget again.
const left = `(${this.indent} * var(--openidea-doc-char, 1ch) + ${LINE_INSET}px)`;
// In columns of the code's font (`spaceWidth`): the DOM stays right through a font
// size change or zoom, which does not draw the widget again.
const left = `(${this.indent} * ${SPACE} + ${LINE_INSET}px)`;
dom.style.marginLeft = `calc${left}`;
// The content is as wide as its longest line; the comment wraps at the visible width instead.
dom.style.maxWidth = `calc(var(--openidea-doc-width, 100%) - ${left} - ${DOC_RIGHT_GAP}px)`;
@@ -827,12 +828,10 @@ export function toggleRenderedViewAtCaret(view: EditorView): boolean {
const DOC_RIGHT_GAP = 24;
/**
* Publishes on the content the visible width of the text area, `--openidea-doc-width`,
* and the code's character width, `--openidea-doc-char`. A block widget is as wide as
* the content, which without soft wraps is as wide as the longest line, so a rendered
* comment needs the first to wrap where the reader can see, as IDEA's does; it indents
* by the second, which a font size change or zoom changes. Horizontal scrolling leaves
* both unchanged.
* Publishes on the content the visible width of the text area, `--openidea-doc-width`.
* A block widget is as wide as the content, which without soft wraps is as wide as the
* longest line, so a rendered comment needs it to wrap where the reader can see.
* Scrolling leaves it unchanged, so lines are not restyled while scrolling.
*/
const docMetrics = ViewPlugin.fromClass(
class {
@@ -845,18 +844,12 @@ const docMetrics = ViewPlugin.fromClass(
measure() {
this.view.requestMeasure({
key: this,
read: (view) => ({
width: view.scrollDOM.clientWidth - view.contentDOM.offsetLeft,
char: view.defaultCharacterWidth,
}),
write: ({ width, char }, view) => {
read: (view) => view.scrollDOM.clientWidth - view.contentDOM.offsetLeft,
write: (width, view) => {
const style = view.contentDOM.style;
const widthValue = `${Math.max(0, Math.floor(width))}px`;
if (style.getPropertyValue("--openidea-doc-width") !== widthValue)
style.setProperty("--openidea-doc-width", widthValue);
const charValue = `${char}px`;
if (style.getPropertyValue("--openidea-doc-char") !== charValue)
style.setProperty("--openidea-doc-char", charValue);
const value = `${Math.max(0, Math.floor(width))}px`;
if (style.getPropertyValue("--openidea-doc-width") !== value)
style.setProperty("--openidea-doc-width", value);
},
});
}
@@ -947,5 +940,6 @@ export const renderedDocsExtension: Extension = [
markdownReady,
languageWatcher,
docMetrics,
spaceWidth,
docsTheme,
];
+51
Переглянути файл
@@ -0,0 +1,51 @@
/**
* The editor font's space width, published on the scroller as `--openidea-space`
* for anything laid out in columns of indentation (indent guides, code lens rows,
* rendered doc comments). A space is measured, not `ch`: in a proportional font it
* is narrower than "0". The probe's text is fixed, so the value only changes with
* the font, its size or zoom; `defaultCharacterWidth` is sampled from whichever
* line is in view and drifts while scrolling, and an inherited variable that
* changes restyles every line.
*/
import { EditorView, ViewPlugin, type ViewUpdate } from "@codemirror/view";
/** One column of indentation, as a CSS length. */
export const SPACE = "var(--openidea-space, 1ch)";
const SAMPLE = 64;
/** Shared by every extension that lays out by `SPACE`; CodeMirror installs it once. */
export const spaceWidth = ViewPlugin.fromClass(
class {
private probe: HTMLElement;
private written = "";
constructor(readonly view: EditorView) {
// Inherits the editor font from the scroller, outside the content CodeMirror observes.
this.probe = document.createElement("span");
this.probe.setAttribute("aria-hidden", "true");
this.probe.style.cssText = "position: absolute; top: 0; left: 0; visibility: hidden; white-space: pre";
this.probe.textContent = " ".repeat(SAMPLE);
view.scrollDOM.appendChild(this.probe);
this.measure();
}
measure() {
this.view.requestMeasure({
key: this,
read: (view) => this.probe.getBoundingClientRect().width / (view.scaleX || 1) / SAMPLE,
write: (width, view) => {
const value = `${+width.toFixed(3)}px`;
if (width <= 0 || value === this.written) return;
this.written = value;
view.scrollDOM.style.setProperty("--openidea-space", value);
},
});
}
update(u: ViewUpdate) {
if (u.geometryChanged) this.measure();
}
destroy() {
this.probe.remove();
this.view.scrollDOM.style.removeProperty("--openidea-space");
}
},
);
+16 -2
Переглянути файл
@@ -61,6 +61,20 @@ export interface Reveal {
const KEPT_VIEWS = 8;
const keptSlots: EditorSlot[] = [];
/**
* Holds the visible tabs' tooltip layers. A layer added to `document.body` itself on every
* tab switch would change which element is the body's last child, and Chromium then
* restyles the whole workbench (`:last-child` rules); inside this host it restyles nothing else.
*/
let tooltipHost: HTMLElement | null = null;
function tooltipHostElement(): HTMLElement {
if (!tooltipHost?.isConnected) {
tooltipHost = document.createElement("div");
document.body.appendChild(tooltipHost);
}
return tooltipHost;
}
export class EditorSlot {
private stored: EditorState;
private historyTarget: WorkspaceHistoryTarget;
@@ -70,7 +84,7 @@ export class EditorSlot {
/** The view kept, detached from the document, while the tab is hidden. */
private kept: EditorView | null = null;
/**
* The tab's tooltips (hints, hover, completion…). They live outside the view, in `document.body`,
* The tab's tooltips (hints, hover, completion…). They live outside the view, under `document.body`,
* so they leave the page with the view when the tab is hidden instead of floating over the next tab.
*/
private readonly tooltipLayer = typeof document === "undefined" ? null : document.createElement("div");
@@ -207,7 +221,7 @@ export class EditorSlot {
mount(parent: HTMLElement): EditorView {
if (this.view) return this.view;
if (this.tooltipLayer && !this.tooltipLayer.isConnected) document.body.appendChild(this.tooltipLayer);
if (this.tooltipLayer && !this.tooltipLayer.isConnected) tooltipHostElement().appendChild(this.tooltipLayer);
const kept = this.kept;
let view: EditorView;
if (kept) {
+2 -1
Переглянути файл
@@ -568,7 +568,8 @@ function EditorTabActions({ paneId, tab }: { paneId: string; tab: Tab }) {
anchor={moreRef}
placement="bottom-end"
aria-label="Tab actions"
items={ctrl.tabMenu(paneId, tab)}
// Built when shown: every tab render (each open and switch) would otherwise assemble the whole menu.
items={open ? ctrl.tabMenu(paneId, tab) : []}
/>
</div>
);
+5 -13
Переглянути файл
@@ -232,8 +232,10 @@
.conversationRow[data-measured] {
content-visibility: auto;
}
/* Keep turns distinct and the work within a turn close to its author. */
.stream > * + * {
/* Keep turns distinct and the work within a turn close to its author. Not `* + *`: a
universal adjacent-sibling rule makes Chromium restyle whole sibling subtrees on every
DOM insertion anywhere in the window, which costs every editor scroll frame. */
.stream > :where(:not(:first-child)) {
margin-top: var(--space-4);
}
.stream > [data-process] + [data-process] {
@@ -336,7 +338,7 @@
.agentAuthor > .role {
margin-bottom: 0;
}
.agentAuthor + * {
:where(.conversationRow[data-author]) > :nth-child(2) {
margin-top: calc(var(--space-2) / 2);
}
.conversationRow > .process,
@@ -1067,16 +1069,6 @@
color: var(--fg-muted);
}
/* Announced to screen readers, not shown: the fact behind a playful status. */
.srOnly {
position: absolute;
width: 1px;
height: 1px;
overflow: hidden;
clip-path: inset(50%);
white-space: nowrap;
}
.retrying {
color: var(--warning);
}
-73
Переглянути файл
@@ -1,73 +0,0 @@
.body {
display: flex;
flex-direction: column;
gap: 10px;
height: 100%;
min-height: 0;
}
.notice {
margin: 0;
color: var(--fg-muted);
font-size: var(--fs-small);
overflow-wrap: anywhere;
}
.activity {
display: flex;
align-items: center;
gap: var(--space-2);
}
.after {
display: flex;
align-items: center;
gap: var(--space-2);
}
.seconds {
width: 64px;
font-variant-numeric: tabular-nums;
}
.items {
flex: 1;
min-height: 120px;
display: flex;
flex-direction: column;
gap: var(--space-1);
padding: 8px;
overflow: auto;
border: 1px solid var(--border-strong);
border-radius: var(--radius-control);
}
.item {
display: flex;
align-items: center;
justify-content: space-between;
gap: var(--space-1-5);
padding: 4px 8px;
background: var(--bg-hover);
border-radius: var(--radius-control);
}
.word {
overflow-wrap: anywhere;
}
.empty {
color: var(--fg-muted);
font-size: var(--fs-small);
}
.add {
display: flex;
align-items: center;
gap: var(--space-1-5);
}
.input {
flex: 1;
min-width: 0;
}
-147
Переглянути файл
@@ -1,147 +0,0 @@
/**
* Settings › Agents › Working Status: whether the status under a conversation turns playful, after
* how long without news, and the playful words of each activity, the built-in ones until the user
* writes their own.
*/
import { useId, useState } from "react";
import { useTx } from "@/platform/i18n";
import { PLAYFUL_AFTER_LIMITS } from "@/platform/agentStatus";
import { Button, Checkbox, IconButton, Input, Select, T, type SelectOption } from "@/ui";
import { useSettingsForm } from "@/workbench/contributions";
import { AGENT_SETTINGS_DEFAULTS } from "./agentSettings";
import { ACTIVITIES, ACTIVITY_STATUS, PLAYFUL_WORDS, type Activity } from "./workingStatus";
import styles from "./WorkingStatus.module.css";
export function WorkingStatusPage() {
const tx = useTx();
const form = useSettingsForm();
const playful =
(form.useValue("agents.playfulStatus") as boolean | undefined) ?? AGENT_SETTINGS_DEFAULTS.playfulStatus;
const own = (form.useValue("agents.playfulWords") ?? {}) as Record<string, string[]>;
const [activity, setActivity] = useState<Activity>("working");
const [draft, setDraft] = useState("");
const selectId = useId();
const custom = own[activity];
const words = custom ?? PLAYFUL_WORDS[activity].map((w) => tx(w));
const options: SelectOption<Activity>[] = ACTIVITIES.map((a) => ({
value: a,
label: ACTIVITY_STATUS[a],
detail: own[a] ? "Custom" : undefined,
}));
const setWords = (next: string[] | null) => {
const others = Object.fromEntries(Object.entries(own).filter(([a]) => a !== activity));
form.set("agents.playfulWords", next ? { ...others, [activity]: next } : others);
};
const add = () => {
const word = draft.trim();
if (!word) return;
setDraft("");
if (!words.includes(word)) setWords([...words, word]);
};
return (
<section className={styles.body} aria-label={tx("Working Status")}>
<p className={styles.notice}>
<T>
While the agent works, the line under the conversation says what it is doing. With playful words on, words for
what it does take turns there instead, from the start or once it reports nothing new for a while; screen
readers still hear the plain status.
</T>
</p>
<Checkbox
checked={playful}
onChange={(on) => form.set("agents.playfulStatus", on)}
label="Playful words while the agent works"
/>
<PlayfulAfter disabled={!playful} />
<div className={styles.activity}>
<label htmlFor={selectId}>
<T>While the status says</T>
</label>
<Select id={selectId} value={activity} options={options} onChange={setActivity} disabled={!playful} />
</div>
<div className={styles.items} role="list" aria-label={tx("Playful words")}>
{words.length === 0 && (
<div className={styles.empty}>
<T>No playful words: the status stays factual</T>
</div>
)}
{words.map((word, i) => (
<div key={`${i}:${word}`} className={styles.item} role="listitem">
<span className={styles.word}>{word}</span>
<IconButton
icon="close"
size="small"
title={tx`Remove ${word}`}
disabled={!playful}
onClick={() => setWords(words.filter((_, j) => j !== i))}
/>
</div>
))}
</div>
<div className={styles.add}>
<input
type="text"
className={styles.input}
value={draft}
disabled={!playful}
onChange={(e) => setDraft(e.target.value)}
onKeyDown={(e) => {
if (e.key !== "Enter") return;
// Enter adds the word; it does not press the dialog's OK.
e.preventDefault();
add();
}}
placeholder={tx("e.g. Reticulating splines…")}
aria-label={tx("New playful word")}
/>
<Button size="small" disabled={!playful} onClick={add}>
Add
</Button>
<Button size="small" disabled={!playful || !custom} onClick={() => setWords(null)}>
Restore Built-in Words
</Button>
</div>
</section>
);
}
/** Seconds without news before the status turns playful; invalid text is flagged and reverted on blur. */
function PlayfulAfter({ disabled }: { disabled: boolean }) {
const tx = useTx();
const form = useSettingsForm();
const value =
(form.useValue("agents.playfulAfterSeconds") as number | undefined) ?? AGENT_SETTINGS_DEFAULTS.playfulAfterSeconds;
const [draft, setDraft] = useState<string | null>(null);
const id = useId();
const { min, max } = PLAYFUL_AFTER_LIMITS;
const parse = (text: string) => {
const n = /^\s*\d+\s*$/.test(text) ? Number(text) : NaN;
return n >= min && n <= max ? n : null;
};
const invalid = draft !== null && parse(draft) === null;
return (
<div className={styles.after}>
<label htmlFor={id}>
<T>Start after the agent reports nothing new for</T>
</label>
<Input
id={id}
className={styles.seconds}
inputMode="numeric"
value={draft ?? String(value)}
invalid={invalid}
disabled={disabled}
title={invalid ? tx`Enter a value between ${min} and ${max}` : undefined}
onChange={(e) => {
setDraft(e.target.value);
const n = parse(e.target.value);
if (n !== null) form.set("agents.playfulAfterSeconds", n);
}}
onBlur={() => setDraft(null)}
/>
<T>seconds</T>
</div>
);
}
-3
Переглянути файл
@@ -13,9 +13,6 @@ export const AGENT_SETTINGS_DEFAULTS: ResolvedAgentSettings = {
foldTurns: true,
smoothText: true,
fitWindowWidth: false,
playfulStatus: false,
playfulAfterSeconds: 0,
playfulWords: {},
thinking: "auto",
toolCalls: "grouped",
expandToolOutput: false,
-2
Переглянути файл
@@ -15,8 +15,6 @@ export const AGENTS_GROUP = "Agents";
export const MCP_PAGE = "agents.mcpServers";
/** Settings › Agents › Command Permissions. */
export const POLICY_PAGE = "agents.policy";
/** Settings › Agents › Working Status: the playful words under a working conversation. */
export const WORKING_STATUS_PAGE = "agents.workingStatus";
export const sessionKey = (task: string) => `agent:${task}`;
+6 -5
Переглянути файл
@@ -29,7 +29,7 @@ function task(id: string, title: string, cwd: string): AgentTask {
}
/** A turn as agents work: a request, reasoning, a run of tool calls, then a reply with code. */
function turn(cwd: string, i: number): AgentEntry[] {
function turn(cwd: string, i: number, title: string): AgentEntry[] {
const file = (k: number) => `${cwd}/src/orders/Order${(i + k) % 40}.kt`;
const tools: AgentEntry[] = Array.from({ length: 10 }, (_, k) => {
// Tool titles as agents report them (commands and paths, not UI text).
@@ -49,7 +49,8 @@ function turn(cwd: string, i: number): AgentEntry[] {
};
});
// What a user and an agent wrote (conversation content, not UI text).
const request = `Turn ${i}: make the order service retry failed payments and cover it with tests`;
// Ends with the task's title, so each conversation shown can be told apart.
const request = `Turn ${i}: make the order service retry failed payments and cover it with tests (${title})`;
const reasoning = `The payment client throws on timeouts; retrying belongs in the service (turn ${i}).`;
return [
{
@@ -94,14 +95,14 @@ function turn(cwd: string, i: number): AgentEntry[] {
/** Opens `count` tasks of `turns` turns each (14 entries a turn), the last one shown. */
export function openSampleConversations(count: number, turns: number) {
const cwd = useProject.getState().project?.root ?? "/";
const entries = Array.from({ length: turns }, (_, i) => turn(cwd, i)).flat();
const s = useAgents.getState();
const tasks = new Map(s.tasks);
const all = new Map(s.entries);
const ids = Array.from({ length: count }, (_, n) => `sample-${n + 1}`);
ids.forEach((id, n) => {
tasks.set(id, task(id, `Sample task ${n + 1}`, cwd));
all.set(id, entries);
const title = `Sample task ${n + 1}`;
tasks.set(id, task(id, title, cwd));
all.set(id, Array.from({ length: turns }, (_, i) => turn(cwd, i, title)).flat());
});
useAgents.setState({ tasks, entries: all });
for (const id of ids) openTask(id);
+1
Переглянути файл
@@ -559,6 +559,7 @@ export function Stream({
(row.kind === "entry" && (row.entry.type === "user" || row.entry.type === "agent")) || undefined
}
data-process={row.kind !== "entry" || row.entry.type !== "user" || undefined}
data-author={authorHeaders.has(row.index) || undefined}
>
{authorHeaders.has(row.index) && (
<div className={styles.agentAuthor}>
+6 -62
Переглянути файл
@@ -1,23 +1,12 @@
import type { AgentEntry, AgentRetry, AgentTask } from "@/bindings";
import { useTx } from "@/platform/i18n";
import { Spinner, T } from "@/ui";
import { useState } from "react";
import styles from "../Session.module.css";
import { useAgentSettings } from "../agentSettings";
import { retryParts } from "../composerModel";
import { formatDuration } from "../conversation";
import { subagentWorking, type SubagentEntry } from "../model";
import { asksInCard } from "../permission";
import {
ACTIVITY_STATUS,
activityOf,
PLAYFUL_MIN_MS,
PLAYFUL_WORD_MS,
PLAYFUL_WORDS,
playfulIndex,
progressKey,
type Activity,
} from "../workingStatus";
import { ACTIVITY_STATUS, activityOf } from "../workingStatus";
import { useNow, type UserEntry } from "./shared";
/** The agent lost its API connection (or was refused) and retries on its own. */
@@ -57,11 +46,7 @@ export function WorkingRow({
return (
<div className={styles.working} role="status">
<Spinner size={12} />
{subagent.status === "needsInput" ? (
<T>Waiting for your answer…</T>
) : (
<WorkingLabel turn={entries ?? []} seed={subagent.startedMs ?? 0} />
)}
{subagent.status === "needsInput" ? <T>Waiting for your answer…</T> : <WorkingLabel turn={entries ?? []} />}
{subagent.startedMs != null && <Elapsed since={subagent.startedMs} />}
</div>
);
@@ -78,56 +63,15 @@ export function WorkingRow({
) : task.status === "starting" ? (
<T>Starting the agent…</T>
) : (
<WorkingLabel turn={entries?.slice(userAt + 1) ?? []} seed={lastUser?.sentMs ?? 0} />
<WorkingLabel turn={entries?.slice(userAt + 1) ?? []} />
)}
{lastUser?.sentMs != null && !lastUser.doneMs && <Elapsed since={lastUser.sentMs} />}
</div>
);
}
/**
* What the agent is doing, said by the activity's playful words in turns (the user's own, else the
* built-in ones) from the start, or once it has reported nothing new for the user's quiet time;
* screen readers hear only the fact. A word stays its full time while it still fits what the agent
* does, and a little while when it no longer does, so the row never flickers.
*/
function WorkingLabel({ turn, seed }: { turn: AgentEntry[]; seed: number }) {
/** What the agent is doing, from the turn's latest output. */
function WorkingLabel({ turn }: { turn: AgentEntry[] }) {
const tx = useTx();
const { playfulStatus, playfulAfterSeconds, playfulWords } = useAgentSettings();
const now = useNow(1000);
const key = progressKey(turn);
const [progress, setProgress] = useState({ key, at: now });
if (progress.key !== key) setProgress({ key, at: now });
// The word on screen, and how many the turn has shown, so the next one continues the order.
const [playful, setPlayful] = useState<{ shown: number; word: PlayfulWord | null }>({ shown: 0, word: null });
const activity = activityOf(turn);
const kind = activity ?? "working";
const fact = tx(ACTIVITY_STATUS[kind]);
const own = playfulWords[kind];
const words = own ?? PLAYFUL_WORDS[kind];
const due = words.length > 0 && (!activity || now - progress.at >= playfulAfterSeconds * 1000);
const current = playful.word;
const fits = due && current?.kind === kind;
const stays = current && playfulStatus && now - current.since < (fits ? PLAYFUL_WORD_MS : PLAYFUL_MIN_MS);
let next = playful;
if (!stays && playfulStatus && due) {
const text = words[playfulIndex(words.length, seed, playful.shown)]!;
next = { shown: playful.shown + 1, word: { text, kind, own: !!own, since: now } };
} else if (!stays && current) next = { shown: playful.shown, word: null };
if (next !== playful) setPlayful(next);
if (!next.word) return fact;
return (
<>
<span aria-hidden>{next.word.own ? next.word.text : tx(next.word.text)}</span>
<span className={styles.srOnly}>{fact}</span>
</>
);
}
/** A playful word for `kind` on screen since `since`: the user's own as written, else a built-in one to translate. */
interface PlayfulWord {
text: string;
kind: Activity;
own: boolean;
since: number;
return tx(ACTIVITY_STATUS[activityOf(turn) ?? "working"]);
}
+2 -93
Переглянути файл
@@ -24,7 +24,6 @@ import { useChangesOptions } from "./changesOptions";
import { taskActions } from "./taskActions";
import { replyActions } from "./replyActions";
import { focusedSession } from "./sessionFocus";
import { PLAYFUL_MIN_MS, PLAYFUL_WORD_MS, PLAYFUL_WORDS } from "./workingStatus";
import styles from "./Session.module.css";
import chipStyles from "./ReferenceChip.module.css";
import { caretOf, textOf, typeIn } from "./composerTesting";
@@ -517,108 +516,18 @@ describe("working status", () => {
}),
});
};
const playful = (status: HTMLElement) => status.querySelector("[aria-hidden]")?.textContent ?? null;
const playfulOn = (agents: object = {}) =>
useProject.setState({ settings: { agents: { playfulStatus: true, ...agents } } as never });
it("says plainly what the agent does by default", async () => {
vi.useFakeTimers();
running([tool("one", { status: "running" })]);
render(<SessionEditor input={input("A")} />);
await act(async () => {});
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_WORD_MS * 2));
const status = stream().querySelector<HTMLElement>(`.${styles.working}`)!;
expect(playful(status)).toBeNull();
expect(status).toHaveTextContent("Reading…");
});
it("is playful from the start, holds each word while the work goes on, and turns to the new work's words", async () => {
vi.useFakeTimers();
playfulOn();
running([tool("one", { status: "running" })]);
render(<SessionEditor input={input("A")} />);
await act(async () => {});
const status = stream().querySelector<HTMLElement>(`.${styles.working}`)!;
const word = playful(status);
expect(PLAYFUL_WORDS.reading).toContain(word);
// Screen readers still hear the fact.
expect(status.querySelector(`.${styles.srOnly}`)).toHaveTextContent("Reading…");
// More of the same work keeps the word its full time.
running([tool("one", { status: "running" }), tool("two", { status: "running" })]);
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_WORD_MS - 1000));
expect(playful(status)).toBe(word);
await act(() => vi.advanceTimersByTimeAsync(1000));
const second = playful(status);
expect(PLAYFUL_WORDS.reading.filter((w) => w !== word)).toContain(second);
// New work leaves the word a moment, then says the new work playfully too.
running([tool("one", { status: "running" }), { type: "agent", text: "Found it" }]);
await act(() => vi.advanceTimersByTimeAsync(1000));
expect(playful(status)).toBe(second);
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_MIN_MS - 1000));
expect(PLAYFUL_WORDS.writing).toContain(playful(status));
expect(status.querySelector(`.${styles.srOnly}`)).toHaveTextContent("Writing…");
});
it("with a quiet time, is factual until the agent reports nothing new for it, and again on progress", async () => {
vi.useFakeTimers();
playfulOn({ playfulAfterSeconds: 10 });
it("says what the agent does", async () => {
running([tool("one", { status: "running" })]);
render(<SessionEditor input={input("A")} />);
await act(async () => {});
const status = stream().querySelector<HTMLElement>(`.${styles.working}`)!;
expect(status).toHaveTextContent("Reading…");
expect(playful(status)).toBeNull();
await act(() => vi.advanceTimersByTimeAsync(9000));
expect(playful(status)).toBeNull();
await act(() => vi.advanceTimersByTimeAsync(1000));
const word = playful(status);
expect(PLAYFUL_WORDS.reading).toContain(word);
// Progress right after a word appeared leaves it a moment before the fact returns.
running([tool("one", { status: "running" }), { type: "agent", text: "Found it" }]);
await act(() => vi.advanceTimersByTimeAsync(1000));
expect(playful(status)).toBe(word);
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_MIN_MS - 1000));
expect(playful(status)).toBeNull();
await act(async () => {});
expect(status).toHaveTextContent("Writing…");
});
it("keeps each word its full time however soon the status turns playful", async () => {
vi.useFakeTimers();
playfulOn({ playfulAfterSeconds: 1 });
running([tool("one", { status: "running" })]);
render(<SessionEditor input={input("A")} />);
await act(async () => {});
const status = stream().querySelector<HTMLElement>(`.${styles.working}`)!;
await act(() => vi.advanceTimersByTimeAsync(1000));
const word = playful(status);
expect(PLAYFUL_WORDS.reading).toContain(word);
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_WORD_MS - 1000));
expect(playful(status)).toBe(word);
await act(() => vi.advanceTimersByTimeAsync(1000));
expect(PLAYFUL_WORDS.reading.filter((w) => w !== word)).toContain(playful(status));
});
it("shows the user's own words of the activity, and none where they left the list empty", async () => {
vi.useFakeTimers();
playfulOn({ playfulWords: { reading: ["Squinting really hard…"], working: [] } });
running([]);
render(<SessionEditor input={input("A")} />);
await act(async () => {});
const status = stream().querySelector<HTMLElement>(`.${styles.working}`)!;
// Nothing reported yet is `working`, whose list the user emptied.
expect(playful(status)).toBeNull();
expect(status).toHaveTextContent("Working…");
running([tool("one", { status: "running" })]);
await act(() => vi.advanceTimersByTimeAsync(1000));
expect(playful(status)).toBe("Squinting really hard…");
await act(() => vi.advanceTimersByTimeAsync(PLAYFUL_WORD_MS));
expect(playful(status)).toBe("Squinting really hard…");
});
});
describe("opened runs", () => {
+1 -10
Переглянути файл
@@ -1,6 +1,6 @@
import { lazyComponent } from "@/ui";
import { registerSettingsPages } from "@/workbench/contributions";
import { AGENTS_GROUP, MCP_PAGE, POLICY_PAGE, REGISTRY_PAGE, WORKING_STATUS_PAGE } from "./model";
import { AGENTS_GROUP, MCP_PAGE, POLICY_PAGE, REGISTRY_PAGE } from "./model";
/** Settings › Agents › Coding Agents and Settings › Agents › External MCP Servers (also used by the Settings window). */
export function activateSettingsPages(): () => void {
@@ -14,15 +14,6 @@ export function activateSettingsPages(): () => void {
keywords: ["agent", "acp", "registry", "install", "update", "coding agent"],
component: lazyComponent(() => import("./AgentRegistryPage").then((m) => m.AgentRegistryPage)),
},
{
id: WORKING_STATUS_PAGE,
title: "Working Status",
group: AGENTS_GROUP,
// After Chat.
order: 465,
keywords: ["agent", "status", "playful", "words", "working", "spinner", "fun", "delay", "seconds"],
component: lazyComponent(() => import("./WorkingStatusPage").then((m) => m.WorkingStatusPage)),
},
{
id: MCP_PAGE,
title: "External MCP Servers",
+14 -109
Переглянути файл
@@ -1,32 +1,22 @@
/**
* The label of the row under a conversation while the agent works: what the turn's latest
* output says it is doing, and playful words while it reports nothing new (or nothing yet).
*/
/** The label of the row under a conversation while the agent works: what the turn's latest output says it is doing. */
import type { AgentEntry } from "@/bindings";
import { subagentWorking } from "./model";
/** How long one playful word stays while the agent still reports nothing new. */
export const PLAYFUL_WORD_MS = 8_000;
/** How long a playful word stays at least, even when the agent reports something new meanwhile. */
export const PLAYFUL_MIN_MS = 3_000;
/** What the agent can be doing, as the status tells it; `working` covers the rest. */
export const ACTIVITIES = [
"working",
"thinking",
"writing",
"reading",
"editing",
"deleting",
"moving",
"searching",
"running",
"fetching",
"subagent",
] as const;
export type Activity = (typeof ACTIVITIES)[number];
type Activity =
| "working"
| "thinking"
| "writing"
| "reading"
| "editing"
| "deleting"
| "moving"
| "searching"
| "running"
| "fetching"
| "subagent";
/** The factual status of each activity, also what screen readers hear while it is playful. */
/** The status of each activity. */
export const ACTIVITY_STATUS: Record<Activity, string> = {
working: "Working…",
thinking: "Thinking…",
@@ -41,59 +31,6 @@ export const ACTIVITY_STATUS: Record<Activity, string> = {
subagent: "Running a subagent…",
};
/** The built-in playful words of each activity, until the user writes their own. */
export const PLAYFUL_WORDS: Record<Activity, readonly string[]> = {
working: [
"Untangling imports…",
"Explaining it to the rubber duck…",
"Herding semicolons…",
"Rebasing onto reality…",
"Measuring twice…",
"Sharpening the pencils…",
"Invalidating a cache…",
],
thinking: [
"Refactoring a hunch…",
"Garbage-collecting thoughts…",
"Compiling a plan…",
"Caching an insight…",
"Bisecting the problem…",
"Naming things…",
],
writing: [
"Counting brackets…",
"Settling tabs versus spaces…",
"Choosing words carefully…",
"Polishing the prose…",
"Drafting, redrafting…",
],
reading: [
"Reading the fine manual…",
"Following the breadcrumbs…",
"Walking the call stack…",
"Reading between the lines…",
"Skimming the source…",
],
editing: [
"Squinting at the diff…",
"Negotiating with the borrow checker…",
"Asking the linter nicely…",
"Nudging a semicolon…",
"Moving code around gently…",
],
deleting: ["Tidying up…", "Taking out the trash…", "Pruning dead code…", "Saying goodbye…"],
moving: ["Rearranging the furniture…", "Packing boxes…", "Finding a better home…"],
searching: ["Grepping the void…", "Chasing a null pointer…", "Looking under the couch…", "Searching high and low…"],
running: [
"Warming up the compiler…",
"Pressing Enter with confidence…",
"Watching the logs scroll…",
"Waiting on the shell…",
],
fetching: ["Waiting on the network…", "Downloading the internet…", "Following links…"],
subagent: ["Delegating…", "Consulting a colleague…", "Calling in reinforcements…", "Holding a quick stand-up…"],
};
const TOOL_ACTIVITY: Record<string, Activity> = {
read: "reading",
edit: "editing",
@@ -124,35 +61,3 @@ export function activityOf(turn: readonly AgentEntry[]): Activity | null {
return "working";
}
}
/** Changes whenever the agent reports something new in the turn: an entry, more text, a tool's progress. */
export function progressKey(turn: readonly AgentEntry[]): string {
const last = turn.at(-1);
const detail =
last?.type === "agent" || last?.type === "thought"
? last.text.length
: last?.type === "tool"
? `${last.status}:${last.output?.length ?? 0}`
: last?.type === "subagent"
? last.status
: "";
return `${turn.length}:${last?.type ?? ""}:${detail}`;
}
/**
* Which of `count` playful words is the `n`th to show in the turn that started at `seed`. Each turn
* goes through every word in an order of its own.
*/
export function playfulIndex(count: number, seed: number, n: number): number {
const order = Array.from({ length: count }, (_, i) => i);
let state = seed >>> 0;
for (let i = order.length - 1; i > 0; i--) {
// mulberry32
state = (state + 0x6d2b79f5) >>> 0;
let r = Math.imul(state ^ (state >>> 15), state | 1);
r ^= r + Math.imul(r ^ (r >>> 7), r | 61);
const j = ((r ^ (r >>> 14)) >>> 0) % (i + 1);
[order[i], order[j]] = [order[j]!, order[i]!];
}
return order[n % count]!;
}
-83
Переглянути файл
@@ -1,83 +0,0 @@
import { afterEach, beforeEach, describe, expect, it } from "vitest";
import { fireEvent, render, screen, within } from "@testing-library/react";
import { SettingsFormContext } from "@/workbench/contributions";
import { useSettingsFormFor } from "@/features/settings/components/context";
import { closeSettings, openSettings, stagedValue, useSettingsDialog } from "@/features/settings/model/staging";
import { WORKING_STATUS_PAGE } from "./model";
import { WorkingStatusPage as Page } from "./WorkingStatusPage";
import { PLAYFUL_WORDS } from "./workingStatus";
function WorkingStatusPage() {
const form = useSettingsFormFor(WORKING_STATUS_PAGE, "global");
return (
<SettingsFormContext.Provider value={form}>
<Page />
</SettingsFormContext.Provider>
);
}
const staged = () => stagedValue(useSettingsDialog.getState(), "global", "agents.playfulWords");
const words = () =>
within(screen.getByRole("list", { name: "Playful words" }))
.queryAllByRole("listitem")
.map((item) => item.textContent);
/** The page with playful words turned on, so its word controls are enabled. */
function renderOn() {
render(<WorkingStatusPage />);
fireEvent.click(screen.getByRole("checkbox", { name: "Playful words while the agent works" }));
}
describe("Working Status settings", () => {
beforeEach(() => openSettings(WORKING_STATUS_PAGE));
afterEach(() => closeSettings());
it("is off by default, and turning it on enables the words", () => {
render(<WorkingStatusPage />);
const toggle = screen.getByRole("checkbox", { name: "Playful words while the agent works" });
expect(toggle).not.toBeChecked();
expect(screen.getByRole("textbox", { name: "New playful word" })).toBeDisabled();
fireEvent.click(toggle);
expect(stagedValue(useSettingsDialog.getState(), "global", "agents.playfulStatus")).toBe(true);
expect(screen.getByRole("textbox", { name: "New playful word" })).toBeEnabled();
});
it("turns the built-in words into the user's own on the first edit, and restores them", () => {
renderOn();
const builtIn = [...PLAYFUL_WORDS.working];
expect(words()).toEqual(builtIn);
fireEvent.click(screen.getByRole("button", { name: `Remove ${builtIn[0]}` }));
const input = screen.getByRole("textbox", { name: "New playful word" });
fireEvent.change(input, { target: { value: " Reticulating splines… " } });
// Enter adds the word and is not left to press the Settings dialog's OK.
expect(fireEvent.keyDown(input, { key: "Enter" })).toBe(false);
const own = [...builtIn.slice(1), "Reticulating splines…"];
expect(words()).toEqual(own);
expect(staged()).toEqual({ working: own });
fireEvent.click(screen.getByRole("button", { name: "Restore Built-in Words" }));
expect(staged()).toEqual({});
expect(words()).toEqual(builtIn);
});
it("keeps an emptied list, which leaves the status factual", () => {
renderOn();
for (const word of PLAYFUL_WORDS.working) fireEvent.click(screen.getByRole("button", { name: `Remove ${word}` }));
expect(staged()).toEqual({ working: [] });
expect(screen.getByText("No playful words: the status stays factual")).toBeInTheDocument();
});
it("saves the quiet time while the text is a valid number, and drops invalid text on blur", () => {
renderOn();
const after = () => stagedValue(useSettingsDialog.getState(), "global", "agents.playfulAfterSeconds");
const seconds = screen.getByRole("textbox", { name: "Start after the agent reports nothing new for" });
expect(seconds).toHaveValue("0");
fireEvent.change(seconds, { target: { value: "25" } });
expect(after()).toBe(25);
fireEvent.change(seconds, { target: { value: "601" } });
expect(seconds).toHaveAttribute("aria-invalid", "true");
expect(after()).toBe(25);
fireEvent.blur(seconds);
expect(seconds).toHaveValue("25");
});
});
+1 -1
Переглянути файл
@@ -37,7 +37,7 @@
flex: none;
align-items: center;
}
.stack > * + * {
.stack > :where(:not(:first-child)) {
margin-left: calc(var(--overlap) * -1);
}
.stack > .ringed + .ringed {
+21 -15
Переглянути файл
@@ -3,23 +3,21 @@
flex-direction: column;
min-width: 0;
height: 100%;
min-height: 420px;
min-height: 0;
}
.topBar {
display: flex;
flex-wrap: wrap;
align-items: center;
justify-content: center;
gap: var(--space-1-5);
min-width: 0;
}
.side {
display: flex;
.page > .topBar {
flex: none;
flex-direction: column;
width: clamp(320px, 42%, 480px);
min-height: 0;
border-right: 1px solid var(--border);
padding: 0 var(--space-2) var(--space-1);
}
.sourceTabs {
flex: none;
border-bottom: 0;
}
.tabCount {
@@ -37,13 +35,14 @@
.searchRow {
display: flex;
flex: none;
flex-wrap: wrap;
align-items: center;
gap: var(--space-1-5);
padding: 8px;
border-bottom: 1px solid var(--border);
}
.searchField {
flex: 1;
flex: 1 1 132px;
min-width: 0;
}
.spacer {
@@ -58,8 +57,6 @@
overflow-wrap: anywhere;
}
.body {
display: flex;
min-width: 640px;
flex: 1;
min-height: 0;
border-top: 1px solid var(--border);
@@ -237,11 +234,14 @@
.details {
flex: 1;
min-width: 0;
padding: 16px 20px 20px;
min-height: 0;
padding: var(--space-4);
overflow: auto;
}
.detailsEmpty {
flex: 1;
min-height: 0;
overflow: auto;
}
/* Tags, name, vendor, then the actions with the version. */
.header {
@@ -258,6 +258,7 @@
color: var(--fg);
font: inherit;
white-space: pre-wrap;
overflow-wrap: anywhere;
}
.titleLine {
display: flex;
@@ -273,15 +274,19 @@
.title {
margin: 0;
color: var(--fg-strong);
font-size: var(--fs-input-large);
font-size: 1.375em;
font-weight: 600;
line-height: 1.3;
overflow-wrap: anywhere;
}
.version {
color: var(--fg-muted);
font-size: var(--fs-small);
font-variant-numeric: tabular-nums;
}
.authors {
color: var(--fg-secondary);
overflow-wrap: anywhere;
}
.headerActions {
display: flex;
@@ -298,6 +303,7 @@
margin: 10px 0 0;
max-width: 640px;
color: var(--fg);
overflow-wrap: anywhere;
}
.details .error {
margin-top: 10px;
@@ -434,6 +440,7 @@
.consentNotice {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: var(--space-3);
justify-content: space-between;
@@ -444,8 +451,7 @@
}
.categorySelect {
flex: none;
width: 150px;
flex: 0 1 150px;
}
.ownIcon {
background: transparent;
+61 -38
Переглянути файл
@@ -6,7 +6,7 @@
* There is no network repository: Available lists the plugin packages
* available locally (`plugin_catalog`) and installs them from disk.
*/
import { useEffect, useMemo, useState, type MouseEvent, type ReactNode } from "react";
import { useEffect, useLayoutEffect, useMemo, useRef, useState, type MouseEvent, type ReactNode } from "react";
import clsx from "clsx";
import type {
CapabilityInfo,
@@ -27,6 +27,9 @@ import {
SearchField,
Select,
Spinner,
SplitGroup,
SplitHandle,
SplitPanel,
Tabs,
showContextMenu,
type MenuItem,
@@ -1309,6 +1312,19 @@ export function PluginsPage({ initialTab = "marketplace" }: { initialTab?: Tab }
const [query, setQuery] = useState("");
const [selectedId, setSelectedId] = useState<string | null>(null);
const [selectedCatalogId, setSelectedCatalogId] = useState<string | null>(null);
const pageRef = useRef<HTMLDivElement>(null);
const [stacked, setStacked] = useState(false);
useLayoutEffect(() => {
const page = pageRef.current;
if (!page) return;
const measure = () => setStacked(page.clientWidth < 600);
measure();
if (typeof ResizeObserver === "undefined") return;
const observer = new ResizeObserver(measure);
observer.observe(page);
return () => observer.disconnect();
}, []);
useEffect(() => {
void refreshPlugins();
@@ -1403,7 +1419,7 @@ export function PluginsPage({ initialTab = "marketplace" }: { initialTab?: Tab }
const headerSlot = useSettingsHeaderSlot();
const header = (
<>
<div className={styles.topBar}>
<Tabs
variant="compact"
className={styles.sourceTabs}
@@ -1421,12 +1437,12 @@ export function PluginsPage({ initialTab = "marketplace" }: { initialTab?: Tab }
/>
{(loading || installing) && <Spinner size={14} label={installing ? "Installing plugin" : "Loading plugins"} />}
<IconButton icon="settings" title="Manage Plugins" aria-haspopup="menu" onClick={openGear} />
</>
</div>
);
return (
<div className={styles.page}>
{headerSlot ? createPortal(header, headerSlot) : <div className={styles.topBar}>{header}</div>}
<div ref={pageRef} className={styles.page}>
{headerSlot && !stacked ? createPortal(header, headerSlot) : header}
{error && (
<div className={styles.error} role="alert">
@@ -1434,8 +1450,13 @@ export function PluginsPage({ initialTab = "marketplace" }: { initialTab?: Tab }
</div>
)}
<div className={styles.body}>
<div className={styles.side}>
<SplitGroup
id="plugin-panes"
className={styles.body}
orientation={stacked ? "vertical" : "horizontal"}
storageKey={`openidea.settings.plugins.layout.${stacked ? "stacked" : "sideBySide"}`}
>
<SplitPanel id="plugin-list" defaultSize="45%" minSize={stacked ? "28%" : "240px"}>
<div className={styles.searchRow}>
<SearchField
className={styles.searchField}
@@ -1527,39 +1548,41 @@ export function PluginsPage({ initialTab = "marketplace" }: { initialTab?: Tab }
{catalogError && <li className={clsx(styles.listEmpty, styles.errorText)}>{catalogError}</li>}
</ul>
)}
</div>
{tab === "installed" ? (
selected ? (
<InstalledDetails key={selected.id} plugin={selected} />
</SplitPanel>
<SplitHandle aria-label={tx("Resize plugin panes")} />
<SplitPanel id="plugin-details" defaultSize="55%" minSize={stacked ? "35%" : "320px"}>
{tab === "installed" ? (
selected ? (
<InstalledDetails key={selected.id} plugin={selected} />
) : (
<EmptyState className={styles.detailsEmpty} title={loaded ? "No plugin selected" : "Loading…"}>
<T>Plugins are folders with a</T> <code>plugin.toml</code>
<T>. Use the gear menu to install one from disk, or put dev plugins in</T>{" "}
<code>.openidea/plugins/</code> <T>inside your project.</T>
</EmptyState>
)
) : selectedMarket ? (
<MarketDetails
key={`market:${selectedMarket.id}`}
entry={selectedMarket}
suggestedBy={suggestions.get(selectedMarket.id)}
onInstalled={(id) => {
setTab("installed");
setSelectedId(id);
}}
/>
) : selectedEntry ? (
<CatalogDetails key={selectedEntry.id} entry={selectedEntry} />
) : marketUrl ? (
<EmptyState className={styles.detailsEmpty} title="No plugin selected" />
) : (
<EmptyState className={styles.detailsEmpty} title={loaded ? "No plugin selected" : "Loading…"}>
<T>Plugins are folders with a</T> <code>plugin.toml</code>
<T>. Use the gear menu to install one from disk, or put dev plugins in</T> <code>.openidea/plugins/</code>{" "}
<T>inside your project.</T>
<EmptyState className={styles.detailsEmpty} title={NO_REPOSITORY}>
<T>Install a plugin folder with</T> <code>plugin.toml</code>{" "}
<T>via the gear menu › Install Plugin from Disk….</T>
</EmptyState>
)
) : selectedMarket ? (
<MarketDetails
key={`market:${selectedMarket.id}`}
entry={selectedMarket}
suggestedBy={suggestions.get(selectedMarket.id)}
onInstalled={(id) => {
setTab("installed");
setSelectedId(id);
}}
/>
) : selectedEntry ? (
<CatalogDetails key={selectedEntry.id} entry={selectedEntry} />
) : marketUrl ? (
<EmptyState className={styles.detailsEmpty} title="No plugin selected" />
) : (
<EmptyState className={styles.detailsEmpty} title={NO_REPOSITORY}>
<T>Install a plugin folder with</T> <code>plugin.toml</code>{" "}
<T>via the gear menu › Install Plugin from Disk….</T>
</EmptyState>
)}
</div>
)}
</SplitPanel>
</SplitGroup>
</div>
);
}
+2 -1
Переглянути файл
@@ -953,7 +953,8 @@ describe("PluginsPage", () => {
await user.click(screen.getByRole("button", { name: "Apply theme Harbor Night" }));
await waitFor(() => expect(screen.getByRole("button", { name: "Use Default Theme" })).toBeInTheDocument());
await user.type(screen.getByLabelText("Filter plugins"), "toy");
screen.getByLabelText("Filter plugins").focus();
await user.keyboard("toy");
await waitFor(() => expect(within(list).getAllByRole("listitem")).toHaveLength(1));
expect(screen.getByRole("heading", { level: 2 })).toHaveTextContent("Toy Language");
expect(screen.getByText("Toy (.toy)")).toBeInTheDocument();
+1 -1
Переглянути файл
@@ -115,7 +115,7 @@
flex: 1 1 50%;
min-width: 0;
}
.body > * + * {
.body > :where(:not(:first-child)) {
border-left: 1px solid var(--border);
}
.hidden {
+7 -3
Переглянути файл
@@ -107,6 +107,9 @@ type ResolvedNode = Exclude<MemNode, { kind: "symlink" }>;
const err = (kind: "notFound" | "alreadyExists" | "invalidInput", message: string) => new IpcError({ kind, message });
/** Created once: building a collator costs more than sorting a small folder with it. */
const naturalOrder = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" });
/** The tree's own notion (see `isDirEntry`): a folder, or a link to one. */
const isFolder = (e: FileEntry) => e.kind === "dir" || (e.kind === "symlink" && e.size === 0);
@@ -161,13 +164,14 @@ export class MemoryFs implements ProjectFs {
const { path, node } = this.resolve(at);
if (!node) throw err("notFound", `${path} not found`);
if (node.kind !== "dir") throw err("invalidInput", `${at} is not a directory`);
const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: "base" });
// A child is excluded when its folder is, or when it is itself an excluded path.
const inExcluded = [...this.ignored].some((i) => path === i || isInside(path, i));
return (
this.childrenOf(path)
.map((p) => {
const c = this.nodes.get(p)!;
const name = nameOf(p);
const excluded = [...this.ignored].some((i) => p === i || isInside(p, i));
const excluded = inExcluded || this.ignored.has(p);
if (c.kind === "symlink") {
const t = this.resolve(p);
return {
@@ -195,7 +199,7 @@ export class MemoryFs implements ProjectFs {
} satisfies FileEntry;
})
// Folders first, counting a link to a folder as a folder (the backend's ordering).
.sort((a, b) => Number(isFolder(b)) - Number(isFolder(a)) || collator.compare(a.name, b.name))
.sort((a, b) => Number(isFolder(b)) - Number(isFolder(a)) || naturalOrder.compare(a.name, b.name))
);
}
-19
Переглянути файл
@@ -11,9 +11,6 @@ describe("agent chat settings", () => {
foldTurns: true,
smoothText: true,
fitWindowWidth: false,
playfulStatus: false,
playfulAfterSeconds: 0,
playfulWords: {},
thinking: "auto",
toolCalls: "grouped",
expandToolOutput: false,
@@ -55,20 +52,4 @@ describe("agent chat settings", () => {
});
expect(validateSettings({ agents: { newTaskApprovals: "never" } }).agents.newTaskApprovals).toBe("bypass");
});
it("keeps the user's playful words by activity, an emptied list included", () => {
const stored = validateSettings({
agents: { playfulWords: { reading: ["Squinting…", " ", 3], working: [], editing: "nope" } },
}).agents;
expect(stored.playfulWords).toEqual({ reading: ["Squinting…"], working: [] });
});
it("keeps the playful quiet time in whole seconds within its range", () => {
const after = (v: unknown) => validateSettings({ agents: { playfulAfterSeconds: v } }).agents.playfulAfterSeconds;
expect(after(0)).toBe(0);
expect(after(2.6)).toBe(3);
expect(after(-5)).toBe(0);
expect(after(100_000)).toBe(600);
expect(after("soon")).toBe(0);
});
});
-16
Переглянути файл
@@ -41,7 +41,6 @@ import {
type NotificationsValid,
} from "./behaviorSchema";
import { isThemeChoiceId, type ThemeChoiceId } from "@/platform/themes";
import { PLAYFUL_AFTER_LIMITS } from "@/platform/agentStatus";
/** Agents › IDE MCP Server › Port: its default (`ide-core::settings::DEFAULT_MCP_PORT`) and range. */
export const DEFAULT_MCP_PORT = 26371;
@@ -238,9 +237,6 @@ export const DEFAULT_SETTINGS: ValidSettings = {
foldTurns: true,
smoothText: true,
fitWindowWidth: false,
playfulStatus: false,
playfulAfterSeconds: 0,
playfulWords: {},
thinking: "auto",
toolCalls: "grouped",
expandToolOutput: false,
@@ -291,15 +287,6 @@ function agentDefaults(v: unknown): Record<string, Record<string, string>> {
return Object.fromEntries(Object.entries(obj(v)).map(([agent, options]) => [agent, stringMap(options)]));
}
/** Activity → the user's playful words; a list, even an empty one, stands for that activity. */
function playfulWords(v: unknown): Record<string, string[]> {
return Object.fromEntries(
Object.entries(obj(v))
.filter(([, words]) => Array.isArray(words))
.map(([activity, words]) => [activity, stringList(words)]),
);
}
function agentMcpServers(v: unknown): Required<AgentSettings>["mcpServers"] {
const out: Required<AgentSettings>["mcpServers"] = {};
for (const [name, raw] of Object.entries(obj(v))) {
@@ -453,9 +440,6 @@ export function validateSettings(raw: Settings | unknown): ValidSettings {
foldTurns: bool(agents.foldTurns, d.agents.foldTurns),
smoothText: bool(agents.smoothText, d.agents.smoothText),
fitWindowWidth: bool(agents.fitWindowWidth, d.agents.fitWindowWidth),
playfulStatus: bool(agents.playfulStatus, d.agents.playfulStatus),
playfulAfterSeconds: num(agents.playfulAfterSeconds, d.agents.playfulAfterSeconds, PLAYFUL_AFTER_LIMITS, true),
playfulWords: playfulWords(agents.playfulWords),
thinking: oneOf(agents.thinking, ["auto", "expanded", "collapsed"] as const, d.agents.thinking),
toolCalls: oneOf(agents.toolCalls, ["grouped", "each"] as const, d.agents.toolCalls),
expandToolOutput: bool(agents.expandToolOutput, d.agents.expandToolOutput),
+15 -1
Переглянути файл
@@ -1,7 +1,16 @@
import { tx } from "@/platform/i18n";
import { call, commands } from "@/platform/ipc";
import { useWorkflowSettings } from "@/platform/workflowSettings";
import { EmptyState, IconButton, SplitGroup, SplitHandle, SplitPanel, T, Tabs } from "@/ui";
import {
EmptyState,
IconButton,
SplitGroup,
SplitHandle,
SplitPanel,
T,
Tabs,
useFrozenWhileWindowResizes,
} from "@/ui";
import { copySelectionOnKeyDown } from "@/ui/selectableText";
import { spanStyle } from "@/ui/ansi";
import clsx from "clsx";
@@ -68,6 +77,10 @@ export function GitToolWindow() {
const { shown } = useGitTabs();
const available = useVcs((s) => s.available);
const external = useGitLog((s) => s.logTabs.some((t) => t.id === s.tab && t.readOnly));
// The log's rows, graph and branch tree are too much for WebKit to relayout at every step of a
// window drag; they follow the window once it stops.
const root = useRef<HTMLDivElement>(null);
useFrozenWhileWindowResizes(root);
if (!available && !external)
return (
<EmptyState title="Version control is not configured">
@@ -76,6 +89,7 @@ export function GitToolWindow() {
);
return (
<div
ref={root}
className={styles.root}
role="tabpanel"
id={`openidea-git-panel-${shown}`}
+90 -12
Переглянути файл
@@ -441,32 +441,110 @@
gap: var(--space-2) var(--space-4);
}
/* Interactive rebase dialog. */
.rebaseList {
max-height: 360px;
overflow: auto;
margin: 0 14px;
.rebaseDialog {
height: min(550px, calc(100vh - 48px));
}
.rebasePage {
display: flex;
flex-direction: column;
gap: var(--space-2);
min-height: 0;
height: 100%;
padding: var(--space-2) var(--space-3) var(--space-3);
}
.rebaseSplit {
flex: 1;
border: 1px solid var(--border);
border-radius: var(--radius-small);
}
.rebaseToolbar {
display: flex;
flex: none;
align-items: center;
flex-wrap: wrap;
gap: var(--space-1);
padding: var(--space-1) var(--space-2);
border-bottom: 1px solid var(--border);
}
.rebaseList {
flex: 1;
min-height: 0;
overflow: auto;
padding: var(--space-1);
}
.rebaseRow {
min-height: var(--h-row);
display: flex;
align-items: center;
gap: var(--space-2);
padding: 2px 6px;
white-space: nowrap;
gap: var(--space-1);
padding: var(--space-0-5) var(--space-2);
border-radius: var(--radius-selection);
}
.rebaseRow:hover {
background: var(--bg-hover);
}
.rebaseRow[data-selected] {
background: var(--bg-selected);
}
.rebaseCommit {
display: flex;
flex: 1;
flex-direction: column;
justify-content: center;
gap: var(--space-0-5);
min-width: 0;
min-height: var(--h-row);
padding: var(--space-1) 0;
border-radius: var(--radius-small);
color: var(--fg-strong);
text-align: left;
}
.rebaseCommit:focus-visible {
outline: 1px solid var(--focus-ring);
}
.rebaseSubject {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.rebaseSubject[data-dropped] {
text-decoration: line-through;
}
.rebaseAction {
width: 120px;
flex: none;
width: 112px;
flex: 0 1 112px;
}
.rebaseDetails {
display: flex;
flex: 1;
flex-direction: column;
gap: var(--space-2);
min-width: 0;
min-height: 0;
overflow: auto;
padding: var(--space-3);
}
.rebaseMetadata {
display: flex;
flex-wrap: wrap;
align-items: center;
gap: var(--space-0-5) var(--space-2);
color: var(--fg-subtle);
font-size: var(--fs-small);
overflow-wrap: anywhere;
}
.rebasePreview {
color: var(--fg-strong);
line-height: 1.5;
white-space: pre-wrap;
overflow-wrap: anywhere;
user-select: text;
}
.rebaseMessage {
flex: 1;
min-width: 0;
min-height: 0;
width: 100%;
min-height: calc(4 * var(--h-row));
resize: none;
line-height: 1.5;
}
/* Push dialog: the editable target branch. */
.targetInput {
+106 -48
Переглянути файл
@@ -3,10 +3,10 @@ import { commitRepo } from "./multiRoot";
* Git Log history rewriting: Undo Commit, Edit Commit Message, Drop Commit and
* Interactively Rebase from Here (IDEA's Git.Log.ContextMenu).
*/
import { useState } from "react";
import { useLayoutEffect, useRef, useState } from "react";
import type { BranchInfo, Commit, RebaseAction, RebaseEntry } from "@/bindings";
import { call, commands } from "@/platform/ipc";
import { Dialog, IconButton, Select, T } from "@/ui";
import { Dialog, IconButton, Select, SplitGroup, SplitHandle, SplitPanel, T } from "@/ui";
import { workflowSettings } from "@/platform/workflowSettings";
import { ask, showError } from "@/workbench/messages";
import { chooseTargetChangelist, moveToChangelist } from "./changelistsUi";
@@ -426,6 +426,22 @@ function InteractiveRebaseDialog({
onClose: () => void;
}) {
const [rows, setRows] = useState<RebaseRow[]>(() => initialRows(range.commits));
const [selectedId, setSelectedId] = useState(() => rows[0]?.commit.id);
const pageRef = useRef<HTMLDivElement>(null);
const [stacked, setStacked] = useState(false);
useLayoutEffect(() => {
const page = pageRef.current;
if (!page) return;
const measure = () => setStacked(page.clientWidth < 640);
measure();
if (typeof ResizeObserver === "undefined") return;
const observer = new ResizeObserver(measure);
observer.observe(page);
return () => observer.disconnect();
}, []);
const selectedIndex = rows.findIndex((r) => r.commit.id === selectedId);
const selected = rows[selectedIndex];
const problem = planProblem(rows);
const noop = planIsNoop(rows, range.commits);
const update = (i: number, patch: Partial<RebaseRow>) =>
@@ -440,62 +456,104 @@ function InteractiveRebaseDialog({
open
title={rebaseTitle(range.commits.length, range.base && short(range.base))}
onClose={onClose}
width={720}
footerStart={problem ? <span className={styles.error}>{problem}</span> : undefined}
width={960}
minWidth={360}
minHeight={360}
resizable="both"
className={styles.rebaseDialog}
buttons={[
{ label: "Start Rebasing", role: "default", disabled: !!problem || noop, onClick: start },
{ label: "Cancel", role: "cancel" },
]}
>
<div className={styles.section}>
<T>Commits are applied from top to bottom.</T>
</div>
<div className={styles.rebaseList} role="list" aria-label={tx("Commits to rebase")}>
{rows.map((r, i) => (
<div key={r.commit.id} className={styles.rebaseRow} role="listitem">
<Select<RebaseAction>
value={r.action}
options={ACTIONS}
aria-label={tx`Action for ${short(r.commit.id)}`}
className={styles.rebaseAction}
onChange={(action) => update(i, { action })}
/>
<span className={styles.commitHash}>{r.commit.shortId}</span>
{r.action === "reword" ? (
<textarea
className={`${styles.textarea} ${styles.rebaseMessage}`}
aria-label={`New message for ${short(r.commit.id)}`}
rows={2}
value={r.message}
onChange={(e) => update(i, { message: e.target.value })}
<div className={styles.rebasePage} ref={pageRef}>
<SplitGroup id="rebase-panes" className={styles.rebaseSplit} orientation={stacked ? "vertical" : "horizontal"}>
<SplitPanel id="rebase-plan" defaultSize="50%" minSize="30%">
<div className={styles.rebaseToolbar}>
<IconButton
icon="arrow-up"
size="small"
title="Move Up"
disabled={selectedIndex <= 0}
onClick={() => setRows((rs) => moveRow(rs, selectedIndex, -1))}
/>
) : (
<span
className={styles.commitSubject}
style={r.action === "drop" ? { textDecoration: "line-through" } : undefined}
title={r.commit.message}
>
{r.commit.summary}
<IconButton
icon="arrow-down"
size="small"
title="Move Down"
disabled={selectedIndex < 0 || selectedIndex === rows.length - 1}
onClick={() => setRows((rs) => moveRow(rs, selectedIndex, 1))}
/>
<span className={styles.hint}>
<T>Commits are applied from top to bottom.</T>
</span>
</div>
<div className={styles.rebaseList} role="list" aria-label={tx("Commits to rebase")}>
{rows.map((r, i) => (
<div
key={r.commit.id}
className={styles.rebaseRow}
role="listitem"
data-selected={r.commit.id === selectedId || undefined}
>
<button
type="button"
className={styles.rebaseCommit}
aria-current={r.commit.id === selectedId || undefined}
onClick={() => setSelectedId(r.commit.id)}
title={r.commit.summary}
>
<span className={styles.rebaseSubject} data-dropped={r.action === "drop" || undefined}>
{r.commit.summary}
</span>
<span className={styles.commitHash}>{r.commit.shortId}</span>
</button>
<Select<RebaseAction>
value={r.action}
options={ACTIONS}
aria-label={tx`Action for ${short(r.commit.id)}`}
className={styles.rebaseAction}
onChange={(action) => {
setSelectedId(r.commit.id);
update(i, { action });
}}
/>
</div>
))}
</div>
</SplitPanel>
<SplitHandle aria-label={tx("Resize rebase panes")} />
<SplitPanel id="rebase-details" defaultSize="50%" minSize="30%">
{selected && (
<section className={styles.rebaseDetails} aria-label={tx("Commit details")}>
<div className={styles.rebaseMetadata}>
<span className={styles.commitHash}>{selected.commit.shortId}</span>
<span>{selected.commit.author}</span>
</div>
{selected.action === "reword" ? (
<textarea
key={selected.commit.id}
className={`${styles.textarea} ${styles.rebaseMessage}`}
aria-label={tx`New message for ${short(selected.commit.id)}`}
rows={5}
value={selected.message}
onChange={(e) => update(selectedIndex, { message: e.target.value })}
/>
) : (
<div className={styles.rebasePreview}>
{selected.commit.message.trimEnd() || selected.commit.summary}
</div>
)}
</section>
)}
<IconButton
icon="arrow-up"
size="small"
title="Move Up"
disabled={i === 0}
onClick={() => setRows((rs) => moveRow(rs, i, -1))}
/>
<IconButton
icon="arrow-down"
size="small"
title="Move Down"
disabled={i === rows.length - 1}
onClick={() => setRows((rs) => moveRow(rs, i, 1))}
/>
</SplitPanel>
</SplitGroup>
{problem && (
<div className={styles.error} role="alert">
{tx(problem)}
</div>
))}
)}
</div>
<div style={{ height: 12 }} />
</Dialog>
);
}
-2
Переглянути файл
@@ -1,2 +0,0 @@
/** Settings › Agents › Working Status: seconds the agent may report nothing new before playful words show. */
export const PLAYFUL_AFTER_LIMITS = { min: 0, max: 600 } as const;
+37
Переглянути файл
@@ -0,0 +1,37 @@
import { afterEach, expect, it } from "vitest";
import { isIgnoredName } from "./ignoredNames";
import { useProject } from "./project";
const initial = useProject.getState();
afterEach(() => useProject.setState(initial, true));
function withNames(ignoredNames: string[]) {
useProject.setState({ settings: { files: { ignoredNames } } } as never);
}
it("matches the defaults by exact name and by wildcard", () => {
expect(isIgnoredName(".git")).toBe(true);
expect(isIgnoredName("module.pyc")).toBe(true);
expect(isIgnoredName("notes.txt~")).toBe(true);
expect(isIgnoredName("module.py")).toBe(false);
expect(isIgnoredName("pyc")).toBe(false);
});
it("anchors every wildcard and keeps other pattern characters literal", () => {
withNames(["*.log", "build?", "a+b.(x)"]);
expect(isIgnoredName("server.log")).toBe(true);
expect(isIgnoredName("server.log.1")).toBe(false);
expect(isIgnoredName("build1")).toBe(true);
expect(isIgnoredName("build12")).toBe(false);
expect(isIgnoredName("a+b.(x)")).toBe(true);
expect(isIgnoredName("aab.x")).toBe(false);
});
it("follows the setting when it changes, and ignores entries with a path", () => {
withNames(["dist", "out/*"]);
expect(isIgnoredName("dist")).toBe(true);
expect(isIgnoredName(".git")).toBe(false);
expect(isIgnoredName("out")).toBe(false);
withNames([]);
expect(isIgnoredName("dist")).toBe(false);
});
+18 -6
Переглянути файл
@@ -23,28 +23,40 @@ export const DEFAULT_IGNORED_NAMES: readonly string[] = [
"desktop.ini",
];
let cached: { names: readonly string[]; exact: Set<string>; wildcards: RegExp[] } | null = null;
interface Compiled {
names: readonly string[];
exact: Set<string>;
suffixes: string[];
wildcards: RegExp | null;
}
function compile(names: readonly string[]) {
let cached: Compiled | null = null;
function compile(names: readonly string[]): Compiled {
const exact = new Set<string>();
const wildcards: RegExp[] = [];
const suffixes: string[] = [];
const patterns: string[] = [];
for (const raw of names) {
const n = raw.trim();
if (!n || n.includes("/")) continue;
if (!/[*?]/.test(n)) exact.add(n);
// `*.pyc` (every default pattern): a suffix test, without a regex that retries `.*` at each position.
else if (/^\*[^*?]+$/.test(n)) suffixes.push(n.slice(1));
else {
const body = n
.replace(/[.+^${}()|[\]\\]/g, "\\$&")
.replace(/\*/g, ".*")
.replace(/\?/g, ".");
wildcards.push(new RegExp(`^${body}$`, "s"));
patterns.push(body);
}
}
return { names, exact, wildcards };
// One alternation: a folder of thousands of entries tests each name once, not once per pattern.
const wildcards = patterns.length ? new RegExp(`^(?:${patterns.join("|")})$`, "s") : null;
return { names, exact, suffixes, wildcards };
}
export function isIgnoredName(name: string): boolean {
const names = useProject.getState().settings?.files?.ignoredNames ?? DEFAULT_IGNORED_NAMES;
const m = cached?.names === names ? cached : (cached = compile(names));
return m.exact.has(name) || m.wildcards.some((re) => re.test(name));
return m.exact.has(name) || m.suffixes.some((s) => name.endsWith(s)) || !!m.wildcards?.test(name);
}
+3 -60
Переглянути файл
@@ -1989,30 +1989,6 @@
"Previous Failed Test": "Previous Failed Test",
"Next Failed Test": "Next Failed Test",
"Run '{name}' with Fuzzing": "Run '{name}' with Fuzzing",
"Untangling imports…": "Untangling imports…",
"Counting brackets…": "Counting brackets…",
"Herding semicolons…": "Herding semicolons…",
"Explaining it to the rubber duck…": "Explaining it to the rubber duck…",
"Negotiating with the borrow checker…": "Negotiating with the borrow checker…",
"Chasing a null pointer…": "Chasing a null pointer…",
"Bisecting the problem…": "Bisecting the problem…",
"Reading the fine manual…": "Reading the fine manual…",
"Refactoring a hunch…": "Refactoring a hunch…",
"Grepping the void…": "Grepping the void…",
"Garbage-collecting thoughts…": "Garbage-collecting thoughts…",
"Rebasing onto reality…": "Rebasing onto reality…",
"Compiling a plan…": "Compiling a plan…",
"Walking the call stack…": "Walking the call stack…",
"Warming up the compiler…": "Warming up the compiler…",
"Settling tabs versus spaces…": "Settling tabs versus spaces…",
"Caching an insight…": "Caching an insight…",
"Following the breadcrumbs…": "Following the breadcrumbs…",
"Squinting at the diff…": "Squinting at the diff…",
"Asking the linter nicely…": "Asking the linter nicely…",
"Measuring twice…": "Measuring twice…",
"Sharpening the pencils…": "Sharpening the pencils…",
"Naming things…": "Naming things…",
"Invalidating a cache…": "Invalidating a cache…",
"Reading…": "Reading…",
"Editing…": "Editing…",
"Deleting…": "Deleting…",
@@ -2022,42 +1998,6 @@
"Thinking…": "Thinking…",
"Writing…": "Writing…",
"Running a subagent…": "Running a subagent…",
"Playful words while the agent works": "Playful words while the agent works",
"Choosing words carefully…": "Choosing words carefully…",
"Polishing the prose…": "Polishing the prose…",
"Drafting, redrafting…": "Drafting, redrafting…",
"Reading between the lines…": "Reading between the lines…",
"Skimming the source…": "Skimming the source…",
"Nudging a semicolon…": "Nudging a semicolon…",
"Moving code around gently…": "Moving code around gently…",
"Tidying up…": "Tidying up…",
"Taking out the trash…": "Taking out the trash…",
"Pruning dead code…": "Pruning dead code…",
"Saying goodbye…": "Saying goodbye…",
"Rearranging the furniture…": "Rearranging the furniture…",
"Packing boxes…": "Packing boxes…",
"Finding a better home…": "Finding a better home…",
"Looking under the couch…": "Looking under the couch…",
"Searching high and low…": "Searching high and low…",
"Pressing Enter with confidence…": "Pressing Enter with confidence…",
"Watching the logs scroll…": "Watching the logs scroll…",
"Waiting on the shell…": "Waiting on the shell…",
"Waiting on the network…": "Waiting on the network…",
"Downloading the internet…": "Downloading the internet…",
"Following links…": "Following links…",
"Delegating…": "Delegating…",
"Consulting a colleague…": "Consulting a colleague…",
"Calling in reinforcements…": "Calling in reinforcements…",
"Holding a quick stand-up…": "Holding a quick stand-up…",
"Working Status": "Working Status",
"While the agent works, the line under the conversation says what it is doing. With playful words on, words for what it does take turns there instead, from the start or once it reports nothing new for a while; screen readers still hear the plain status.": "While the agent works, the line under the conversation says what it is doing. With playful words on, words for what it does take turns there instead, from the start or once it reports nothing new for a while; screen readers still hear the plain status.",
"Start after the agent reports nothing new for": "Start after the agent reports nothing new for",
"While the status says": "While the status says",
"Playful words": "Playful words",
"No playful words: the status stays factual": "No playful words: the status stays factual",
"e.g. Reticulating splines…": "e.g. Reticulating splines…",
"New playful word": "New playful word",
"Restore Built-in Words": "Restore Built-in Words",
"None — type the Engine API URL below": "None — type the Engine API URL below",
"Open in Right Split": "Open in Right Split",
"Enable staging area": "Enable staging area",
@@ -2570,6 +2510,7 @@
"Load Maven Project": "Load Maven Project",
"Skip": "Skip",
"Resize Markdown preview": "Resize Markdown preview",
"Resize plugin panes": "Resize plugin panes",
"Run a Python script or module": "Run a Python script or module",
"Replace every occurrence of '{pattern}' with '{replacement}' in the scope? The search hit its limit, so it runs again to find the occurrences not listed.": "Replace every occurrence of '{pattern}' with '{replacement}' in the scope? The search hit its limit, so it runs again to find the occurrences not listed.",
"Server default": "Server default",
@@ -2753,6 +2694,8 @@
"Cannot move a folder into itself": "Cannot move a folder into itself",
"Already in this directory": "Already in this directory",
"Resize left merge pane": "Resize left merge pane",
"Resize rebase panes": "Resize rebase panes",
"New message for {id}": "New message for {id}",
"Resize right merge pane": "Resize right merge pane",
"Database and schema": "Database and schema",
"Loading…": "Loading…",
+3 -60
Переглянути файл
@@ -5050,6 +5050,7 @@
"Drop {count} commits from the current branch? Their changes are removed.": "是否从当前分支丢弃 {count} 个提交?它们的更改将被移除。",
"Drop commit {id} “{summary}” from the current branch? Its changes are removed.": "是否从当前分支丢弃提交 {id}“{summary}”?其更改将被移除。",
"Action for {id}": "{id} 的操作",
"New message for {id}": "{id} 的新提交消息",
"Rebasing {n} commit onto {onto}": "正在将 {n} 个提交变基到 {onto}",
"Rebasing {n} commits onto {onto}": "正在将 {n} 个提交变基到 {onto}",
"Rebasing {n} commit from the root": "正在从根变基 {n} 个提交",
@@ -8395,56 +8396,6 @@
"Previous Failed Test": "上一个失败的测试",
"Next Failed Test": "下一个失败的测试",
"Run '{name}' with Fuzzing": "使用模糊测试运行 '{name}'",
"Untangling imports…": "正在理顺 import…",
"Counting brackets…": "正在数括号…",
"Herding semicolons…": "正在清点分号…",
"Explaining it to the rubber duck…": "正在讲给小黄鸭听…",
"Negotiating with the borrow checker…": "正在和借用检查器讲道理…",
"Chasing a null pointer…": "正在追捕空指针…",
"Bisecting the problem…": "正在二分排查…",
"Reading the fine manual…": "正在认真读文档…",
"Refactoring a hunch…": "正在重构一个直觉…",
"Grepping the void…": "正在 grep 虚空…",
"Garbage-collecting thoughts…": "正在回收思绪…",
"Rebasing onto reality…": "正在变基到现实…",
"Compiling a plan…": "正在编译计划…",
"Walking the call stack…": "正在顺着调用栈往上爬…",
"Warming up the compiler…": "正在预热编译器…",
"Settling tabs versus spaces…": "正在调停 Tab 与空格之争…",
"Caching an insight…": "正在缓存灵感…",
"Following the breadcrumbs…": "正在顺藤摸瓜…",
"Squinting at the diff…": "正在眯眼看 diff…",
"Asking the linter nicely…": "正在好言相劝 linter…",
"Measuring twice…": "正在三思而后行…",
"Sharpening the pencils…": "正在削铅笔…",
"Naming things…": "正在给变量起名…",
"Invalidating a cache…": "正在让缓存失效…",
"Choosing words carefully…": "正在斟酌用词…",
"Polishing the prose…": "正在润色文字…",
"Drafting, redrafting…": "正在打草稿,再打草稿…",
"Reading between the lines…": "正在读出言外之意…",
"Skimming the source…": "正在速读源码…",
"Nudging a semicolon…": "正在挪动一个分号…",
"Moving code around gently…": "正在轻轻挪动代码…",
"Tidying up…": "正在收拾…",
"Taking out the trash…": "正在倒垃圾…",
"Pruning dead code…": "正在修剪死代码…",
"Saying goodbye…": "正在挥手告别…",
"Rearranging the furniture…": "正在重新摆放家具…",
"Packing boxes…": "正在打包纸箱…",
"Finding a better home…": "正在找个更好的家…",
"Looking under the couch…": "正在沙发底下找…",
"Searching high and low…": "正在上天入地地找…",
"Pressing Enter with confidence…": "正在自信地按下回车…",
"Watching the logs scroll…": "正在看日志滚动…",
"Waiting on the shell…": "正在等 shell 回话…",
"Waiting on the network…": "正在等网络…",
"Downloading the internet…": "正在下载整个互联网…",
"Following links…": "正在顺着链接走…",
"Delegating…": "正在分派任务…",
"Consulting a colleague…": "正在请教同事…",
"Calling in reinforcements…": "正在呼叫增援…",
"Holding a quick stand-up…": "正在开个简短站会…",
"Reading…": "正在读取…",
"Editing…": "正在编辑…",
"Deleting…": "正在删除…",
@@ -8454,16 +8405,6 @@
"Thinking…": "正在思考…",
"Writing…": "正在输出…",
"Running a subagent…": "子 agent 正在运行…",
"Playful words while the agent works": "agent 工作时显示趣味文字",
"Working Status": "工作状态",
"While the agent works, the line under the conversation says what it is doing. With playful words on, words for what it does take turns there instead, from the start or once it reports nothing new for a while; screen readers still hear the plain status.": "agent 工作时,对话下方的状态行显示它正在做什么。开启趣味文字后,这里会改为轮换显示与当前工作相关的趣味文字,可以从一开始就显示,也可以在它一段时间没有新进展后才显示;屏幕阅读器读出的仍是实际状态。",
"Start after the agent reports nothing new for": "在 agent 无新进展超过",
"While the status says": "当状态为",
"Playful words": "趣味文字",
"No playful words: the status stays factual": "没有趣味文字:状态只显示实际进展",
"e.g. Reticulating splines…": "例如:正在网格化样条曲线…",
"New playful word": "新的趣味文字",
"Restore Built-in Words": "恢复内置文字",
"None — type the Engine API URL below": "无(在下方输入 Engine API URL)",
"Open in Right Split": "在右侧拆分中打开",
"Enable staging area": "启用暂存区",
@@ -8949,6 +8890,7 @@
"This Maven project is not loaded": "此 Maven 项目尚未加载",
"Load Maven Project": "加载 Maven 项目",
"Resize Markdown preview": "调整 Markdown 预览宽度",
"Resize plugin panes": "调整插件列表与详情区域大小",
"Server default": "服务器默认值",
"New Database": "新建数据库",
"Owner:": "所有者:",
@@ -9122,6 +9064,7 @@
"Cannot move a folder into itself": "不能将文件夹移动到自身目录中",
"Already in this directory": "已在此目录中",
"Resize left merge pane": "调整左侧合并窗格宽度",
"Resize rebase panes": "调整变基计划和详细信息窗格大小",
"Resize right merge pane": "调整右侧合并窗格宽度",
"Database and schema": "数据库和 schema",
"Shelve Silently": "静默搁置",
+55
Переглянути файл
@@ -0,0 +1,55 @@
// @vitest-environment node
/**
* Selectors that make Chromium restyle whole subtrees on unrelated DOM changes. Blink checks a
* selector whose last part is universal (`*`, or only pseudo-classes) against every element, so:
*
* - `x > * + *` / `x ~ *` flags every parent as having children styled by their siblings, and any
* insertion then restyles the next sibling's whole subtree (an editor scroll inserts lines and
* gutters every frame);
* - `:focus *` / `:hover ::selection` makes every focus or hover change restyle the subtree of the
* element it happens on, wherever that element is;
* - `x:not(:focus-within) .y` makes WebKit restyle the whole window on every focus change (write the
* default style for `x .y` and override it with `x:focus-within .y`).
*
* Name the element instead (`x > :not(:first-child)`, `x > .item + .item`, `x:focus .label`).
*/
import { readdirSync, readFileSync } from "node:fs";
import { join, resolve } from "node:path";
import { expect, it } from "vitest";
const SRC = resolve(import.meta.dirname, "..");
function stylesheets(dir: string): string[] {
return readdirSync(dir, { withFileTypes: true }).flatMap((e) => {
const path = join(dir, e.name);
if (e.isDirectory()) return stylesheets(path);
return e.name.endsWith(".css") ? [path] : [];
});
}
/** A compound selector with no type, class, id or attribute: `*`, `:not(…)`, `::selection`. */
const UNIVERSAL = String.raw`(?:\*|(?=:))(?::{1,2}[\w-]+(?:\([^)]*\))?)*`;
const SIBLING = new RegExp(String.raw`[+~]\s*${UNIVERSAL}\s*$`);
const STATE_DESCENDANT = new RegExp(
String.raw`:(?:focus|focus-within|focus-visible|hover|active)[^\s>+~]*[\s>]+${UNIVERSAL}\s*$`,
);
const NEGATED_STATE = /:not\(:(?:focus|focus-within|focus-visible|hover|active)\)[^\s>+~]*[\s>+~]/;
it("no selector restyles whole subtrees on sibling insertions or focus changes", () => {
const costly: string[] = [];
for (const path of stylesheets(SRC)) {
const css = readFileSync(path, "utf8").replace(/\/\*[\s\S]*?\*\//g, "");
for (const prelude of css.matchAll(/([^{};]+)\{/g)) {
const text = prelude[1]!.trim();
if (text.startsWith("@")) continue;
for (const selector of text.split(/,(?![^(]*\))/)) {
const s = selector.trim().replace(/:global\(([^)]*)\)/g, "$1");
// Combinators inside `:has(…)` relate other elements, not this one's ancestors.
const outer = s.replace(/:has\((?:[^()]|\([^()]*\))*\)/g, "");
if (SIBLING.test(s) || STATE_DESCENDANT.test(s) || NEGATED_STATE.test(outer))
costly.push(`${path.slice(SRC.length + 1)}: ${s}`);
}
}
}
expect(costly).toEqual([]);
});
+6 -2
Переглянути файл
@@ -58,10 +58,14 @@
.active:hover {
background: var(--bg-tree-selected);
}
/* A focusable list that lost focus shows the inactive selection, like IDEA's JList. */
.list[tabindex="0"]:not(:focus-within) .active {
/* A focusable list shows the inactive selection until it holds focus. Not `:not(:focus-within)`:
WebKit then restyles the whole window on every focus change. */
.list[tabindex="0"] .active {
background: var(--bg-tree-selected-inactive);
}
.list[tabindex="0"]:focus-within .active {
background: var(--bg-tree-selected);
}
.section {
padding: 0 8px;
color: var(--fg-muted);
+16 -1
Переглянути файл
@@ -2,11 +2,26 @@
import { iconMarkupOrFallback, type IconName } from "./icons";
import spinnerStyles from "./Spinner.module.css";
/** Parsed markup, cloned into each node: widgets rebuild the same few icons on every render. */
const parsed = new Map<string, HTMLElement>();
export function iconNode(name: IconName | (string & {}), size = 16, className?: string): HTMLElement {
const span = document.createElement("span");
span.className = className ? `cm-openidea-icon ${className}` : "cm-openidea-icon";
span.setAttribute("aria-hidden", "true");
span.innerHTML = iconMarkupOrFallback(name, size);
const markup = iconMarkupOrFallback(name, size);
// Markup with ids is unique to this node (ids are never shared): nothing to reuse.
if (markup.includes('id="')) {
span.innerHTML = markup;
return span;
}
let source = parsed.get(markup);
if (!source) {
source = document.createElement("span");
source.innerHTML = markup;
parsed.set(markup, source);
}
span.append(...Array.from(source.childNodes, (n) => n.cloneNode(true)));
return span;
}
+21 -2
Переглянути файл
@@ -21,7 +21,7 @@
* - Element ids (clip paths) are made unique per instance: WebKit can't resolve
* references into `display: none` subtrees, so ids must never be shared.
*/
import { useId, useMemo, type CSSProperties } from "react";
import { useId, useLayoutEffect, useMemo, useRef, type CSSProperties } from "react";
import clsx from "clsx";
import { create } from "zustand";
import styles from "./icons.module.css";
@@ -839,6 +839,20 @@ const EMPTY: Prepared = { viewBox: "0 0 16 16", html: "", hasIds: false, mono: t
const withIds = (p: Prepared, prefix: string) => (p.hasIds ? p.html.replace(/__ID__/g, prefix) : p.html);
/** Parsed markup by source, cloned into each icon: a tree or list mounts dozens of the same icon
* per frame, and parsing `innerHTML` for each one costs more than the rest of the row. */
const parsed = new Map<string, SVGSVGElement>();
function fillIcon(svg: SVGSVGElement, html: string, shared: boolean) {
let source = shared ? parsed.get(html) : undefined;
if (!source) {
source = document.createElementNS("http://www.w3.org/2000/svg", "svg");
source.innerHTML = html;
if (shared) parsed.set(html, source);
}
svg.replaceChildren(...Array.from(source.childNodes, (n) => n.cloneNode(true)));
}
// ---------------------------------------------------------------------------
/** Largest `data:` image accepted as an icon (an avatar or a status badge a plugin fetched). */
@@ -887,11 +901,17 @@ function SvgIcon({ name, size = 16, className, style, label }: IconProps) {
const path = iconPath(name);
const p = (path && prepare(path, size >= 18)) || prepare(ICONS.file, size >= 18) || EMPTY;
const html = useMemo(() => withIds(p, `i${uid.replace(/[^a-zA-Z0-9_-]/g, "")}-`), [p, uid]);
const ref = useRef<SVGSVGElement>(null);
useLayoutEffect(() => {
// Markup with per-instance ids is unique to this icon: nothing to share.
if (ref.current) fillIcon(ref.current, html, !p.hasIds);
}, [html, p.hasIds]);
if (!path && name.startsWith("symbol-")) {
return <SymbolBadge kind={name.slice(7)} className={className} style={style} />;
}
return (
<svg
ref={ref}
className={clsx(styles.icon, p.mono && styles.mono, className)}
style={style}
width={size}
@@ -902,7 +922,6 @@ function SvgIcon({ name, size = 16, className, style, label }: IconProps) {
role={label ? "img" : undefined}
aria-label={label}
focusable="false"
dangerouslySetInnerHTML={{ __html: html }}
/>
);
}
+1
Переглянути файл
@@ -42,6 +42,7 @@ export { selectableText, copyMenuFor, copyText } from "./selectableText";
export { selectReadingPane, useSelectionBoundary } from "./useSelectionBoundary";
export { lockDragCursor, type DragCursor } from "./dragCursor";
export { useSanitizedField } from "./useSanitizedField";
export { useFrozenWhileWindowResizes } from "./useFrozenWhileWindowResizes";
export * from "./rowSelection";
export * from "./LogPane";
export * from "./Chip";
+52
Переглянути файл
@@ -0,0 +1,52 @@
import { act, render } from "@testing-library/react";
import { useRef } from "react";
import { afterEach, beforeEach, expect, it, vi } from "vitest";
import { WINDOW_RESIZE_SETTLE_MS, useFrozenWhileWindowResizes } from "./useFrozenWhileWindowResizes";
function Frozen() {
const ref = useRef<HTMLDivElement>(null);
useFrozenWhileWindowResizes(ref);
return (
<div data-testid="parent">
<div ref={ref} data-testid="view" />
</div>
);
}
beforeEach(() => vi.useFakeTimers());
afterEach(() => vi.useRealTimers());
it("keeps the view at its size while the window resizes and releases it once the drag pauses", () => {
const { getByTestId } = render(<Frozen />);
const view = getByTestId("view");
const parent = getByTestId("parent");
view.getBoundingClientRect = () => ({ width: 300, height: 120 }) as DOMRect;
act(() => void window.dispatchEvent(new Event("resize")));
expect(view.style.width).toBe("300px");
expect(view.style.height).toBe("120px");
expect(view.style.flexGrow).toBe("0");
expect(parent.style.overflow).toBe("hidden");
// Still dragging: the size taken at the start stays.
view.getBoundingClientRect = () => ({ width: 200, height: 80 }) as DOMRect;
act(() => vi.advanceTimersByTime(WINDOW_RESIZE_SETTLE_MS - 1));
act(() => void window.dispatchEvent(new Event("resize")));
act(() => vi.advanceTimersByTime(WINDOW_RESIZE_SETTLE_MS - 1));
expect(view.style.width).toBe("300px");
act(() => vi.advanceTimersByTime(1));
expect(view.style.width).toBe("");
expect(view.style.height).toBe("");
expect(view.style.flex).toBe("");
expect(parent.style.overflow).toBe("");
});
it("releases the view when it unmounts mid-drag", () => {
const { getByTestId, unmount } = render(<Frozen />);
const parent = getByTestId("parent");
act(() => void window.dispatchEvent(new Event("resize")));
expect(parent.style.overflow).toBe("hidden");
unmount();
expect(parent.style.overflow).toBe("");
});
+45
Переглянути файл
@@ -0,0 +1,45 @@
import { useEffect, type RefObject } from "react";
/** How long the window must keep its size before a frozen element follows it. */
export const WINDOW_RESIZE_SETTLE_MS = 150;
/**
* While the window is being resized, keeps the element at the size it had when the drag started,
* on its own layer and clipped by its parent, then lets it take the new size once the drag pauses.
* For dense views that WebKit cannot lay out and paint at every step of a live resize: their pixels
* are moved instead of redrawn, so the rest of the window keeps up with the pointer.
*/
export function useFrozenWhileWindowResizes(ref: RefObject<HTMLElement | null>): void {
useEffect(() => {
let frozen: { el: HTMLElement; parent: HTMLElement | null; parentOverflow: string } | null = null;
let timer: ReturnType<typeof setTimeout> | undefined;
const release = () => {
clearTimeout(timer);
if (!frozen) return;
const { el, parent, parentOverflow } = frozen;
for (const p of ["width", "height", "flex", "will-change"]) el.style.removeProperty(p);
if (parent) parent.style.overflow = parentOverflow;
frozen = null;
};
const onResize = () => {
const el = ref.current;
if (!frozen && el?.isConnected) {
const { width, height } = el.getBoundingClientRect();
const parent = el.parentElement;
frozen = { el, parent, parentOverflow: parent?.style.overflow ?? "" };
el.style.setProperty("width", `${width}px`, "important");
el.style.setProperty("height", `${height}px`, "important");
el.style.setProperty("flex", "none", "important");
el.style.setProperty("will-change", "transform");
if (parent) parent.style.overflow = "hidden";
}
clearTimeout(timer);
timer = setTimeout(release, WINDOW_RESIZE_SETTLE_MS);
};
window.addEventListener("resize", onResize);
return () => {
window.removeEventListener("resize", onResize);
release();
};
}, [ref]);
}
+16 -1
Переглянути файл
@@ -58,8 +58,23 @@ export function mountWindowRoot(View: ComponentType, { prefetchLazy = false }: {
function App() {
useEffect(() => {
hideSplash();
if (!prefetchLazy) return;
// The first file opened would otherwise also build the editor setup cold.
const warm = () => {
if (!document.querySelector(".cm-editor"))
void import("./editor/core/cm/prewarm").then((m) => m.prewarmEditor());
};
const idle =
typeof requestIdleCallback === "function"
? requestIdleCallback(warm, { timeout: 2000 })
: window.setTimeout(warm, 500);
// Views split out of the start-up bundle load in the background once the UI is up.
if (prefetchLazy) return prefetchLazyComponents();
const stopPrefetch = prefetchLazyComponents();
return () => {
if (typeof cancelIdleCallback === "function") cancelIdleCallback(idle);
else window.clearTimeout(idle);
stopPrefetch();
};
}, []);
return <View />;
}