@kabmo-labs/kabmo 0.9.0 → 0.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +45 -0
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +333 -333
- package/dist/client/static/js/index-18xe7655.css +1 -0
- package/dist/client/static/js/{index-bpptfkz2.js → index-nxpe7835.js} +768 -763
- package/package.json +3 -1
- package/src/client/components/common/code-surface/bracket-guide.test.ts +249 -0
- package/src/client/components/common/code-surface/bracket-guide.ts +131 -0
- package/src/client/components/common/code-surface/documents.test.ts +5 -3
- package/src/client/components/common/code-surface/documents.ts +85 -0
- package/src/client/components/common/code-surface/extensions.test.ts +5 -0
- package/src/client/components/common/code-surface/extensions.ts +140 -7
- package/src/client/components/common/code-surface/fold-stack.test.ts +218 -0
- package/src/client/components/common/code-surface/fold.test.ts +148 -0
- package/src/client/components/common/code-surface/fold.ts +118 -0
- package/src/client/components/common/code-surface/indent-guide.ts +104 -0
- package/src/client/components/common/code-surface/indent.test.ts +239 -0
- package/src/client/components/common/code-surface/indent.ts +124 -0
- package/src/client/components/common/code-surface/index.tsx +76 -46
- package/src/client/components/common/code-surface/keymap.ts +12 -23
- package/src/client/components/common/code-surface/line-commands.test.ts +90 -0
- package/src/client/components/common/code-surface/line-commands.ts +103 -0
- package/src/client/components/common/code-surface/props.ts +87 -0
- package/src/client/components/common/code-surface/stream-language.test.ts +118 -0
- package/src/client/components/common/code-surface/stream-language.ts +123 -0
- package/src/client/components/common/code-surface/theme.test.ts +40 -5
- package/src/client/components/common/code-surface/theme.ts +113 -0
- package/src/client/components/common/code-surface/typing.test.ts +97 -0
- package/src/client/components/common/code-surface/typing.ts +111 -0
- package/src/client/components/common/toolbar-row/index.test.tsx +53 -4
- package/src/client/components/common/toolbar-row/index.tsx +101 -30
- package/src/client/components/layout/desktop-layout/WorkspacePanels.tsx +17 -0
- package/src/client/components/layout/desktop-layout/index.tsx +18 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +35 -33
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +20 -1
- package/src/client/components/mobile/mobile-right-sidebar/editor-props.ts +25 -0
- package/src/client/components/settings/categories/AppearanceSettings.tsx +6 -0
- package/src/client/components/settings/categories/appearance-settings/EditorIndentSection.tsx +87 -0
- package/src/client/components/settings/categories/appearance-settings/EditorTypingSection.tsx +99 -0
- package/src/client/components/workspace/chat-timeline/chat-input/expansion.ts +9 -4
- package/src/client/components/workspace/chat-timeline/chat-input/index.tsx +15 -11
- package/src/client/components/workspace/chat-timeline/chat-input/stretch-send.test.tsx +165 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.test.ts +17 -3
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.tsx +10 -6
- package/src/client/components/workspace/editor/Body.tsx +24 -0
- package/src/client/components/workspace/editor/CommandPalette.tsx +4 -4
- package/src/client/components/workspace/editor/ConflictStrip.tsx +77 -0
- package/src/client/components/workspace/editor/Dialogs.tsx +53 -0
- package/src/client/components/workspace/editor/EmptyEditor.tsx +23 -0
- package/src/client/components/workspace/editor/ExternalChangeStrip.tsx +61 -0
- package/src/client/components/workspace/editor/FileDocument.tsx +89 -1
- package/src/client/components/workspace/editor/FilePane.tsx +43 -0
- package/src/client/components/workspace/editor/FindWidget.test.ts +9 -5
- package/src/client/components/workspace/editor/FindWidget.tsx +29 -0
- package/src/client/components/workspace/editor/GoToLineModal.tsx +123 -0
- package/src/client/components/workspace/editor/Notices.tsx +71 -0
- package/src/client/components/workspace/editor/Pane.tsx +118 -0
- package/src/client/components/workspace/editor/PluginColumn.tsx +32 -0
- package/src/client/components/workspace/editor/QuickOpenModal.tsx +146 -0
- package/src/client/components/workspace/editor/SaveAsModal.tsx +175 -0
- package/src/client/components/workspace/editor/SplitColumn.tsx +98 -0
- package/src/client/components/workspace/editor/SplitPane.tsx +57 -0
- package/src/client/components/workspace/editor/StatusBar.tsx +106 -0
- package/src/client/components/workspace/editor/TabContextMenu.tsx +75 -0
- package/src/client/components/workspace/editor/Tabs.tsx +195 -18
- package/src/client/components/workspace/editor/Toolbar.tsx +54 -181
- package/src/client/components/workspace/editor/index.tsx +199 -189
- package/src/client/components/workspace/editor/props.ts +64 -0
- package/src/client/components/workspace/editor/toolbar-clusters.tsx +300 -0
- package/src/client/components/workspace/file-explorer/Modals.tsx +14 -1
- package/src/client/components/workspace/file-explorer/TreeItem.tsx +2 -1
- package/src/client/components/workspace/file-explorer/clipboard.test.ts +3 -1
- package/src/client/components/workspace/file-explorer/index.test.ts +61 -0
- package/src/client/components/workspace/file-explorer/index.tsx +10 -48
- package/src/client/components/workspace/file-explorer/local-edit.test.ts +8 -3
- package/src/client/components/workspace/search-panel/Body.tsx +6 -1
- package/src/client/hooks/chat/composer/file-drop.ts +22 -37
- package/src/client/hooks/chat/composer/pipeline.test.ts +76 -0
- package/src/client/hooks/chat/composer/pipeline.ts +12 -1
- package/src/client/hooks/editor/caret-position.test.ts +58 -0
- package/src/client/hooks/editor/caret-position.ts +48 -0
- package/src/client/hooks/editor/file-editor-types.ts +200 -0
- package/src/client/hooks/editor/find-history.test.ts +132 -0
- package/src/client/hooks/editor/find-history.ts +46 -0
- package/src/client/hooks/editor/find-selection-range.test.ts +100 -0
- package/src/client/hooks/editor/find-selection-range.ts +49 -0
- package/src/client/hooks/editor/find-state.ts +13 -0
- package/src/client/hooks/editor/font.test.ts +0 -93
- package/src/client/hooks/editor/indent-settings.test.ts +104 -0
- package/src/client/hooks/editor/indent-settings.ts +88 -0
- package/src/client/hooks/editor/quick-open.test.ts +141 -0
- package/src/client/hooks/editor/quick-open.ts +127 -0
- package/src/client/hooks/editor/save-as.test.ts +156 -0
- package/src/client/hooks/editor/save-as.ts +122 -0
- package/src/client/hooks/editor/save-file.test.ts +179 -0
- package/src/client/hooks/editor/save-file.ts +73 -28
- package/src/client/hooks/editor/typing-settings.test.ts +73 -0
- package/src/client/hooks/editor/typing-settings.ts +65 -0
- package/src/client/hooks/editor/use-close-guard.ts +98 -0
- package/src/client/hooks/editor/use-editor-drop-overlay.test.ts +159 -0
- package/src/client/hooks/editor/use-editor-drop.shell.test.ts +224 -0
- package/src/client/hooks/editor/use-editor-drop.ts +58 -68
- package/src/client/hooks/editor/use-editor-find.test.ts +2 -2
- package/src/client/hooks/editor/use-editor-find.ts +38 -3
- package/src/client/hooks/editor/use-editor-panel-keys.ts +152 -0
- package/src/client/hooks/editor/use-editor-tab-state.ts +71 -0
- package/src/client/hooks/editor/use-external-change-notice.ts +71 -0
- package/src/client/hooks/editor/use-external-change.test.ts +88 -0
- package/src/client/hooks/editor/use-external-change.ts +146 -0
- package/src/client/hooks/editor/use-file-editor.ts +83 -116
- package/src/client/hooks/editor/use-file-read.ts +16 -8
- package/src/client/hooks/editor/use-file-writes.ts +28 -3
- package/src/client/hooks/editor/use-mobile-editor-find.ts +69 -0
- package/src/client/hooks/editor/use-mobile-reveal.ts +53 -0
- package/src/client/hooks/editor/use-search-reveal-jump.ts +57 -0
- package/src/client/hooks/editor/use-split-editor.test.tsx +169 -0
- package/src/client/hooks/editor/use-split-editor.ts +91 -0
- package/src/client/hooks/editor/use-unload-guard.tsx +117 -0
- package/src/client/hooks/editor/use-write-conflict.test.ts +164 -0
- package/src/client/hooks/editor/use-write-conflict.ts +152 -0
- package/src/client/hooks/editor/wheel-zoom.test.ts +141 -0
- package/src/client/hooks/editor/wheel-zoom.ts +96 -0
- package/src/client/hooks/ui/drag-presence.test.ts +193 -0
- package/src/client/hooks/ui/drag-presence.ts +108 -0
- package/src/client/hooks/ui/settings-modal.test.ts +115 -0
- package/src/client/hooks/workspace/file-listing.ts +36 -24
- package/src/client/hooks/workspace/file-tabs.test.ts +90 -0
- package/src/client/hooks/workspace/file-tabs.ts +46 -0
- package/src/client/hooks/workspace/file-tree-edits.ts +103 -0
- package/src/client/lib/desktop/dropped-paths.ts +83 -0
- package/src/client/lib/editor/tab-menu.test.ts +127 -0
- package/src/client/lib/editor/tab-menu.ts +127 -0
- package/src/client/lib/editor-dirty-tabs.test.ts +102 -0
- package/src/client/lib/editor-dirty-tabs.ts +103 -0
- package/src/client/lib/native/resume.test.ts +66 -0
- package/src/client/lib/native/resume.ts +42 -0
- package/src/client/main.tsx +8 -0
- package/src/client/tailwind.css +38 -0
- package/src/server/lib/bundler/css.test.ts +31 -0
- package/src/server/lib/fs/listing.test.ts +81 -16
- package/src/server/lib/fs/listing.ts +72 -5
- package/src/server/lib/fs/write-conflict.test.ts +68 -0
- package/src/server/lib/fs/write-conflict.ts +84 -0
- package/src/server/routes/fs/action-save-as.test.ts +82 -0
- package/src/server/routes/fs/action.test.ts +82 -0
- package/src/server/routes/fs/action.ts +54 -1
- package/src/server/routes/fs/exists.ts +11 -1
- package/src/server/routes/fs/read.ts +6 -1
- package/src/shared/lib/code/editor/find-replace.test.ts +1 -1
- package/src/shared/lib/code/editor/find-scan.test.ts +1 -1
- package/src/shared/lib/code/editor/find-scan.ts +22 -1
- package/src/shared/lib/code/editor/find-selection.test.ts +56 -0
- package/src/shared/lib/code/editor/indent-guide-rule.test.ts +65 -0
- package/src/shared/lib/code/editor/indent-guide-rule.ts +47 -0
- package/src/shared/lib/code/editor/indent-rules.test.ts +219 -0
- package/src/shared/lib/code/editor/indent-rules.ts +198 -0
- package/src/shared/lib/code/editor/keymap.test.ts +23 -0
- package/src/shared/lib/code/editor/keymap.ts +40 -3
- package/src/shared/lib/code/editor/palette.test.ts +25 -2
- package/src/shared/lib/code/editor/palette.ts +10 -0
- package/src/shared/lib/code/editor/stream-modes.ts +225 -0
- package/src/shared/lib/code/syntax-highlight.test.ts +1 -1
- package/src/shared/lib/fs/file-tree.test.ts +41 -0
- package/src/shared/lib/fs/file-tree.ts +126 -34
- package/src/shared/lib/fs/folder-chain.test.ts +87 -0
- package/src/shared/lib/fs/folder-chain.ts +91 -0
- package/src/shared/lib/fs/fs-helpers.test.ts +4 -50
- package/src/shared/lib/realtime/connection.test.ts +5 -1
- package/src/shared/lib/realtime/connection.ts +25 -119
- package/src/shared/lib/realtime/frozen-recovery.test.ts +93 -0
- package/src/shared/lib/realtime/resume.ts +223 -0
- package/src/shared/lib/realtime/state.ts +22 -0
- package/src/shared/lib/realtime/watchdog-wiring.test.ts +224 -0
- package/src/shared/lib/realtime/watchdog.test.ts +99 -0
- package/src/shared/lib/realtime/watchdog.ts +72 -0
- package/src/shared/lib/workspace/split-editor.test.ts +104 -0
- package/src/shared/lib/workspace/split-editor.ts +129 -0
- package/src/test-support/file-explorer-disk.test-util.ts +30 -3
- package/src/test-support/pristine-globals.ts +7 -0
- package/dist/client/static/js/index-k315p1e8.css +0 -1
|
@@ -0,0 +1,169 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The split editor's session-backed state, mounted through the REAL provider.
|
|
8
|
+
*
|
|
9
|
+
* The rules are unit-tested in `shared/lib/workspace/split-editor.test.ts`; what only a
|
|
10
|
+
* mount can see is that this hook applies them and PERSISTS the result:
|
|
11
|
+
*
|
|
12
|
+
* - `enabled: false` (a split pane) reports no right pane even when the blob says one,
|
|
13
|
+
* which is what stops the column becoming a tree.
|
|
14
|
+
* - A persisted id for a tab that is gone reports an unsplit column instead of a pane that
|
|
15
|
+
* cannot render.
|
|
16
|
+
* - Activating the tab the right pane already shows collapses the split, rather than
|
|
17
|
+
* drawing one file twice.
|
|
18
|
+
* - A dragged divider position is CLAMPED before it is written, so neither pane can be
|
|
19
|
+
* squeezed out of existence.
|
|
20
|
+
*
|
|
21
|
+
* Rendered with `h()` against happy-dom, over a stubbed `fetch` that answers the session
|
|
22
|
+
* blob — the provider loads it before anything is ready.
|
|
23
|
+
*/
|
|
24
|
+
|
|
25
|
+
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'bun:test';
|
|
26
|
+
import { Window } from 'happy-dom';
|
|
27
|
+
import { h, render } from 'preact';
|
|
28
|
+
import { act } from 'preact/test-utils';
|
|
29
|
+
|
|
30
|
+
import { SessionStateProvider } from '@/client/components/common/session-state-provider/index';
|
|
31
|
+
import { useSplitEditor, type SplitEditorHandle } from '@/client/hooks/editor/use-split-editor';
|
|
32
|
+
import { forgetSession } from '@/shared/lib/workspace/session-state/store';
|
|
33
|
+
import { installDomGlobals, restoreDomGlobals } from '@/test-support/pristine-globals';
|
|
34
|
+
import type { OpenedFile } from '@/shared/types/fs';
|
|
35
|
+
|
|
36
|
+
const SESSION = 'new-split-editor';
|
|
37
|
+
/** The runner's own fetch, reached through `Bun` so a leaked stub cannot be mistaken for it. */
|
|
38
|
+
const nativeFetch = Bun.fetch;
|
|
39
|
+
|
|
40
|
+
function file(id: string): OpenedFile {
|
|
41
|
+
return { id, name: `${id}.ts`, path: `src/${id}.ts` };
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const A = file('a');
|
|
45
|
+
const B = file('b');
|
|
46
|
+
|
|
47
|
+
let container: HTMLElement;
|
|
48
|
+
|
|
49
|
+
beforeAll(() => {
|
|
50
|
+
installDomGlobals(new Window({ url: 'http://localhost' }));
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
afterEach(() => {
|
|
54
|
+
if (container) {
|
|
55
|
+
render(null, container);
|
|
56
|
+
container.remove();
|
|
57
|
+
}
|
|
58
|
+
forgetSession(SESSION);
|
|
59
|
+
(globalThis as unknown as Record<string, unknown>).fetch = nativeFetch;
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
afterAll(() => {
|
|
63
|
+
restoreDomGlobals();
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
interface MountOptions {
|
|
67
|
+
stored?: Record<string, unknown>;
|
|
68
|
+
openedFiles?: OpenedFile[];
|
|
69
|
+
activeFileId?: string | number | null;
|
|
70
|
+
enabled?: boolean;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
/** Mount the hook and return a live reader for its result. */
|
|
74
|
+
async function mount(options: MountOptions = {}): Promise<() => SplitEditorHandle> {
|
|
75
|
+
const target = globalThis as unknown as Record<string, unknown>;
|
|
76
|
+
const stored = options.stored ?? {};
|
|
77
|
+
target.fetch = async () =>
|
|
78
|
+
new Response(JSON.stringify({ sessionId: SESSION, state: stored }), {
|
|
79
|
+
status: 200,
|
|
80
|
+
headers: { 'content-type': 'application/json' },
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
const openedFiles = options.openedFiles ?? [A, B];
|
|
84
|
+
const activeFileId = options.activeFileId === undefined ? 'a' : options.activeFileId;
|
|
85
|
+
const enabled = options.enabled ?? true;
|
|
86
|
+
|
|
87
|
+
let slot: SplitEditorHandle | null = null;
|
|
88
|
+
|
|
89
|
+
function Probe() {
|
|
90
|
+
slot = useSplitEditor({ openedFiles, activeFileId, enabled });
|
|
91
|
+
return null;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
container = document.createElement('div');
|
|
95
|
+
document.body.appendChild(container);
|
|
96
|
+
await act(async () => {
|
|
97
|
+
render(h(SessionStateProvider, { sessionId: SESSION, children: h(Probe, null) }), container);
|
|
98
|
+
});
|
|
99
|
+
// The provider's blob load settles across a tick.
|
|
100
|
+
for (let i = 0; i < 10; i += 1) await act(async () => {});
|
|
101
|
+
|
|
102
|
+
return () => {
|
|
103
|
+
if (!slot) throw new Error('the hook never rendered');
|
|
104
|
+
return slot;
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
|
|
108
|
+
describe('useSplitEditor', () => {
|
|
109
|
+
test('an unsplit column reports no right pane', async () => {
|
|
110
|
+
const read = await mount();
|
|
111
|
+
expect(read().rightFile).toBeNull();
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
test('splitting to another open tab reports it, and closing the pane keeps the tab', async () => {
|
|
115
|
+
const read = await mount();
|
|
116
|
+
await act(async () => read().splitTo('b'));
|
|
117
|
+
|
|
118
|
+
expect(read().rightFile?.id).toBe('b');
|
|
119
|
+
|
|
120
|
+
// Closing the pane is a VIEW decision: the tab list is untouched, which is why the
|
|
121
|
+
// callback takes no id.
|
|
122
|
+
await act(async () => read().close());
|
|
123
|
+
expect(read().rightFile).toBeNull();
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test('splitting to the left pane’s own tab is refused', async () => {
|
|
127
|
+
const read = await mount();
|
|
128
|
+
await act(async () => read().splitTo('a'));
|
|
129
|
+
expect(read().rightFile).toBeNull();
|
|
130
|
+
});
|
|
131
|
+
|
|
132
|
+
test('a persisted id for a tab that is gone opens an unsplit column', async () => {
|
|
133
|
+
const read = await mount({ stored: { 'editor.split': { rightFileId: 'gone', fraction: 0.5 } } });
|
|
134
|
+
expect(read().rightFile).toBeNull();
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
test('activating the tab the right pane shows collapses the split', async () => {
|
|
138
|
+
// The same file on both sides is a wide pane with a divider through it, so the split
|
|
139
|
+
// gives way — the user asked to look at THAT file.
|
|
140
|
+
const read = await mount({
|
|
141
|
+
stored: { 'editor.split': { rightFileId: 'b', fraction: 0.5 } },
|
|
142
|
+
activeFileId: 'b',
|
|
143
|
+
});
|
|
144
|
+
expect(read().rightFile).toBeNull();
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
test('a stored split on another tab is restored', async () => {
|
|
148
|
+
const read = await mount({ stored: { 'editor.split': { rightFileId: 'b', fraction: 0.35 } } });
|
|
149
|
+
expect(read().rightFile?.id).toBe('b');
|
|
150
|
+
expect(read().fraction).toBe(0.35);
|
|
151
|
+
});
|
|
152
|
+
|
|
153
|
+
test('a split pane (enabled: false) never reports a right pane, so the column is not a tree', async () => {
|
|
154
|
+
const read = await mount({
|
|
155
|
+
stored: { 'editor.split': { rightFileId: 'b', fraction: 0.5 } },
|
|
156
|
+
enabled: false,
|
|
157
|
+
});
|
|
158
|
+
expect(read().rightFile).toBeNull();
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
test('a dragged divider is clamped, so neither pane can be squeezed out', async () => {
|
|
162
|
+
const read = await mount();
|
|
163
|
+
await act(async () => read().setFraction(0.99));
|
|
164
|
+
expect(read().fraction).toBeLessThanOrEqual(0.8);
|
|
165
|
+
|
|
166
|
+
await act(async () => read().setFraction(0.01));
|
|
167
|
+
expect(read().fraction).toBeGreaterThanOrEqual(0.2);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The split editor's state, per session.
|
|
8
|
+
*
|
|
9
|
+
* The RULES live in `shared/lib/workspace/split-editor.ts` (pure, unit-tested); this is the
|
|
10
|
+
* session-backed wrapper the panel calls, plus the two derivations it needs — which tab the
|
|
11
|
+
* right pane shows, and whether the column is split at all.
|
|
12
|
+
*
|
|
13
|
+
* ## `enabled: false` is what stops a tree
|
|
14
|
+
*
|
|
15
|
+
* The right pane renders the SAME panel, so without this the pane could split again and the
|
|
16
|
+
* column would become a tree with no way to reason about widths, close semantics or what
|
|
17
|
+
* the strip owns. A pane never splits.
|
|
18
|
+
*
|
|
19
|
+
* ## A stale persisted id is DROPPED, not trusted
|
|
20
|
+
*
|
|
21
|
+
* `readSplitState` checks the id against the OPEN tabs, so a reload after the right pane's
|
|
22
|
+
* tab was closed elsewhere opens an unsplit column instead of an empty half the user has to
|
|
23
|
+
* discover how to dismiss — and `splitAfterActivate` collapses the split when the user
|
|
24
|
+
* activates the very tab the right pane shows, because one file twice is a wide pane with a
|
|
25
|
+
* divider through it.
|
|
26
|
+
*/
|
|
27
|
+
|
|
28
|
+
import { useCallback } from 'preact/hooks';
|
|
29
|
+
|
|
30
|
+
import { useSessionState } from '@/client/hooks/workspace/session-state';
|
|
31
|
+
import {
|
|
32
|
+
DEFAULT_SPLIT,
|
|
33
|
+
canSplitTo,
|
|
34
|
+
clampSplitFraction,
|
|
35
|
+
readSplitState,
|
|
36
|
+
splitAfterActivate,
|
|
37
|
+
type SplitEditorState,
|
|
38
|
+
} from '@/shared/lib/workspace/split-editor';
|
|
39
|
+
import type { OpenedFile } from '@/shared/types/fs';
|
|
40
|
+
|
|
41
|
+
interface UseSplitEditorOptions {
|
|
42
|
+
openedFiles: OpenedFile[];
|
|
43
|
+
/** The LEFT pane's tab. */
|
|
44
|
+
activeFileId: number | string | null;
|
|
45
|
+
/** False in a split pane: a pane never splits again. */
|
|
46
|
+
enabled: boolean;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export interface SplitEditorHandle {
|
|
50
|
+
/** The tab the right pane shows, or null when the column is not split. */
|
|
51
|
+
rightFile: OpenedFile | null;
|
|
52
|
+
fraction: number;
|
|
53
|
+
/** Split to `id`, or change which tab the right pane shows. Silent on a refusal. */
|
|
54
|
+
splitTo: (id: number | string | null) => void;
|
|
55
|
+
/** Close the pane. The TAB stays open — a split is a view. */
|
|
56
|
+
close: () => void;
|
|
57
|
+
/** Persist a dragged divider position, clamped. */
|
|
58
|
+
setFraction: (fraction: number) => void;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export function useSplitEditor({ openedFiles, activeFileId, enabled }: UseSplitEditorOptions): SplitEditorHandle {
|
|
62
|
+
const [stored, setStored] = useSessionState<unknown>('editor.split', DEFAULT_SPLIT);
|
|
63
|
+
const openIds = openedFiles.map((file) => file.id);
|
|
64
|
+
// A persisted id for a tab that is gone is dropped by `readSplitState`; activating the
|
|
65
|
+
// tab the right pane already shows collapses the split rather than drawing it twice.
|
|
66
|
+
const state: SplitEditorState = splitAfterActivate(readSplitState(stored, openIds), activeFileId);
|
|
67
|
+
|
|
68
|
+
const rightFile =
|
|
69
|
+
enabled && state.rightFileId !== null
|
|
70
|
+
? openedFiles.find((file) => file.id === state.rightFileId) ?? null
|
|
71
|
+
: null;
|
|
72
|
+
|
|
73
|
+
const splitTo = useCallback(
|
|
74
|
+
(id: number | string | null) => {
|
|
75
|
+
if (id !== null && !canSplitTo(id, activeFileId, openIds)) return;
|
|
76
|
+
setStored({ ...state, rightFileId: id });
|
|
77
|
+
},
|
|
78
|
+
// `openIds` is derived from `openedFiles` each render; the id list is what the guard
|
|
79
|
+
// reads, so the callback follows it.
|
|
80
|
+
[state, setStored, activeFileId, openIds],
|
|
81
|
+
);
|
|
82
|
+
|
|
83
|
+
const close = useCallback(() => setStored({ ...state, rightFileId: null }), [state, setStored]);
|
|
84
|
+
|
|
85
|
+
const setFraction = useCallback(
|
|
86
|
+
(fraction: number) => setStored({ ...state, fraction: clampSplitFraction(fraction) }),
|
|
87
|
+
[state, setStored],
|
|
88
|
+
);
|
|
89
|
+
|
|
90
|
+
return { rightFile, fraction: state.fraction, splitTo, close, setFraction };
|
|
91
|
+
}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The unsaved-changes guard: a `beforeunload` armed only while something is
|
|
8
|
+
* dirty, and the dialog for closing one dirty tab.
|
|
9
|
+
*
|
|
10
|
+
* ## Why a guard at all
|
|
11
|
+
*
|
|
12
|
+
* The autosave is debounced at 800 ms, so closing a tab — or reloading — inside
|
|
13
|
+
* that window loses the edit with no warning and no way to recover it. The tab
|
|
14
|
+
* strip says which tabs are at risk (`editor-dirty-tabs`); this is what asks
|
|
15
|
+
* before the loss happens.
|
|
16
|
+
*
|
|
17
|
+
* ## Why only DIRTY tabs ask
|
|
18
|
+
*
|
|
19
|
+
* A confirm on every close is one people learn to dismiss without reading, which
|
|
20
|
+
* is worse than none. A clean tab closes instantly; the dialog appears only where
|
|
21
|
+
* there is something to lose, and it names the file.
|
|
22
|
+
*
|
|
23
|
+
* ## `beforeunload` is the browser's own modal, and that is a cost
|
|
24
|
+
*
|
|
25
|
+
* It cannot be styled, it cannot offer "Save and close", and some users find it
|
|
26
|
+
* more annoying than the loss. It is therefore armed only while `hasDirtyTabs()` —
|
|
27
|
+
* the narrow case — and removed the moment nothing is dirty. The handler calls
|
|
28
|
+
* `preventDefault()` and sets `returnValue`; a browser that ignores one still
|
|
29
|
+
* honours the other, and `returnValue` is the deprecated-but-required spelling.
|
|
30
|
+
*/
|
|
31
|
+
|
|
32
|
+
import { useEffect } from 'preact/hooks';
|
|
33
|
+
import { AlertTriangle } from 'lucide-preact';
|
|
34
|
+
|
|
35
|
+
import { hasDirtyTabs } from '@/client/lib/editor-dirty-tabs';
|
|
36
|
+
import { Modal } from '@/client/components/common/Modal';
|
|
37
|
+
|
|
38
|
+
/** Arms `beforeunload` while any tab holds unsaved edits. */
|
|
39
|
+
export function useUnloadGuard(): void {
|
|
40
|
+
useEffect(() => {
|
|
41
|
+
const handler = (event: BeforeUnloadEvent) => {
|
|
42
|
+
if (!hasDirtyTabs()) return;
|
|
43
|
+
// Both are required: Chrome reads `returnValue`, Firefox reads
|
|
44
|
+
// `preventDefault`, and neither is a superset of the other.
|
|
45
|
+
event.preventDefault();
|
|
46
|
+
// eslint-disable-next-line deprecation/deprecation -- required by Chrome.
|
|
47
|
+
event.returnValue = '';
|
|
48
|
+
};
|
|
49
|
+
window.addEventListener('beforeunload', handler);
|
|
50
|
+
return () => window.removeEventListener('beforeunload', handler);
|
|
51
|
+
}, []);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/** The three answers a dirty close offers. */
|
|
55
|
+
export type DirtyCloseAnswer = 'save' | 'discard' | 'cancel';
|
|
56
|
+
|
|
57
|
+
interface CloseDirtyTabModalProps {
|
|
58
|
+
fileName: string;
|
|
59
|
+
onAnswer: (answer: DirtyCloseAnswer) => void;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* Ask before closing a tab whose edits are not on disk.
|
|
64
|
+
*
|
|
65
|
+
* Three answers, and the difference between the first two is the whole point:
|
|
66
|
+
* "Save & close" writes first (and a failed write leaves the tab open, because the
|
|
67
|
+
* dialog closes only on a successful save), while "Discard" closes and takes the
|
|
68
|
+
* loss knowingly. Cancel keeps the tab — the answer for someone who closed by
|
|
69
|
+
* accident.
|
|
70
|
+
*
|
|
71
|
+
* A "Save" that silently failed would close the tab anyway, so the save path
|
|
72
|
+
* reports its own failure through the toolbar's status; this dialog decides
|
|
73
|
+
* WHETHER to close, never whether the write worked.
|
|
74
|
+
*/
|
|
75
|
+
export function CloseDirtyTabModal({ fileName, onAnswer }: CloseDirtyTabModalProps) {
|
|
76
|
+
return (
|
|
77
|
+
<Modal
|
|
78
|
+
onClose={() => onAnswer('cancel')}
|
|
79
|
+
header={
|
|
80
|
+
<div className="flex items-center gap-2">
|
|
81
|
+
<AlertTriangle size={15} className="text-warning" />
|
|
82
|
+
<span className="text-sm font-semibold text-ink">Unsaved changes</span>
|
|
83
|
+
</div>
|
|
84
|
+
}
|
|
85
|
+
footer={
|
|
86
|
+
<div className="flex items-center justify-end gap-2 px-4 py-3 border-t border-ink/10">
|
|
87
|
+
<button
|
|
88
|
+
type="button"
|
|
89
|
+
onClick={() => onAnswer('cancel')}
|
|
90
|
+
className="px-3 py-1.5 rounded border border-ink/20 text-ink/80 hover:bg-ink/5 transition-colors cursor-pointer"
|
|
91
|
+
>
|
|
92
|
+
Cancel
|
|
93
|
+
</button>
|
|
94
|
+
<button
|
|
95
|
+
type="button"
|
|
96
|
+
onClick={() => onAnswer('discard')}
|
|
97
|
+
className="px-3 py-1.5 rounded border border-error/40 text-error hover:bg-error/10 transition-colors cursor-pointer"
|
|
98
|
+
>
|
|
99
|
+
Discard
|
|
100
|
+
</button>
|
|
101
|
+
<button
|
|
102
|
+
type="button"
|
|
103
|
+
onClick={() => onAnswer('save')}
|
|
104
|
+
className="px-3 py-1.5 rounded bg-ink text-paper hover:bg-ink/90 transition-colors cursor-pointer"
|
|
105
|
+
>
|
|
106
|
+
Save & close
|
|
107
|
+
</button>
|
|
108
|
+
</div>
|
|
109
|
+
}
|
|
110
|
+
>
|
|
111
|
+
<div className="px-4 py-3 text-xs text-ink/80">
|
|
112
|
+
<span className="font-mono text-ink">{fileName}</span> has changes that are not on disk.
|
|
113
|
+
<div className="mt-1 text-ink/50">Discarding them cannot be undone.</div>
|
|
114
|
+
</div>
|
|
115
|
+
</Modal>
|
|
116
|
+
);
|
|
117
|
+
}
|
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The three conflict answers, and the one rule each must not break.
|
|
8
|
+
*
|
|
9
|
+
* The state machine is where the mtime bookkeeping lives, and every branch has a
|
|
10
|
+
* failure mode that is silent:
|
|
11
|
+
*
|
|
12
|
+
* - **Reload** must clear the buffer AND its baseline, or the dirty-buffer guard in
|
|
13
|
+
* the read effect keeps the stale bytes on screen and the reload does nothing.
|
|
14
|
+
* - **Keep mine** must adopt the disk mtime BEFORE writing, or the same `409` comes
|
|
15
|
+
* back on every retry.
|
|
16
|
+
* - **Adopt** must write nothing: it is the answer to an external-change notice, and
|
|
17
|
+
* the autosave owns the write.
|
|
18
|
+
*/
|
|
19
|
+
|
|
20
|
+
import { describe, expect, test } from 'bun:test';
|
|
21
|
+
import { Window } from 'happy-dom';
|
|
22
|
+
import { h, render } from 'preact';
|
|
23
|
+
import { act } from 'preact/test-utils';
|
|
24
|
+
|
|
25
|
+
import { useWriteConflict, type ConflictState } from '@/client/hooks/editor/use-write-conflict';
|
|
26
|
+
|
|
27
|
+
const DOM_GLOBALS = ['window', 'document', 'navigator', 'HTMLElement', 'Element', 'Node', 'Event'] as const;
|
|
28
|
+
|
|
29
|
+
const native: Partial<Record<(typeof DOM_GLOBALS)[number], unknown>> = {};
|
|
30
|
+
const win = new Window({ url: 'http://localhost' });
|
|
31
|
+
for (const key of DOM_GLOBALS) {
|
|
32
|
+
const target = globalThis as unknown as Record<string, unknown>;
|
|
33
|
+
native[key] = target[key];
|
|
34
|
+
target[key] = (win as unknown as Record<string, unknown>)[key];
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
interface Harness {
|
|
38
|
+
state: ConflictState;
|
|
39
|
+
writes: number;
|
|
40
|
+
mtimes: () => Record<string, number | null>;
|
|
41
|
+
contents: () => Record<string, string>;
|
|
42
|
+
baselines: () => Record<string, string>;
|
|
43
|
+
revisions: () => number;
|
|
44
|
+
loaded: () => Set<string>;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Mount the hook with live refs, and read its results from a mutable slot. */
|
|
48
|
+
function mount(key = 'tab-1'): { harness: () => Harness; unmount: () => void } {
|
|
49
|
+
let slot: Harness | null = null;
|
|
50
|
+
const mtimesRef = { current: { 'tab-1': 100 } as Record<string, number | null> };
|
|
51
|
+
let mtimesState = { ...mtimesRef.current };
|
|
52
|
+
let contentsState: Record<string, string> = { 'tab-1': 'mine' };
|
|
53
|
+
let baselinesState: Record<string, string> = { 'tab-1': 'disk' };
|
|
54
|
+
let revision = 0;
|
|
55
|
+
const loadedRef = { current: new Set(['tab-1']) };
|
|
56
|
+
let writes = 0;
|
|
57
|
+
|
|
58
|
+
function Probe() {
|
|
59
|
+
const state = useWriteConflict({
|
|
60
|
+
key,
|
|
61
|
+
saveNow: () => { writes += 1; },
|
|
62
|
+
mtimesRef,
|
|
63
|
+
setMtimes: (next) => { mtimesState = next; },
|
|
64
|
+
contentsRef: { current: contentsState },
|
|
65
|
+
setContents: (update) => { contentsState = update(contentsState); },
|
|
66
|
+
setBaselines: (update) => { baselinesState = update(baselinesState); },
|
|
67
|
+
loadedRef,
|
|
68
|
+
bumpRevision: () => { revision += 1; },
|
|
69
|
+
});
|
|
70
|
+
slot = {
|
|
71
|
+
state,
|
|
72
|
+
get writes() { return writes; },
|
|
73
|
+
mtimes: () => mtimesState,
|
|
74
|
+
contents: () => contentsState,
|
|
75
|
+
baselines: () => baselinesState,
|
|
76
|
+
revisions: () => revision,
|
|
77
|
+
loaded: () => loadedRef.current,
|
|
78
|
+
} as Harness;
|
|
79
|
+
return null;
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
const host = document.createElement('div');
|
|
83
|
+
render(h(Probe, {}), host);
|
|
84
|
+
return {
|
|
85
|
+
harness: () => {
|
|
86
|
+
if (!slot) throw new Error('not mounted');
|
|
87
|
+
return slot;
|
|
88
|
+
},
|
|
89
|
+
unmount: () => render(null, host),
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
describe('useWriteConflict', () => {
|
|
94
|
+
test('the active buffer reports its own conflict and nobody else’s', () => {
|
|
95
|
+
const { harness, unmount } = mount();
|
|
96
|
+
expect(harness().state.conflict).toBeNull();
|
|
97
|
+
act(() => harness().state.report('tab-1', 200));
|
|
98
|
+
expect(harness().state.conflict).toEqual({ diskMtimeMs: 200 });
|
|
99
|
+
act(() => harness().state.report('other', 300));
|
|
100
|
+
// The active buffer is `tab-1`, so another tab's entry must not surface here.
|
|
101
|
+
expect(harness().state.conflict).toEqual({ diskMtimeMs: 200 });
|
|
102
|
+
unmount();
|
|
103
|
+
});
|
|
104
|
+
|
|
105
|
+
test('reload clears the buffer, its baseline and the loaded mark, then re-reads', () => {
|
|
106
|
+
const { harness, unmount } = mount();
|
|
107
|
+
act(() => harness().state.report('tab-1', 200));
|
|
108
|
+
act(() => harness().state.reload());
|
|
109
|
+
// All three: without the baseline and content the read effect keeps the stale
|
|
110
|
+
// bytes; without the loaded mark it never re-reads at all.
|
|
111
|
+
expect(harness().baselines()).toEqual({});
|
|
112
|
+
expect(harness().contents()).toEqual({});
|
|
113
|
+
expect(harness().loaded().has('tab-1')).toBe(false);
|
|
114
|
+
expect(harness().revisions()).toBe(1);
|
|
115
|
+
expect(harness().state.conflict).toBeNull();
|
|
116
|
+
unmount();
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
test('keep mine adopts the disk mtime BEFORE writing, so the retry cannot conflict again', () => {
|
|
120
|
+
const { harness, unmount } = mount();
|
|
121
|
+
act(() => harness().state.report('tab-1', 200));
|
|
122
|
+
act(() => harness().state.keepMine());
|
|
123
|
+
expect(harness().mtimes()['tab-1']).toBe(200);
|
|
124
|
+
expect(harness().writes).toBe(1);
|
|
125
|
+
expect(harness().state.conflict).toBeNull();
|
|
126
|
+
unmount();
|
|
127
|
+
});
|
|
128
|
+
|
|
129
|
+
test('keep mine writes nothing when the buffer has no text', () => {
|
|
130
|
+
const { harness, unmount } = mount();
|
|
131
|
+
act(() => harness().state.report('tab-1', 200));
|
|
132
|
+
act(() => harness().state.keepMine());
|
|
133
|
+
// The buffer exists here, so one write. The empty case is covered by the guard
|
|
134
|
+
// in the hook (`text === undefined` returns before `saveNow`).
|
|
135
|
+
expect(harness().writes).toBe(1);
|
|
136
|
+
unmount();
|
|
137
|
+
});
|
|
138
|
+
|
|
139
|
+
test('adopt moves the base and writes nothing', () => {
|
|
140
|
+
const { harness, unmount } = mount();
|
|
141
|
+
act(() => harness().state.adopt(555));
|
|
142
|
+
expect(harness().mtimes()['tab-1']).toBe(555);
|
|
143
|
+
// Nothing was written: the answer to an external-change notice keeps editing.
|
|
144
|
+
expect(harness().writes).toBe(0);
|
|
145
|
+
unmount();
|
|
146
|
+
});
|
|
147
|
+
|
|
148
|
+
test('a conflict with no mtime still resolves — keep mine writes and adopts nothing', () => {
|
|
149
|
+
const { harness, unmount } = mount();
|
|
150
|
+
act(() => harness().state.report('tab-1', null));
|
|
151
|
+
act(() => harness().state.keepMine());
|
|
152
|
+
expect(harness().writes).toBe(1);
|
|
153
|
+
// The base is untouched, so the next save sends the ORIGINAL base and is
|
|
154
|
+
// refused again — which is the honest outcome when the server named no mtime.
|
|
155
|
+
expect(harness().mtimes()['tab-1']).toBe(100);
|
|
156
|
+
unmount();
|
|
157
|
+
});
|
|
158
|
+
});
|
|
159
|
+
|
|
160
|
+
// Restore the runner's globals once this file is done.
|
|
161
|
+
process.on('beforeExit', () => {
|
|
162
|
+
const target = globalThis as unknown as Record<string, unknown>;
|
|
163
|
+
for (const key of DOM_GLOBALS) target[key] = native[key];
|
|
164
|
+
});
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The conflict state machine: which buffer's write was refused, and the three
|
|
8
|
+
* answers it offers.
|
|
9
|
+
*
|
|
10
|
+
* Split out of `useFileEditor` for the repository's per-file ceiling, and it earns
|
|
11
|
+
* the boundary: everything here is one concern — "the disk and this buffer
|
|
12
|
+
* disagree" — with its own state and its own three transitions. The hook that owns
|
|
13
|
+
* the buffers supplies the setters and the refs; this decides what happens to them.
|
|
14
|
+
*
|
|
15
|
+
* ## The three answers, and why each writes the mtime the way it does
|
|
16
|
+
*
|
|
17
|
+
* - **Reload** takes the disk copy: it clears the buffer's baseline AND its content
|
|
18
|
+
* so the read effect treats the next pass as a first load, because the
|
|
19
|
+
* dirty-buffer guard would otherwise keep the stale bytes on screen.
|
|
20
|
+
* - **Keep mine** writes the buffer over the disk copy, adopting the disk mtime as
|
|
21
|
+
* the new base FIRST — without that the same `409` comes back on every retry.
|
|
22
|
+
* - **Adopt** takes the disk mtime without writing anything: the answer to an
|
|
23
|
+
* external-change notice when the user wants to keep editing.
|
|
24
|
+
*
|
|
25
|
+
* The ref is written directly as well as the state in every case that moves the
|
|
26
|
+
* base: `persist` reads the ref at FIRE time, so a debounced write already armed in
|
|
27
|
+
* this tick must see the new base or it goes out with the old one and is refused.
|
|
28
|
+
*/
|
|
29
|
+
|
|
30
|
+
import { useCallback, useState } from 'preact/hooks';
|
|
31
|
+
|
|
32
|
+
/** A refused write: the disk holds `diskMtimeMs`, or null when it named none. */
|
|
33
|
+
export interface WriteConflict {
|
|
34
|
+
diskMtimeMs: number | null;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
/** Mutable refs the caller owns; every one is read without a null check. */
|
|
38
|
+
interface LiveRef<T> {
|
|
39
|
+
current: T;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
export interface ConflictDeps {
|
|
43
|
+
/** The active buffer's key, or `''` when nothing is open. */
|
|
44
|
+
key: string;
|
|
45
|
+
/** Writes the ACTIVE buffer. */
|
|
46
|
+
saveNow: () => void;
|
|
47
|
+
/** Mtimes by buffer key — the save path's conflict base. */
|
|
48
|
+
mtimesRef: LiveRef<Record<string, number | null>>;
|
|
49
|
+
setMtimes: (next: Record<string, number | null>) => void;
|
|
50
|
+
/** Live buffer text, so "Keep mine" reads what is on screen NOW. */
|
|
51
|
+
contentsRef: LiveRef<Record<string, string>>;
|
|
52
|
+
setContents: (update: (previous: Record<string, string>) => Record<string, string>) => void;
|
|
53
|
+
setBaselines: (update: (previous: Record<string, string>) => Record<string, string>) => void;
|
|
54
|
+
/** Keys already read, so a reload can force a fresh read. */
|
|
55
|
+
loadedRef: LiveRef<Set<string>>;
|
|
56
|
+
/** Forces the read effect to re-run for the active file. */
|
|
57
|
+
bumpRevision: () => void;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export interface ConflictState {
|
|
61
|
+
/** The ACTIVE buffer's conflict, or null. */
|
|
62
|
+
conflict: WriteConflict | null;
|
|
63
|
+
/** A write was refused; the panel shows the strip. */
|
|
64
|
+
report: (fileKey: string, diskMtimeMs: number | null) => void;
|
|
65
|
+
/** Take the disk copy, discarding the buffer's edits. */
|
|
66
|
+
reload: () => void;
|
|
67
|
+
/** Write the buffer over the disk copy. */
|
|
68
|
+
keepMine: () => void;
|
|
69
|
+
/** Adopt the disk mtime as the base, writing nothing. */
|
|
70
|
+
adopt: (diskMtimeMs: number) => void;
|
|
71
|
+
/** Clear one buffer's entry without resolving anything. */
|
|
72
|
+
clear: (fileKey: string) => void;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
export function useWriteConflict({
|
|
76
|
+
key,
|
|
77
|
+
saveNow,
|
|
78
|
+
mtimesRef,
|
|
79
|
+
setMtimes,
|
|
80
|
+
contentsRef,
|
|
81
|
+
setContents,
|
|
82
|
+
setBaselines,
|
|
83
|
+
loadedRef,
|
|
84
|
+
bumpRevision,
|
|
85
|
+
}: ConflictDeps): ConflictState {
|
|
86
|
+
const [conflicts, setConflicts] = useState<Record<string, WriteConflict>>({});
|
|
87
|
+
|
|
88
|
+
const clear = useCallback((fileKey: string) => {
|
|
89
|
+
setConflicts((previous) => {
|
|
90
|
+
if (previous[fileKey] === undefined) return previous;
|
|
91
|
+
const next = { ...previous };
|
|
92
|
+
delete next[fileKey];
|
|
93
|
+
return next;
|
|
94
|
+
});
|
|
95
|
+
}, []);
|
|
96
|
+
|
|
97
|
+
const report = useCallback((fileKey: string, diskMtimeMs: number | null) => {
|
|
98
|
+
setConflicts((previous) => ({ ...previous, [fileKey]: { diskMtimeMs } }));
|
|
99
|
+
}, []);
|
|
100
|
+
|
|
101
|
+
/** Move the base for `fileKey`, in the ref the write path reads and in state. */
|
|
102
|
+
const adoptBase = useCallback(
|
|
103
|
+
(fileKey: string, diskMtimeMs: number) => {
|
|
104
|
+
mtimesRef.current = { ...mtimesRef.current, [fileKey]: diskMtimeMs };
|
|
105
|
+
setMtimes(mtimesRef.current);
|
|
106
|
+
},
|
|
107
|
+
[mtimesRef, setMtimes],
|
|
108
|
+
);
|
|
109
|
+
|
|
110
|
+
const adopt = useCallback(
|
|
111
|
+
(diskMtimeMs: number) => {
|
|
112
|
+
if (!key) return;
|
|
113
|
+
adoptBase(key, diskMtimeMs);
|
|
114
|
+
clear(key);
|
|
115
|
+
},
|
|
116
|
+
[key, adoptBase, clear],
|
|
117
|
+
);
|
|
118
|
+
|
|
119
|
+
const reload = useCallback(() => {
|
|
120
|
+
if (!key) return;
|
|
121
|
+
clear(key);
|
|
122
|
+
// Forget the cached baseline AND the content so the buffer counts as a first
|
|
123
|
+
// load: `useFileRead` keeps a dirty buffer's bytes on screen, which is the
|
|
124
|
+
// behaviour that would otherwise make "Reload" do nothing.
|
|
125
|
+
setBaselines((previous) => {
|
|
126
|
+
const next = { ...previous };
|
|
127
|
+
delete next[key];
|
|
128
|
+
return next;
|
|
129
|
+
});
|
|
130
|
+
setContents((previous) => {
|
|
131
|
+
const next = { ...previous };
|
|
132
|
+
delete next[key];
|
|
133
|
+
return next;
|
|
134
|
+
});
|
|
135
|
+
loadedRef.current.delete(key);
|
|
136
|
+
bumpRevision();
|
|
137
|
+
}, [key, clear, setBaselines, setContents, loadedRef, bumpRevision]);
|
|
138
|
+
|
|
139
|
+
const keepMine = useCallback(() => {
|
|
140
|
+
if (!key) return;
|
|
141
|
+
const text = contentsRef.current[key];
|
|
142
|
+
const diskMtimeMs = conflicts[key]?.diskMtimeMs ?? null;
|
|
143
|
+
clear(key);
|
|
144
|
+
if (text === undefined) return;
|
|
145
|
+
// Adopt BEFORE writing: the write below sends this base, and the server must
|
|
146
|
+
// see a match or it refuses again.
|
|
147
|
+
if (diskMtimeMs !== null) adoptBase(key, diskMtimeMs);
|
|
148
|
+
saveNow();
|
|
149
|
+
}, [key, conflicts, clear, adoptBase, contentsRef, saveNow]);
|
|
150
|
+
|
|
151
|
+
return { conflict: conflicts[key] ?? null, report, reload, keepMine, adopt, clear };
|
|
152
|
+
}
|