fmt(js): npm run fix on merge (#79496)
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
069551d19b
commit
18ed612e5c
@@ -328,7 +328,10 @@ test('addWorktree: base origin/main does not set up upstream tracking', async ()
|
||||
function seedRemoteAndClone(label, branches) {
|
||||
const remoteDir = fs.mkdtempSync(path.join(os.tmpdir(), `hermes-${label}-remote-`))
|
||||
const cloneDir = fs.mkdtempSync(path.join(os.tmpdir(), `hermes-${label}-clone-`))
|
||||
const remoteGit = (...args) => execFileSync('git', ['-C', remoteDir, ...args]).toString().trim()
|
||||
const remoteGit = (...args) =>
|
||||
execFileSync('git', ['-C', remoteDir, ...args])
|
||||
.toString()
|
||||
.trim()
|
||||
|
||||
execFileSync('git', ['init', '-b', 'main', remoteDir])
|
||||
remoteGit('-c', 'user.email=hermes@localhost', '-c', 'user.name=Hermes', 'commit', '--allow-empty', '-m', 'root')
|
||||
@@ -382,7 +385,10 @@ test('addWorktree: a remote branch becomes a local branch tracking it', async ()
|
||||
|
||||
try {
|
||||
const result = await addWorktree(cloneDir, { existingBranch: 'origin/teammate-work' }, 'git')
|
||||
const inTree = (...args) => execFileSync('git', ['-C', result.path, ...args]).toString().trim()
|
||||
const inTree = (...args) =>
|
||||
execFileSync('git', ['-C', result.path, ...args])
|
||||
.toString()
|
||||
.trim()
|
||||
|
||||
// The worktree is on a local branch that has the name of the remote one. It
|
||||
// is not on a detached HEAD, which is the result of a checkout of
|
||||
@@ -402,7 +408,10 @@ test('addWorktree: a remote branch becomes a local branch tracking it', async ()
|
||||
|
||||
test('addWorktree: a remote default branch gets its own worktree, not a home switch', async () => {
|
||||
const { cloneDir, remoteDir } = seedRemoteAndClone('convert-remote-default', [])
|
||||
const git = (...args) => execFileSync('git', ['-C', cloneDir, ...args]).toString().trim()
|
||||
const git = (...args) =>
|
||||
execFileSync('git', ['-C', cloneDir, ...args])
|
||||
.toString()
|
||||
.trim()
|
||||
|
||||
try {
|
||||
// Move the main checkout off `main`, which makes "origin/main" convertible.
|
||||
|
||||
@@ -1335,9 +1335,7 @@ export function ChatSidebar({
|
||||
headerAction={
|
||||
inProject && enteredProject ? (
|
||||
<div className="group/workspace flex shrink-0 items-center gap-0.5">
|
||||
{enteredProject.path && (
|
||||
<StartWorkButton repoPath={enteredProject.path} />
|
||||
)}
|
||||
{enteredProject.path && <StartWorkButton repoPath={enteredProject.path} />}
|
||||
{/* Home has no folder and no record to rename, theme, or delete. */}
|
||||
{!enteredProject.isNoProject && (
|
||||
<ProjectMenu
|
||||
|
||||
@@ -11,7 +11,6 @@ import { copyPath, revealPath } from '@/store/projects'
|
||||
|
||||
import { SidebarRowLead } from '../chrome'
|
||||
|
||||
|
||||
// Branch/worktree labels routinely share a long prefix (`bb/coding-context-…`),
|
||||
// so plain end-truncation (`truncate`) hides exactly the suffix that tells two
|
||||
// lanes apart — both render as "bb/coding-context…". Keep the tail pinned and
|
||||
|
||||
@@ -242,9 +242,7 @@ export function WorktreeDialog() {
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent align="start" className="z-(--z-modal-popover) min-w-(--radix-popover-trigger-width) p-0">
|
||||
<Command
|
||||
filter={(value, search) => (value.toLowerCase().includes(search.toLowerCase()) ? 1 : 0)}
|
||||
>
|
||||
<Command filter={(value, search) => (value.toLowerCase().includes(search.toLowerCase()) ? 1 : 0)}>
|
||||
<CommandInput autoFocus placeholder={p.worktreeProjectPlaceholder} />
|
||||
<CommandList className="max-h-64">
|
||||
<CommandEmpty>{p.worktreeProjectNone}</CommandEmpty>
|
||||
|
||||
@@ -121,7 +121,10 @@ export function RemoteFolderPicker() {
|
||||
|
||||
return (
|
||||
<Dialog onOpenChange={open => !open && close()} open={Boolean(pending)}>
|
||||
<DialogContent bodyClassName="flex min-h-0 flex-col gap-0 overflow-hidden p-0" className="h-[min(36rem,calc(100vh-4rem))] max-w-lg">
|
||||
<DialogContent
|
||||
bodyClassName="flex min-h-0 flex-col gap-0 overflow-hidden p-0"
|
||||
className="h-[min(36rem,calc(100vh-4rem))] max-w-lg"
|
||||
>
|
||||
<div className="shrink-0 border-b border-border/70 px-4 py-3">
|
||||
<DialogTitle className="text-sm">{pending?.title || r.remotePickerTitle}</DialogTitle>
|
||||
<DialogDescription className="mt-1 text-xs">{r.remotePickerDescription}</DialogDescription>
|
||||
|
||||
@@ -104,7 +104,8 @@ export function UpdatesOverlay() {
|
||||
{/* This dialog has no inputs, so Radix's default autofocus would land on
|
||||
the close button and trigger its tooltip immediately on open. */}
|
||||
<DialogContent
|
||||
bodyClassName="overflow-hidden p-0 gap-0" className="max-w-sm"
|
||||
bodyClassName="overflow-hidden p-0 gap-0"
|
||||
className="max-w-sm"
|
||||
onOpenAutoFocus={preventCloseButtonAutoFocus}
|
||||
showCloseButton={phase !== 'applying'}
|
||||
>
|
||||
|
||||
@@ -79,7 +79,8 @@ export function ImageLightbox({
|
||||
return (
|
||||
<Dialog onOpenChange={onOpenChange} open={open}>
|
||||
<DialogContent
|
||||
bodyClassName="block overflow-visible p-0" className="w-auto max-h-[calc(100vh-12rem)] max-w-[calc(100vw-12rem)] border-0 bg-transparent shadow-none"
|
||||
bodyClassName="block overflow-visible p-0"
|
||||
className="w-auto max-h-[calc(100vh-12rem)] max-w-[calc(100vw-12rem)] border-0 bg-transparent shadow-none"
|
||||
showCloseButton={false}
|
||||
>
|
||||
<div className="group/lightbox relative inline-block">
|
||||
|
||||
@@ -80,7 +80,8 @@ function ZoomPanViewer({
|
||||
return (
|
||||
<Dialog onOpenChange={onOpenChange} open={open}>
|
||||
<DialogContent
|
||||
bodyClassName="flex min-h-0 flex-col gap-0 overflow-hidden p-0" className="h-[85vh] w-[90vw] max-w-[90vw]"
|
||||
bodyClassName="flex min-h-0 flex-col gap-0 overflow-hidden p-0"
|
||||
className="h-[85vh] w-[90vw] max-w-[90vw]"
|
||||
showCloseButton={false}
|
||||
>
|
||||
<div
|
||||
|
||||
Reference in New Issue
Block a user