diff options
| author | Kit Langton <[email protected]> | 2026-04-15 20:45:19 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-04-15 20:45:19 -0400 |
| commit | 3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0 (patch) | |
| tree | ecdd8fa222dd57683298409ef0b84cfd1d1ebc24 /packages/app/src/context | |
| parent | a554fad2327c68b2dc562a19e62a96415028b6d8 (diff) | |
| download | opencode-3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0.tar.gz opencode-3d6f90cb536ec30ff5091e1cbe3b1e619a93e1b0.zip | |
feat: add oxlint with correctness defaults (#22682)
Diffstat (limited to 'packages/app/src/context')
| -rw-r--r-- | packages/app/src/context/global-sync/child-store.ts | 4 | ||||
| -rw-r--r-- | packages/app/src/context/layout.tsx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/app/src/context/global-sync/child-store.ts b/packages/app/src/context/global-sync/child-store.ts index 5678491f8..3fe67e4fb 100644 --- a/packages/app/src/context/global-sync/child-store.ts +++ b/packages/app/src/context/global-sync/child-store.ts @@ -243,8 +243,8 @@ export function createChildStoreManager(input: { const cached = metaCache.get(directory) if (!cached) return const previous = store.projectMeta ?? {} - const icon = patch.icon ? { ...(previous.icon ?? {}), ...patch.icon } : previous.icon - const commands = patch.commands ? { ...(previous.commands ?? {}), ...patch.commands } : previous.commands + const icon = patch.icon ? { ...previous.icon, ...patch.icon } : previous.icon + const commands = patch.commands ? { ...previous.commands, ...patch.commands } : previous.commands const next = { ...previous, ...patch, diff --git a/packages/app/src/context/layout.tsx b/packages/app/src/context/layout.tsx index bab3d39f3..87f11d2b6 100644 --- a/packages/app/src/context/layout.tsx +++ b/packages/app/src/context/layout.tsx @@ -344,7 +344,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( return } - setStore("sessionView", sessionKey, "scroll", (prev) => ({ ...(prev ?? {}), ...next })) + setStore("sessionView", sessionKey, "scroll", (prev) => ({ ...prev, ...next })) prune(keep) }, }) @@ -399,7 +399,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( local?.icon?.color !== undefined const base = { - ...(metadata ?? {}), + ...metadata, ...project, icon: { url: metadata?.icon?.url, |