Compare commits

...
Author SHA1 Message Date
l0ng-ai 8ce770d8c0 fix(debugger): lay out inline evaluation and history together 2026-11-22 20:24:03 +08:00
13 changed files with 182 additions and 21 deletions

No files matched your search

+83
View File
@@ -200,3 +200,86 @@ test("Evaluate keeps a multiline expression and its result visible in a short di
await expect(field).toHaveValue(expression);
await expect(field).toBeFocused();
});
test("Variables keeps evaluation, watches and expression history together in a narrow dock", async ({
workbench: page,
}) => {
await page.setViewportSize({ width: 720, height: 620 });
await stubDesktop(page);
await page.evaluate(async (session) => {
const handlers = window.__ipc.handlers;
handlers.debug_capabilities = () => ({});
handlers.debug_completions = () => [];
handlers.debug_scopes = () => [];
handlers.debug_evaluate_in = () => ({
name: "result",
value: "42",
typeName: "int",
variablesReference: 0,
evaluateName: null,
});
const statePath = "/src/features/debugger/state.ts";
const historyPath = "/src/features/debugger/ui/expressionHistory.ts";
const projectPath = "/src/platform/project.ts";
const servicesPath = "/src/workbench/contributions.ts";
const layoutPath = "/src/workbench/toolwindows/store.ts";
const { adoptSession } = await import(/* @vite-ignore */ statePath);
const { pushHistory } = await import(/* @vite-ignore */ historyPath);
const { useProject } = await import(/* @vite-ignore */ projectPath);
const { toolWindowService } = await import(/* @vite-ignore */ servicesPath);
const { moveToolWindow, setToolWindowSize } = await import(/* @vite-ignore */ layoutPath);
const settings = useProject.getState().settings;
useProject.setState({
settings: { ...settings, editor: { ...settings?.editor, fontFamily: "Consolas", fontSize: 18 } },
});
pushHistory("evaluate", "order.total + tax");
pushHistory("evaluate", "if ready:\n settle()");
adoptSession(session, { name: "Checkout", adapter: "debugpy", status: "paused", selectedFrame: 11 });
moveToolWindow("debug", "right");
setToolWindowSize("right", 285);
toolWindowService().show("debug", true);
}, SESSION);
const debug = page.getByRole("region", { name: "Debug", exact: true });
const variables = debug.getByRole("tab", { name: "Variables", exact: true });
if (await variables.isVisible()) await variables.click();
const field = debug.getByRole("textbox", { name: "Evaluate expression", exact: true });
const historyButton = debug.getByRole("button", { name: "History", exact: true });
const watch = debug.getByRole("button", { name: "Add to Watches", exact: true });
await expect(field).toBeVisible();
await expect(historyButton).toBeVisible();
await expect(field).toHaveAttribute("placeholder", "Evaluate expression");
await expect(field).toHaveCSS("font-family", /^"?Consolas"?,/);
await expect(field).toHaveCSS("font-size", "13px");
expect((await field.boundingBox())!.width).toBeGreaterThan(100);
expect((await watch.boundingBox())!.x).toBeLessThan((await historyButton.boundingBox())!.x);
await historyButton.click();
const menu = page.getByRole("menu", { name: "Expression history", exact: true });
await expect(menu.getByRole("menuitem")).toHaveText(["order.total + tax"]);
const row = (await field.locator("..").boundingBox())!;
const popup = (await menu.locator("..").boundingBox())!;
expect(popup.x).toBeCloseTo(row.x, 0);
expect(popup.width).toBeCloseTo(row.width, 0);
await page.keyboard.press("Escape");
await expect(menu).toBeHidden();
await expect(historyButton).toBeFocused();
await historyButton.press("Enter");
await menu.getByRole("menuitem", { name: "order.total + tax" }).press("Enter");
await expect(field).toBeFocused();
await expect(field).toHaveValue("order.total + tax");
await field.press("Enter");
await expect
.poll(() => ipcCalls(page, "debug_evaluate_in"))
.toContainEqual(expect.objectContaining({ expression: "order.total + tax", context: "repl" }));
await field.fill("order.total");
await watch.click();
await expect(field).toHaveValue("");
await expect
.poll(() => ipcCalls(page, "debug_evaluate_in"))
.toContainEqual(expect.objectContaining({ expression: "order.total", context: "watch" }));
await historyButton.click();
await expect(menu.getByRole("menuitem")).toHaveText(["order.total", "order.total + tax"]);
});
@@ -293,7 +293,7 @@ describe("debug tool window", () => {
expect(screen.getByRole("tab", { name: "Threads & Variables" })).toBeTruthy();
expect(screen.getByRole("tab", { name: "Console" })).toBeTruthy();
expect(screen.getByRole("option", { selected: true })).toHaveTextContent("main:12, main.py");
expect(screen.getByPlaceholderText("Evaluate expression (↩) or add a watch (⇧⌘↩)")).toBeTruthy();
expect(screen.getByRole("textbox", { name: "Evaluate expression" })).toBeTruthy();
expect(await screen.findByText("{int}")).toBeTruthy();
expect(screen.getByText("'hi'")).toBeTruthy();
// A multi-line rendering stays on its row.
@@ -210,14 +210,28 @@
}
.evalField {
height: 30px;
min-height: var(--h-field);
flex: none;
display: flex;
align-items: center;
gap: var(--space-1);
padding: 0 4px 0 12px;
padding: var(--space-0-5) var(--space-1) var(--space-0-5) var(--space-2);
background: var(--bg-input);
border-bottom: 1px solid var(--border);
}
.evalField:focus-within {
box-shadow: inset 0 -1px var(--focus-ring);
}
.evalField > button {
flex: none;
}
.evalField .evalInput {
padding: 0;
}
.evalHistory {
padding-block: var(--space-1);
overflow-x: hidden;
}
.repl {
height: 28px;
+81 -10
View File
@@ -3,6 +3,10 @@ import { writeClipboardText } from "@/platform/clipboard";
import { useEffect, useLayoutEffect, useMemo, useRef, useState, type KeyboardEvent, type ReactNode } from "react";
import clsx from "clsx";
import { executeAction } from "@/platform/actions";
import { editorPrefs } from "@/platform/editorSettings";
import { monoFontFamily } from "@/platform/fonts";
import { isImeKey } from "@/platform/ime";
import { formatBinding, hostBinding } from "@/platform/keymap";
import { basename, useProject } from "@/platform/project";
import { call, commands, isTauri, type Scope, type Variable } from "@/platform/ipc";
import {
@@ -11,6 +15,8 @@ import {
IconButton,
Kbd,
Menu,
MenuList,
Popup,
Select,
SplitGroup,
SplitHandle,
@@ -54,6 +60,7 @@ import { MemoryView } from "../memory/MemoryView";
import { DebugConsole } from "./DebugConsole";
import { VariablesView, type VarRoot } from "./VariablesView";
import { useExpressionCompletion } from "./ExpressionCompletion";
import { pushHistory, readHistory } from "./expressionHistory";
import { sortVariables } from "../values";
import { workflowSettings } from "@/platform/workflowSettings";
import { useToolWindowShown } from "@/workbench/contributions";
@@ -555,9 +562,12 @@ function VariablesPane({ session }: { session: DebugSession }) {
const watches = useDebug((s) => s.watches);
const stopSeq = useDebug((s) => s.stopSeq);
const variablesEpoch = useDebug((s) => s.variablesEpoch);
const settings = useProject((s) => s.settings);
const [expression, setExpression] = useState("");
const evalField = useRef<HTMLInputElement>(null);
const evalRow = useRef<HTMLDivElement>(null);
const completion = useExpressionCompletion(evalField, expression, setExpression, session);
const [history, setHistory] = useState<{ sessionId: number; stopSeq: number; entries: string[] } | null>(null);
const [lastEval, setLastEval] = useState<EvalRow | null>(null);
const [scopeData, setScopeData] = useState<{ frame: number | null; scopes: Scope[]; locals: Variable[] }>({
frame: null,
@@ -570,6 +580,8 @@ function VariablesPane({ session }: { session: DebugSession }) {
rows: [],
});
const frame = session.status === "paused" ? session.selectedFrame : null;
const historyOpen = frame != null && history?.sessionId === session.id && history.stopSeq === stopSeq;
const editor = settings?.editor;
const live = liveWatchesApply(session);
// A hidden tool window stays mounted: its watches must not go on running in the page.
const liveWatches = useLiveWatches(session, watches, useToolWindowShown());
@@ -676,6 +688,7 @@ function VariablesPane({ session }: { session: DebugSession }) {
const run = async () => {
const e = expression.trim();
if (!e) return;
pushHistory("evaluate", e);
try {
setLastEval({
expression: e,
@@ -687,12 +700,32 @@ function VariablesPane({ session }: { session: DebugSession }) {
}
};
const addExpressionWatch = () => {
const e = expression.trim();
if (!e) return;
pushHistory("evaluate", e);
addWatch(e);
setExpression("");
};
const recall = (text: string) => {
setExpression(text);
requestAnimationFrame(() => {
evalField.current?.focus();
evalField.current?.setSelectionRange(text.length, text.length);
});
};
return (
<div className={styles.variables}>
<div className={styles.evalField}>
<div ref={evalRow} className={styles.evalField}>
<input
ref={evalField}
className={styles.evalInput}
style={{
fontFamily: monoFontFamily(editor?.fontFamily, editorPrefs(settings).fallbackFont, "var(--font-mono)"),
fontSize: editor?.fontSize ? `min(var(--fs-ui), ${editor.fontSize}px)` : undefined,
}}
value={expression}
onChange={(e) => {
setExpression(e.target.value);
@@ -700,17 +733,16 @@ function VariablesPane({ session }: { session: DebugSession }) {
}}
onBlur={completion.close}
onKeyDown={(e) => {
if (completion.onKeyDown(e)) return;
if (isImeKey(e.nativeEvent) || completion.onKeyDown(e)) return;
if (e.key === "Enter" && (e.metaKey || e.ctrlKey) && e.shiftKey) {
e.preventDefault();
addWatch(expression);
setExpression("");
addExpressionWatch();
} else if (e.key === "Enter") {
e.preventDefault();
void run();
}
}}
placeholder={frame != null ? "Evaluate expression (↩) or add a watch (⇧⌘↩)" : "Evaluate expression"}
placeholder={tx("Evaluate expression")}
aria-label={tx("Evaluate expression")}
spellCheck={false}
autoComplete="off"
@@ -720,16 +752,55 @@ function VariablesPane({ session }: { session: DebugSession }) {
<IconButton
icon="plus"
title="Add to Watches"
shortcut="⇧⌘↩"
shortcut={formatBinding(hostBinding("Meta+Shift+Enter"))}
size="small"
iconSize={16}
disabled={!expression.trim()}
onClick={() => {
addWatch(expression);
setExpression("");
}}
onClick={addExpressionWatch}
/>
<IconButton
icon="chevron-down"
title="History"
size="small"
aria-haspopup="menu"
aria-expanded={historyOpen}
disabled={frame == null}
onClick={() =>
setHistory(
historyOpen
? null
: {
sessionId: session.id,
stopSeq,
entries: readHistory("evaluate")
.filter((entry) => !/[\r\n]/.test(entry))
.slice(0, 20),
},
)
}
/>
</div>
<Popup
open={historyOpen}
onClose={() => setHistory(null)}
anchor={evalRow}
placement="bottom-start"
matchWidth
role="presentation"
autoFocus={false}
className={styles.evalHistory}
>
<MenuList
aria-label={tx("Expression history")}
iconColumn={false}
onDone={() => setHistory(null)}
items={
history?.entries.length
? history.entries.map((entry) => ({ label: entry, verbatim: true, run: () => recall(entry) }))
: [{ label: "No history", disabled: true }]
}
/>
</Popup>
{frame == null && !watches.length && !lastEval ? (
<div className={styles.note}>
{session.status === "terminated"
+1
View File
@@ -502,6 +502,7 @@
"Unknown error": "Unknown error",
"Retry Loading Conversation": "Retry Loading Conversation",
"No conversation history": "No conversation history",
"No history": "No history",
"Loading the conversation timed out. Try again.": "Loading the conversation timed out. Try again.",
"Couldn't load the conversation: {0}": "Couldn't load the conversation: {0}",
"Astro Language Server": "Astro Language Server",
-1
View File
@@ -785,7 +785,6 @@
"Evaluate": "Evaluar",
"Evaluate Expression…": "Evaluar expresión…",
"Evaluate expression": "Evaluar expresión",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "Evaluar expresión (↩) o agregar una expresión de inspección (⇧⌘↩)",
"Evaluate in the debug console": "Evaluar en la consola de depuración",
"Evaluation result": "Resultado de la evaluación",
"Everything is up to date": "Todo está actualizado",
-1
View File
@@ -722,7 +722,6 @@
"Evaluate": "Évaluer",
"Evaluate Expression…": "Évaluer l'expression…",
"Evaluate expression": "Évaluer l'expression",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "Évaluer l'expression (↩) ou ajouter une expression surveillée (⇧⌘↩)",
"Evaluate in the debug console": "Évaluer dans la console de débogage",
"Evaluation result": "Résultat de l'évaluation",
"Everything is up to date": "Tout est à jour",
-1
View File
@@ -821,7 +821,6 @@
"Evaluate": "평가",
"Evaluate Expression…": "표현식 평가…",
"Evaluate expression": "표현식 평가",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "표현식 평가(↩) 또는 watch 추가(⇧⌘↩)",
"Evaluate in the debug console": "디버그 콘솔에서 평가",
"Evaluation result": "평가 결과",
"Everything is up to date": "모두 최신 상태입니다",
-1
View File
@@ -777,7 +777,6 @@
"Evaluate": "Oblicz/Ewaluuj",
"Evaluate Expression…": "Oblicz wyrażenie…",
"Evaluate expression": "Oblicz wyrażenie",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "Oblicz wyrażenie (↩) lub dodaj do obserwowanych (⇧⌘↩)",
"Evaluate in the debug console": "Oblicz w konsoli debugowania",
"Evaluation result": "Wynik obliczenia",
"Everything is up to date": "Wszystko jest aktualne",
-1
View File
@@ -777,7 +777,6 @@
"Evaluate": "Avaliar",
"Evaluate Expression…": "Avaliar expressão…",
"Evaluate expression": "Avaliar expressão",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "Avaliar expressão (↩) ou adicionar inspeção (⇧⌘↩)",
"Evaluate in the debug console": "Avaliar no console de depuração",
"Evaluation result": "Resultado da avaliação",
"Everything is up to date": "Tudo está atualizado",
-1
View File
@@ -3575,7 +3575,6 @@
"Evaluate": "Değerlendir",
"Evaluate Expression…": "İfadeyi Değerlendir…",
"Evaluate expression": "İfadeyi değerlendir",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "İfadeyi değerlendir (↩) veya izleme ekle (⇧⌘↩)",
"Evaluate in the debug console": "Hata ayıklama konsolunda değerlendir",
"Evaluation result": "Değerlendirme sonucu",
"Everything is up to date": "Her şey güncel",
-1
View File
@@ -1441,7 +1441,6 @@
"Evaluate": "計算",
"Evaluate Expression…": "計算表示式…",
"Evaluate expression": "計算表示式",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "計算表示式 (↩) 或新增監視 (⇧⌘↩)",
"Evaluate in the debug console": "在偵錯主控台中計算",
"Evaluation result": "計算結果",
"Everything is up to date": "一切都是最新的",
-1
View File
@@ -1485,7 +1485,6 @@
"Evaluate": "计算",
"Evaluate Expression…": "计算表达式…",
"Evaluate expression": "计算表达式",
"Evaluate expression (↩) or add a watch (⇧⌘↩)": "计算表达式 (↩) 或添加监视 (⇧⌘↩)",
"Evaluate in the debug console": "在调试控制台中计算",
"Evaluation result": "计算结果",
"Everything is up to date": "一切都是最新的",