mirror of
https://github.com/anomalyco/opencode.git
synced 2026-11-18 07:12:47 +03:00
fix(tui): preserve path suffix in prompt footer (#42800)
This commit is contained in:
committed by
GitHub
Unverified
parent
3d782efee4
commit
58a36a1560
@@ -71,6 +71,7 @@ import { DialogImagePreview } from "../dialog-image-preview"
|
||||
import { useDirectoryRecents } from "../../prompt/directory-recents"
|
||||
import { directoryRecentValue } from "../../prompt/directory-completion"
|
||||
import { useWorkingDirectoryActions } from "../../ui/working-directory-actions"
|
||||
import { truncateFilePath } from "../../ui/file-path"
|
||||
|
||||
export type PromptProps = {
|
||||
sessionID?: string
|
||||
@@ -1555,6 +1556,12 @@ export function Prompt(props: PromptProps) {
|
||||
const branch = data.location.vcs.info(location)?.branch.current
|
||||
return branch ? `${directory}:${branch}` : directory
|
||||
})
|
||||
const [locationWidth, setLocationWidth] = createSignal(dimensions().width)
|
||||
const locationLabelDisplay = createMemo(() => {
|
||||
const label = locationLabel()
|
||||
if (!label) return
|
||||
return truncateFilePath(label, locationWidth())
|
||||
})
|
||||
const locationActions = useWorkingDirectoryActions({
|
||||
directory: () => footerLocation()?.directory,
|
||||
onMove: () => void move.open(),
|
||||
@@ -1840,7 +1847,15 @@ export function Prompt(props: PromptProps) {
|
||||
<box width="100%" flexDirection="row" justifyContent="space-between" gap={2}>
|
||||
<Slot path="prompt.footer" input={footerInput()}>
|
||||
<Slot path="prompt.footer.status" input={footerInput()}>
|
||||
<box flexGrow={1} flexShrink={1} minWidth={0}>
|
||||
<box
|
||||
flexGrow={1}
|
||||
flexShrink={1}
|
||||
minWidth={0}
|
||||
onSizeChange={function (this: BoxRenderable) {
|
||||
const width = this.width
|
||||
queueMicrotask(() => setLocationWidth(width))
|
||||
}}
|
||||
>
|
||||
<Switch>
|
||||
<Match when={status() === "running"}>
|
||||
<box flexDirection="row" gap={1} flexGrow={1} justifyContent="flex-start">
|
||||
@@ -1877,7 +1892,7 @@ export function Prompt(props: PromptProps) {
|
||||
</box>
|
||||
</Match>
|
||||
<Match when={true}>
|
||||
<Show when={!props.hint && locationLabel()} fallback={props.hint ?? <text />}>
|
||||
<Show when={!props.hint && locationLabelDisplay()} fallback={props.hint ?? <text />}>
|
||||
{(location) => (
|
||||
<text
|
||||
id="prompt.footer.location"
|
||||
|
||||
@@ -14,6 +14,10 @@ describe("truncateFilePath", () => {
|
||||
expect(truncateFilePath(path, 19)).toBe("…/dialog-select.tsx")
|
||||
})
|
||||
|
||||
test("preserves the working directory and branch suffix", () => {
|
||||
expect(truncateFilePath("~/code/experiments/category-theory:main", 30)).toBe("…/experi…/category-theory:main")
|
||||
})
|
||||
|
||||
test("uses remaining width for part of a long parent segment", () => {
|
||||
const path = "/private/var/folders/run-17f048ec-dbb2-4b36-860c-98637bb51a8d/files"
|
||||
expect(truncateFilePath(path, 40)).toBe("/…/run-17f048ec-dbb2-4b36-860c-98…/files")
|
||||
|
||||
Reference in New Issue
Block a user