The IDE you know, rebuilt in Rust. IntelliJ IDEA–style keymap, tool windows and search-everywhere in a fast native app: editor, code insight, debugger, Git, terminal, database and HTTP clients for 60+ languages.
TypeScript code-editorcross-platformdapdatabase-clientdebuggerdesktop-appdeveloper-toolsgithttp-clientideintellijlsprusttauriterminal
fix(console): 16px toolbar icons and a two-row find bar in narrow panels (#2387)
l0ng-ai718e07c83180
diff --git a/e2e/console-ui.spec.ts b/e2e/console-ui.spec.tsnew file mode 100644index 000000000..e2bb2e4b8--- /dev/null+++ b/e2e/console-ui.spec.ts@@ -0,0 +1,93 @@+import { expect, test } from "./fixtures";++for (const kind of ["run", "debug", "services-run", "services-debug", "stacktrace"] as const) {+ for (const width of [220, 280, 520]) {+ test(`${kind} console controls fit ${width}px and retain their native icon size`, async ({ workbench: page }) => {+ await page.evaluate(+ async ({ kind, width }) => {+ const reactPath = "/node_modules/.vite/deps/react.js";+ const domPath = "/node_modules/.vite/deps/react-dom_client.js";+ const react = await import(reactPath);+ const dom = await import(domPath);+ const { createElement } = react.default ?? react;+ const { createRoot } = dom.default ?? dom;+ const text = "alpha beta\ngamma Beta\nbeta again\n";+ let component;+ let props;+ if (kind === "run" || kind === "services-run") {+ const storePath = "/src/features/run/store.ts";+ const viewPath = "/src/features/run/RunView.tsx";+ const run = await import(storePath);+ const { SessionPanel } = await import(viewPath);+ await run.startSampleOutput(0, 1);+ const id = run.useRun.getState().activeSession;+ run.clearConsole(id);+ run.runtime(id).console.append({ kind: "stdout", text });+ run.runtime(id).console.flush();+ run.useRun.setState((s: { versions: Record<string, number> }) => ({+ versions: { ...s.versions, [id]: (s.versions[id] ?? 0) + 1 },+ }));+ component = SessionPanel;+ props = {+ session: run.useRun.getState().sessions.find((s: { id: string }) => s.id === id),+ ...(kind === "services-run" ? { onRerun: null, onDebug: null } : {}),+ };+ } else if (kind === "debug" || kind === "services-debug") {+ const statePath = "/src/features/debugger/state.ts";+ const viewPath = "/src/features/debugger/ui/DebugConsole.tsx";+ const debug = await import(statePath);+ const { DebugConsole, DebugServiceConsole } = await import(viewPath);+ const session = debug.adoptSession(9_000_001, { name: "Console alignment", status: "terminated" });+ debug.appendConsole(session.id, "stdout", text);+ component = kind === "debug" ? DebugConsole : DebugServiceConsole;+ props = kind === "debug" ? { session } : { sessionId: session.id };+ } else {+ const modelPath = "/src/features/run/console.ts";+ const viewPath = "/src/features/run/stackTrace.tsx";+ const { ConsoleModel } = await import(modelPath);+ const { StackTracePanel } = await import(viewPath);+ const model = new ConsoleModel();+ model.append({ kind: "stdout", text });+ model.flush();+ component = StackTracePanel;+ props = { tab: { id: "alignment-trace", title: "Console alignment", model } };+ }+ const host = document.createElement("div");+ host.id = "console-alignment-host";+ host.style.cssText = `position:fixed;top:60px;bottom:40px;left:420px;width:${width}px;z-index:9999;display:flex;flex-direction:column;background:var(--bg-app)`;+ document.body.append(host);+ createRoot(host).render(createElement(component, props));+ },+ { kind, width },+ );+ const host = page.locator("#console-alignment-host");+ const log = host.getByRole("log");+ await expect(log).toBeVisible();+ await log.focus();+ await page.keyboard.press("Meta+f");+ const search = host.getByRole("search", { name: "Find in console" });+ const input = search.getByRole("textbox", { name: "Find in console" });+ await input.fill("beta");+ await expect(search.locator("[aria-live=polite]")).toHaveText("1/3");+ if (process.env.OPENIDEA_CONSOLE_SHOTS)+ await host.screenshot({ path: `${process.env.OPENIDEA_CONSOLE_SHOTS}/${kind}-${width}.png` });++ for (const icon of await host.locator('[role="toolbar"] button > svg').all())+ expect.soft((await icon.boundingBox())!.width).toBe(16);+ const bounds = (await search.boundingBox())!;+ for (const control of await search.locator("input, button, [aria-live]").all()) {+ const rect = (await control.boundingBox())!;+ expect(rect.x).toBeGreaterThanOrEqual(bounds.x);+ expect(rect.x + rect.width).toBeLessThanOrEqual(bounds.x + bounds.width + 1);+ }+ expect((await input.boundingBox())!.width).toBeGreaterThan(40);+ await input.fill("missing");+ await expect(search.locator("[aria-live=polite]")).toHaveText("0 results");+ await expect(search.getByRole("button", { name: "Next Occurrence", exact: true })).toBeDisabled();+ await search.getByRole("button", { name: "Close", exact: true }).focus();+ await page.keyboard.press("Enter");+ await expect(search).toBeHidden();+ await expect(log).toBeFocused();+ });+ }+}diff --git a/src/features/debugger/ui/DebugConsole.tsx b/src/features/debugger/ui/DebugConsole.tsxindex a988c5559..f17acd109 100644--- a/src/features/debugger/ui/DebugConsole.tsx+++ b/src/features/debugger/ui/DebugConsole.tsx@@ -401,27 +401,14 @@ export function DebugConsole({ session, interactive = true }: { session: DebugSe><IconButtonicon="search"- iconSize={14}title="Find…"shortcut={formatBinding(hostBinding("Meta+F"))}pressed={findOpen}onClick={() => (findOpen ? closeFind() : openFind())}/>- <IconButton- icon="arrow-down"- iconSize={14}- title="Scroll to End"- pressed={follow}- onClick={() => setFollow((v) => !v)}- />- <IconButton- icon="soft-wrap"- iconSize={14}- title="Soft-Wrap"- pressed={softWrap}- onClick={() => setWrapOverride(!softWrap)}- />- <IconButton icon="trash" iconSize={14} title="Clear Console" onClick={() => clearConsole(session.id)} />+ <IconButton icon="scroll-to-end" title="Scroll to End" pressed={follow} onClick={() => setFollow((v) => !v)} />+ <IconButton icon="soft-wrap" title="Soft-Wrap" pressed={softWrap} onClick={() => setWrapOverride(!softWrap)} />+ <IconButton icon="trash" title="Clear Console" onClick={() => clearConsole(session.id)} /></div><div className={styles.console}>{findOpen && (diff --git a/src/features/run/RunView.tsx b/src/features/run/RunView.tsxindex 1f69388e7..ac3d70e96 100644--- a/src/features/run/RunView.tsx+++ b/src/features/run/RunView.tsx@@ -171,7 +171,6 @@ export function SessionPanel({<div className={styles.toolbar} role="toolbar" aria-orientation="vertical" aria-label={tx("Run actions")}><IconButtonicon="rerun"- iconSize={14}title="Rerun"shortcut={shortcutLabel("run.rerun")}disabled={onRerun === null}@@ -180,7 +179,6 @@ export function SessionPanel({{/* Switch the launch mode: the same configuration started under the debugger. */}<IconButtonicon="debug"- iconSize={14}title="Debug"shortcut={shortcutLabel("run.debug")}disabled={onDebug === null}@@ -189,7 +187,6 @@ export function SessionPanel({{rt.tests && (<IconButtonicon="rerun"- iconSize={14}tone="danger"title="Rerun Failed Tests"shortcut={shortcutLabel("run.rerunFailed")}@@ -199,7 +196,6 @@ export function SessionPanel({)}<IconButtonicon="stop"- iconSize={13}title={session.status === "stopping" ? tx`Stopping… (click to kill)` : "Stop"}tone={running || onStop ? "danger" : "default"}disabled={!running && !onStop}@@ -219,27 +215,24 @@ export function SessionPanel({<><IconButtonicon="search"- iconSize={14}title="Find…"shortcut={formatBinding(hostBinding("Meta+F"))}pressed={findOpen}onClick={() => setFindOpen((v) => !v)}/><IconButton- icon="arrow-down"- iconSize={14}+ icon="scroll-to-end"title="Scroll to End"pressed={follow}onClick={() => setFollow((v) => !v)}/>- <IconButton icon="soft-wrap" iconSize={14} title="Soft-Wrap" pressed={softWrap} onClick={toggleWrap} />+ <IconButton icon="soft-wrap" title="Soft-Wrap" pressed={softWrap} onClick={toggleWrap} /></>)}- <IconButton icon="trash" iconSize={14} title="Clear All" onClick={() => clearConsole(session.id)} />+ <IconButton icon="trash" title="Clear All" onClick={() => clearConsole(session.id)} /><div className={styles.toolbarSep} /><IconButtonicon="settings"- iconSize={14}title="Edit Configurations…"onClick={() => void executeAction("run.editConfigs", session.config.id)}/>diff --git a/src/ui/ConsoleFindBar.module.css b/src/ui/ConsoleFindBar.module.cssindex 63abc4911..cabc9c5a7 100644--- a/src/ui/ConsoleFindBar.module.css+++ b/src/ui/ConsoleFindBar.module.css@@ -1,4 +1,9 @@/* Find bar (⌘F) of the Run and Debug consoles. */+.container {+ container: console-find / inline-size;+ flex: none;+ min-width: 0;+}.find {flex: none;display: flex;@@ -26,3 +31,17 @@.findSpacer {flex: 1;}++@container console-find (max-width: 360px) {+ .find {+ display: grid;+ grid-template-columns: minmax(0, 1fr) repeat(3, 20px);+ }+ .findField {+ grid-column: 1 / -1;+ min-width: 0;+ }+ .findSpacer {+ display: none;+ }+}diff --git a/src/ui/ConsoleFindBar.tsx b/src/ui/ConsoleFindBar.tsxindex 81bfae190..8dbddceb1 100644--- a/src/ui/ConsoleFindBar.tsx+++ b/src/ui/ConsoleFindBar.tsx@@ -80,69 +80,71 @@ export function ConsoleFindBar({};return (- <div- className={styles.find}- role="search"- aria-label={tx("Find in console")}- data-console-find=""- onKeyDown={onKeyDown}- >- <SearchField- ref={inputRef}- className={styles.findField}- value={query}- onChange={onChange}- placeholder="Find in console"- aria-label="Find in console"- invalid={invalid || none}- toggles={[- {- id: "case",- icon: "case",- title: "Match Case",- shortcut: formatBinding("Alt+C"),- pressed: options.caseSensitive,- onToggle: () => toggle("caseSensitive"),- },- {- id: "word",- icon: "word",- title: "Words",- shortcut: formatBinding("Alt+W"),- pressed: options.wholeWord,- onToggle: () => toggle("wholeWord"),- },- {- id: "regex",- icon: "regex",- title: "Regex",- shortcut: formatBinding("Alt+X"),- pressed: options.regex,- onToggle: () => toggle("regex"),- },- ]}- />- <span className={clsx(styles.findCount, (invalid || none) && styles.findCountNone)} aria-live="polite">- {counter}- </span>- <IconButton- icon="arrow-up"- title="Previous Occurrence"- shortcut={formatBinding("Shift+Enter")}- size="small"- disabled={count === 0}- onClick={onPrevious}- />- <IconButton- icon="arrow-down"- title="Next Occurrence"- shortcut="↵"- size="small"- disabled={count === 0}- onClick={onNext}- />- <span className={styles.findSpacer} />- <IconButton icon="close" title="Close" shortcut="⎋" size="small" onClick={onClose} />+ <div className={styles.container}>+ <div+ className={styles.find}+ role="search"+ aria-label={tx("Find in console")}+ data-console-find=""+ onKeyDown={onKeyDown}+ >+ <SearchField+ ref={inputRef}+ className={styles.findField}+ value={query}+ onChange={onChange}+ placeholder="Find in console"+ aria-label="Find in console"+ invalid={invalid || none}+ toggles={[+ {+ id: "case",+ icon: "case",+ title: "Match Case",+ shortcut: formatBinding("Alt+C"),+ pressed: options.caseSensitive,+ onToggle: () => toggle("caseSensitive"),+ },+ {+ id: "word",+ icon: "word",+ title: "Words",+ shortcut: formatBinding("Alt+W"),+ pressed: options.wholeWord,+ onToggle: () => toggle("wholeWord"),+ },+ {+ id: "regex",+ icon: "regex",+ title: "Regex",+ shortcut: formatBinding("Alt+X"),+ pressed: options.regex,+ onToggle: () => toggle("regex"),+ },+ ]}+ />+ <span className={clsx(styles.findCount, (invalid || none) && styles.findCountNone)} aria-live="polite">+ {counter}+ </span>+ <IconButton+ icon="arrow-up"+ title="Previous Occurrence"+ shortcut={formatBinding("Shift+Enter")}+ size="small"+ disabled={count === 0}+ onClick={onPrevious}+ />+ <IconButton+ icon="arrow-down"+ title="Next Occurrence"+ shortcut="↵"+ size="small"+ disabled={count === 0}+ onClick={onNext}+ />+ <span className={styles.findSpacer} />+ <IconButton icon="close" title="Close" shortcut="⎋" size="small" onClick={onClose} />+ </div></div>);}diff --git a/src/ui/expui/general/scrollDown.svg b/src/ui/expui/general/scrollDown.svgnew file mode 100644index 000000000..65937ed95--- /dev/null+++ b/src/ui/expui/general/scrollDown.svg@@ -0,0 +1,5 @@+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M1.5 3.5H5.5M1.5 8H5.5M1.5 12.5H14.5" stroke="#6C707E" stroke-linecap="round" stroke-linejoin="round"/>+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5 3C11.7761 3 12 3.22386 12 3.5L12 9.29291L14.1465 7.14646C14.3417 6.95119 14.6583 6.9512 14.8536 7.14646C15.0488 7.34172 15.0488 7.65831 14.8536 7.85357L11.8536 10.8536C11.6583 11.0488 11.3417 11.0488 11.1464 10.8536L8.14648 7.85356C7.95121 7.6583 7.95122 7.34172 8.14648 7.14646C8.34174 6.9512 8.65832 6.9512 8.85358 7.14646L11 9.29289L11 3.5C11 3.22386 11.2239 3 11.5 3Z" fill="#6C707E"/>+</svg>diff --git a/src/ui/expui/general/scrollDown_dark.svg b/src/ui/expui/general/scrollDown_dark.svgnew file mode 100644index 000000000..ff83c42a4--- /dev/null+++ b/src/ui/expui/general/scrollDown_dark.svg@@ -0,0 +1,5 @@+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">+<path d="M1.5 3.5H5.5M1.5 8H5.5M1.5 12.5H14.5" stroke="#CED0D6" stroke-linecap="round" stroke-linejoin="round"/>+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5 3C11.7761 3 12 3.22386 12 3.5L12 9.29291L14.1464 7.14646C14.3417 6.95119 14.6583 6.9512 14.8536 7.14646C15.0488 7.34172 15.0488 7.65831 14.8536 7.85357L11.8535 10.8536C11.6583 11.0488 11.3417 11.0488 11.1464 10.8536L8.14645 7.85356C7.95118 7.6583 7.95118 7.34172 8.14645 7.14646C8.34171 6.9512 8.65829 6.9512 8.85355 7.14646L11 9.29289L11 3.5C11 3.22386 11.2238 3 11.5 3Z" fill="#CED0D6"/>+</svg>diff --git a/src/ui/icons.tsx b/src/ui/icons.tsxindex f93bf7a9e..ef249bc2f 100644--- a/src/ui/icons.tsx+++ b/src/ui/icons.tsx@@ -293,6 +293,7 @@ const ICONS = {"arrow-right": "general/right","arrow-up": "general/up","arrow-down": "general/down",+ "scroll-to-end": "general/scrollDown",undo: "general/undo",redo: "general/redo",sun: "meetNewUi/lightTheme",