@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
|
@@ -1,49 +1,33 @@
|
|
|
1
1
|
import { useEffect, useRef, useState } from 'preact/hooks';
|
|
2
|
-
import type { TargetedKeyboardEvent } from 'preact';
|
|
3
|
-
import { FileIcon } from '@/client/components/common/file-icon';
|
|
4
2
|
import { EditorTabs } from '@/client/components/workspace/editor/Tabs';
|
|
5
|
-
import {
|
|
3
|
+
import { isFindBarCommand, type EditorCommand } from '@/shared/lib/code/editor/keymap';
|
|
6
4
|
import { EDITOR_DEFAULT_FONT_SIZE } from '@/shared/lib/code/editor/typography';
|
|
7
5
|
import { useEditorFontStack } from '@/client/hooks/editor/font';
|
|
8
6
|
import { useEditorTheme } from '@/client/hooks/editor/theme';
|
|
9
7
|
import type { CodeSurfaceHandle } from '@/client/components/common/code-surface';
|
|
10
|
-
import { resolveBinding } from '@/shared/lib/ui/key-binding';
|
|
11
8
|
import { useActiveEditorPanel } from '@/client/components/workspace/plugin-panel/resolve';
|
|
12
9
|
import { EditorBody } from '@/client/components/workspace/editor/Body';
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
10
|
+
import { PluginColumn } from '@/client/components/workspace/editor/PluginColumn';
|
|
11
|
+
import { EmptyEditor } from '@/client/components/workspace/editor/EmptyEditor';
|
|
12
|
+
|
|
15
13
|
import { usePluginFileView } from '@/client/components/workspace/editor/plugin-file-view';
|
|
16
|
-
import { RENDERED_VIEWERS, viewerKindFor } from '@/shared/lib/fs/document-kind';
|
|
17
14
|
import { useSessionState } from '@/client/hooks/workspace/session-state';
|
|
18
15
|
import { useSessionStateContext } from '@/client/hooks/workspace/session-state/context';
|
|
19
|
-
import { getSessionValue } from '@/shared/lib/workspace/session-state/store';
|
|
20
16
|
import { useFileEditor } from '@/client/hooks/editor/use-file-editor';
|
|
21
17
|
import { useEditorFind } from '@/client/hooks/editor/use-editor-find';
|
|
22
18
|
import { useSearchRevealTarget } from '@/client/hooks/editor/use-search-reveal';
|
|
19
|
+
import { useSearchRevealJump } from '@/client/hooks/editor/use-search-reveal-jump';
|
|
20
|
+
import { useEditorTabState } from '@/client/hooks/editor/use-editor-tab-state';
|
|
23
21
|
import { useEditorOutlineBridge } from '@/client/hooks/editor/use-editor-outline-bridge';
|
|
24
22
|
import { useMissingFiles } from '@/client/hooks/workspace/missing-files';
|
|
25
|
-
import
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
/** Replace a diff tab with the plain editor tab for the same file. */
|
|
34
|
-
onConvertDiffToEditor: (id: number | string) => void;
|
|
35
|
-
refreshKey?: number;
|
|
36
|
-
onFileSaved?: () => void;
|
|
37
|
-
/**
|
|
38
|
-
* A `plugin:<id>` key while a plugin owns the column, or null.
|
|
39
|
-
*
|
|
40
|
-
* There is no tab for it: the plugin takes the WHOLE surface, so the host has
|
|
41
|
-
* no tab strip to draw and no file to show beside it. That is the difference
|
|
42
|
-
* between a `panel` and an editor tab — the column is a place a view can live,
|
|
43
|
-
* not a container the host fills with chrome.
|
|
44
|
-
*/
|
|
45
|
-
activeEditorPanelKey?: string | null;
|
|
46
|
-
}
|
|
23
|
+
import { retainDirtyTabs } from '@/client/lib/editor-dirty-tabs';
|
|
24
|
+
import { EditorPane } from '@/client/components/workspace/editor/Pane';
|
|
25
|
+
import { SplitColumn } from '@/client/components/workspace/editor/SplitColumn';
|
|
26
|
+
import { useSplitEditor } from '@/client/hooks/editor/use-split-editor';
|
|
27
|
+
import { useExternalChangeNotice } from '@/client/hooks/editor/use-external-change-notice';
|
|
28
|
+
import { useEditorPanelKeys } from '@/client/hooks/editor/use-editor-panel-keys';
|
|
29
|
+
import { useCloseGuard } from '@/client/hooks/editor/use-close-guard';
|
|
30
|
+
import type { EditorProps } from '@/client/components/workspace/editor/props';
|
|
47
31
|
|
|
48
32
|
export function Editor({
|
|
49
33
|
className = '',
|
|
@@ -54,16 +38,42 @@ export function Editor({
|
|
|
54
38
|
onConvertDiffToEditor,
|
|
55
39
|
refreshKey = 0,
|
|
56
40
|
onFileSaved,
|
|
41
|
+
onOpenPath,
|
|
42
|
+
onReopenClosed,
|
|
43
|
+
reopenableCount,
|
|
44
|
+
onCopyPath,
|
|
45
|
+
onRevealInFiles,
|
|
46
|
+
rootPath = null,
|
|
47
|
+
repoPath = null,
|
|
57
48
|
activeEditorPanelKey = null,
|
|
49
|
+
forcedActiveFileId = null,
|
|
50
|
+
asSplitPane = false,
|
|
58
51
|
}: EditorProps) {
|
|
59
|
-
|
|
60
|
-
|
|
52
|
+
// A split pane renders the tab it was given; the left pane follows the strip's active id.
|
|
53
|
+
const resolvedActiveFileId = asSplitPane ? forcedActiveFileId : activeFileId;
|
|
54
|
+
const activeFile = openedFiles.find(f => f.id === resolvedActiveFileId);
|
|
55
|
+
|
|
61
56
|
const [previewMode, setPreviewMode, previewReady] = useSessionState<Record<string | number, boolean>>('editor.previewMode', {});
|
|
62
57
|
const [zoomLevel, setZoomLevel] = useSessionState<number>('editor.zoomLevel', EDITOR_DEFAULT_FONT_SIZE);
|
|
63
58
|
const [isMaximized, setIsMaximized] = useState(false);
|
|
64
59
|
const [wordWrap, setWordWrap] = useSessionState<boolean>('editor.wordWrap', true);
|
|
60
|
+
// The panel's own transient UI: the palette, the go-to-line request, quick open and Save
|
|
61
|
+
// As. All four are component state (never persisted) because each is a thing the user is
|
|
62
|
+
// doing right now.
|
|
65
63
|
const [paletteOpen, setPaletteOpen] = useState(false);
|
|
64
|
+
// A counter, not a boolean: the dialog lives in the document (where the caret and the
|
|
65
|
+
// handle are), so a boolean would need a matching "closed" write from there.
|
|
66
|
+
const [goToLineRequest, setGoToLineRequest] = useState(0);
|
|
67
|
+
const [quickOpen, setQuickOpen] = useState(false);
|
|
68
|
+
const [saveAsOpen, setSaveAsOpen] = useState(false);
|
|
66
69
|
const { sessionId } = useSessionStateContext();
|
|
70
|
+
// The split's state and its derived values. `enabled: false` in a split pane, which never
|
|
71
|
+
// splits again — the column has two panes, not a tree.
|
|
72
|
+
const splitState = useSplitEditor({
|
|
73
|
+
openedFiles,
|
|
74
|
+
activeFileId: resolvedActiveFileId,
|
|
75
|
+
enabled: !asSplitPane,
|
|
76
|
+
});
|
|
67
77
|
const surfaceRef = useRef<CodeSurfaceHandle | null>(null);
|
|
68
78
|
const editorFontFamily = useEditorFontStack();
|
|
69
79
|
const editorTheme = useEditorTheme();
|
|
@@ -94,6 +104,24 @@ export function Editor({
|
|
|
94
104
|
// view, and the resolver is cheap when no plugin contributed one.
|
|
95
105
|
const pluginFileView = usePluginFileView({ path: activeFile?.path ?? '', content: editor.content, language: editor.language });
|
|
96
106
|
|
|
107
|
+
// The disk-change strip and its answer; the rules live in the hook.
|
|
108
|
+
const { externalChange, keepMine: keepMineAgainstDisk } = useExternalChangeNotice({
|
|
109
|
+
file: activeFile,
|
|
110
|
+
baseMtimeMs: editor.baseMtimeMs,
|
|
111
|
+
dirty: editor.isDirty,
|
|
112
|
+
revision: refreshKey,
|
|
113
|
+
adoptDiskMtime: editor.adoptDiskMtime,
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
// Built after the editor: the guard writes through `editor.saveNow`.
|
|
117
|
+
const closeGuard = useCloseGuard({
|
|
118
|
+
openedFiles,
|
|
119
|
+
activeFileId: resolvedActiveFileId,
|
|
120
|
+
onSelectFile,
|
|
121
|
+
onCloseFile,
|
|
122
|
+
saveNow: editor.saveNow,
|
|
123
|
+
});
|
|
124
|
+
|
|
97
125
|
const find = useEditorFind({
|
|
98
126
|
text: editor.content,
|
|
99
127
|
documentKey: `${activeFile?.id ?? ''}\u0000${editor.language}`,
|
|
@@ -104,34 +132,14 @@ export function Editor({
|
|
|
104
132
|
toggleWordWrap: () => setWordWrap((previous) => !previous),
|
|
105
133
|
});
|
|
106
134
|
|
|
107
|
-
// A search row's hand-off: the
|
|
108
|
-
//
|
|
109
|
-
// the caret lands on the hit. Served once the buffer is trustworthy — a file
|
|
110
|
-
// still loading, or one whose read failed, has no text to match against.
|
|
135
|
+
// A search row's hand-off: open the bar on the same query and land the caret on
|
|
136
|
+
// the hit. Owned by a hook because the "fire once per request" rule is subtle.
|
|
111
137
|
const searchReveal = useSearchRevealTarget(
|
|
112
138
|
activeFile?.path ?? null,
|
|
113
139
|
editor.content,
|
|
114
140
|
editor.loaded && !editor.loadError,
|
|
115
141
|
);
|
|
116
|
-
|
|
117
|
-
// buffer), but the JUMP must fire once per request: keying the effect on the
|
|
118
|
-
// target would drag the view back to the match after every keystroke.
|
|
119
|
-
const firedRequestRef = useRef<unknown>(null);
|
|
120
|
-
const revealMatchRef = useRef(find.revealMatch);
|
|
121
|
-
revealMatchRef.current = find.revealMatch;
|
|
122
|
-
useEffect(() => {
|
|
123
|
-
if (!searchReveal || firedRequestRef.current === searchReveal.request) return;
|
|
124
|
-
firedRequestRef.current = searchReveal.request;
|
|
125
|
-
revealMatchRef.current({
|
|
126
|
-
query: searchReveal.request.query,
|
|
127
|
-
options: searchReveal.request.options,
|
|
128
|
-
line: searchReveal.request.line,
|
|
129
|
-
});
|
|
130
|
-
}, [searchReveal]);
|
|
131
|
-
// The capture handler below is rebuilt on every render anyway (it reads the
|
|
132
|
-
// find state), so it is kept in a ref and the listener attached once.
|
|
133
|
-
const findRef = useRef(find);
|
|
134
|
-
findRef.current = find;
|
|
142
|
+
useSearchRevealJump({ searchReveal, revealMatch: find.revealMatch });
|
|
135
143
|
|
|
136
144
|
/**
|
|
137
145
|
* Publish what this editor is drawing (for the Files panel's outline), and
|
|
@@ -157,35 +165,22 @@ export function Editor({
|
|
|
157
165
|
|
|
158
166
|
useEffect(() => {
|
|
159
167
|
editor.retain(openedFiles.map(f => f.id));
|
|
168
|
+
// The dirty store follows the same lifecycle as the content cache: a tab that
|
|
169
|
+
// left the strip must not keep an entry a later tab could inherit.
|
|
170
|
+
retainDirtyTabs(openedFiles.map((file) => file.id));
|
|
160
171
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
161
172
|
}, [openedFiles]);
|
|
162
173
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
if (stored && stored[id] !== undefined) return;
|
|
174
|
-
setPreviewMode(prev => (prev[id] === undefined ? { ...prev, [id]: true } : prev));
|
|
175
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
176
|
-
}, [previewReady, activeFile]);
|
|
177
|
-
|
|
178
|
-
useEffect(() => {
|
|
179
|
-
const handleKeyDown = (e: globalThis.KeyboardEvent) => {
|
|
180
|
-
if ((e.ctrlKey || e.metaKey) && e.key === 's') {
|
|
181
|
-
e.preventDefault();
|
|
182
|
-
editor.saveNow();
|
|
183
|
-
}
|
|
184
|
-
};
|
|
185
|
-
window.addEventListener('keydown', handleKeyDown);
|
|
186
|
-
return () => window.removeEventListener('keydown', handleKeyDown);
|
|
187
|
-
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
188
|
-
}, [editor.saveNow]);
|
|
174
|
+
// Publish which tabs hold unsaved edits (the strip's dot, the close guard, the
|
|
175
|
+
// unload prompt) and seed the default preview mode for a rendered file.
|
|
176
|
+
useEditorTabState({
|
|
177
|
+
openedFiles,
|
|
178
|
+
dirtyKeys: editor.dirtyKeys,
|
|
179
|
+
activeFile,
|
|
180
|
+
previewReady,
|
|
181
|
+
setPreviewMode,
|
|
182
|
+
sessionId,
|
|
183
|
+
});
|
|
189
184
|
|
|
190
185
|
const togglePreview = () => {
|
|
191
186
|
if (!activeFile) return;
|
|
@@ -199,61 +194,31 @@ export function Editor({
|
|
|
199
194
|
*/
|
|
200
195
|
const runCommand = (command: EditorCommand) => {
|
|
201
196
|
if (isFindBarCommand(command)) {
|
|
202
|
-
|
|
197
|
+
find.runCommand(command);
|
|
203
198
|
return;
|
|
204
199
|
}
|
|
205
200
|
if (command === 'toggleWordWrap') {
|
|
206
201
|
setWordWrap((previous) => !previous);
|
|
207
202
|
return;
|
|
208
203
|
}
|
|
204
|
+
if (command === 'goToLine') {
|
|
205
|
+
setGoToLineRequest((previous) => previous + 1);
|
|
206
|
+
return;
|
|
207
|
+
}
|
|
209
208
|
// Everything else is the editor's, and it runs through the editor's own
|
|
210
209
|
// dispatcher — the palette is a second way IN, never a second implementation.
|
|
211
210
|
surfaceRef.current?.runCommand(command);
|
|
212
211
|
};
|
|
213
212
|
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
* The panel is the scope, not the window: another panel's text field keeps
|
|
224
|
-
* its own ⌘F, and the composer is untouched.
|
|
225
|
-
*/
|
|
226
|
-
const handlePanelKeyDown = (event: TargetedKeyboardEvent<HTMLDivElement>) => {
|
|
227
|
-
const current = findRef.current;
|
|
228
|
-
if (event.key === 'Escape') {
|
|
229
|
-
if (paletteOpen) {
|
|
230
|
-
event.preventDefault();
|
|
231
|
-
event.stopPropagation();
|
|
232
|
-
setPaletteOpen(false);
|
|
233
|
-
return;
|
|
234
|
-
}
|
|
235
|
-
if (!current.open) return;
|
|
236
|
-
event.preventDefault();
|
|
237
|
-
event.stopPropagation();
|
|
238
|
-
current.close();
|
|
239
|
-
return;
|
|
240
|
-
}
|
|
241
|
-
// ⌘⇧P opens the palette — the one chord that is not an editor command.
|
|
242
|
-
if ((event.metaKey || event.ctrlKey) && event.shiftKey && event.code === 'KeyP') {
|
|
243
|
-
event.preventDefault();
|
|
244
|
-
event.stopPropagation();
|
|
245
|
-
setPaletteOpen(true);
|
|
246
|
-
return;
|
|
247
|
-
}
|
|
248
|
-
// While the bar is open, an unmodified key in one of ITS fields belongs to
|
|
249
|
-
// the field — but F3 and the ⌘-chords below still dispatch, so stepping to
|
|
250
|
-
// the next match from inside the find field works.
|
|
251
|
-
const command = resolveBinding(EDITOR_KEY_BINDINGS, event);
|
|
252
|
-
if (!command || !isFindBarCommand(command)) return;
|
|
253
|
-
event.preventDefault();
|
|
254
|
-
event.stopPropagation();
|
|
255
|
-
runCommand(command);
|
|
256
|
-
};
|
|
213
|
+
const panelKeys = useEditorPanelKeys({
|
|
214
|
+
find,
|
|
215
|
+
paletteOpen,
|
|
216
|
+
setPaletteOpen,
|
|
217
|
+
runCommand,
|
|
218
|
+
saveNow: editor.saveNow,
|
|
219
|
+
openQuickOpen: () => setQuickOpen(true),
|
|
220
|
+
reopenClosed: onReopenClosed,
|
|
221
|
+
});
|
|
257
222
|
|
|
258
223
|
// The column belongs to a plugin while the layout says so. There is no tab
|
|
259
224
|
// strip in that mode: the plugin owns the whole surface, the way a right-panel
|
|
@@ -261,78 +226,123 @@ export function Editor({
|
|
|
261
226
|
const pluginColumn = useActiveEditorPanel(activeEditorPanelKey);
|
|
262
227
|
|
|
263
228
|
if (pluginColumn) {
|
|
264
|
-
return
|
|
265
|
-
<div className={`flex flex-col h-full bg-canvas ${className}`}>
|
|
266
|
-
<PluginIdProvider pluginId={pluginColumn.pluginId}>
|
|
267
|
-
<pluginColumn.Component sessionId={sessionId ?? null} workspacePath={null} />
|
|
268
|
-
</PluginIdProvider>
|
|
269
|
-
</div>
|
|
270
|
-
);
|
|
229
|
+
return <PluginColumn pluginId={pluginColumn.pluginId} Component={pluginColumn.Component} sessionId={sessionId} className={className} />;
|
|
271
230
|
}
|
|
272
231
|
|
|
273
|
-
|
|
274
|
-
if (openedFiles.length === 0) {
|
|
275
|
-
return (
|
|
276
|
-
<div className={`flex flex-col h-full bg-canvas items-center justify-center text-ink/40 ${className}`}>
|
|
277
|
-
<FileIcon name="placeholder.txt" size={48} className="mb-4 opacity-20" />
|
|
278
|
-
<p className="font-mono text-sm">Select a file to open</p>
|
|
279
|
-
</div>
|
|
280
|
-
);
|
|
281
|
-
}
|
|
232
|
+
if (openedFiles.length === 0) return <EmptyEditor className={className} />;
|
|
282
233
|
|
|
283
234
|
const viewerKind = editor.viewerKind;
|
|
284
235
|
const isPreview = activeFile ? previewMode[activeFile.id] : false;
|
|
285
236
|
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
237
|
+
// A spread rather than twenty inline props: the split renders this same panel twice, and
|
|
238
|
+
// two hand-written lists are how one pane gains a prop the other lacks.
|
|
239
|
+
const bodyProps = {
|
|
240
|
+
activeFile,
|
|
241
|
+
editor,
|
|
242
|
+
find,
|
|
243
|
+
surfaceRef,
|
|
244
|
+
pluginFileView,
|
|
245
|
+
wordWrap,
|
|
246
|
+
setWordWrap,
|
|
247
|
+
viewerKind,
|
|
248
|
+
isPreview: Boolean(isPreview),
|
|
249
|
+
isMaximized,
|
|
250
|
+
setIsMaximized,
|
|
251
|
+
zoomLevel,
|
|
252
|
+
setZoomLevel,
|
|
253
|
+
paletteOpen,
|
|
254
|
+
setPaletteOpen,
|
|
255
|
+
goToLineRequest,
|
|
256
|
+
onSaveAs: () => setSaveAsOpen(true),
|
|
257
|
+
quickOpen,
|
|
258
|
+
onCloseQuickOpen: () => setQuickOpen(false),
|
|
259
|
+
onOpenPath,
|
|
260
|
+
rootPath,
|
|
261
|
+
repoPath,
|
|
262
|
+
runCommand,
|
|
263
|
+
editorFontFamily,
|
|
264
|
+
editorTheme,
|
|
265
|
+
togglePreview,
|
|
266
|
+
revealActive: Boolean(searchReveal),
|
|
267
|
+
missing: activeFileMissing,
|
|
268
|
+
onConvertDiffToEditor,
|
|
269
|
+
onFileSaved,
|
|
270
|
+
};
|
|
289
271
|
|
|
290
|
-
return (
|
|
291
|
-
<div className={editorContainerClass} onKeyDownCapture={handlePanelKeyDown}>
|
|
292
|
-
<EditorTabs
|
|
293
|
-
openedFiles={openedFiles}
|
|
294
|
-
activeFileId={activeFileId}
|
|
295
|
-
onSelectFile={onSelectFile}
|
|
296
|
-
onCloseFile={onCloseFile}
|
|
297
|
-
missingIds={missingIds}
|
|
298
|
-
/>
|
|
299
272
|
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
runCommand={runCommand}
|
|
317
|
-
editorFontFamily={editorFontFamily}
|
|
318
|
-
editorTheme={editorTheme}
|
|
319
|
-
togglePreview={togglePreview}
|
|
320
|
-
revealActive={Boolean(searchReveal)}
|
|
321
|
-
missing={activeFileMissing}
|
|
322
|
-
onConvertDiffToEditor={onConvertDiffToEditor}
|
|
323
|
-
onFileSaved={onFileSaved}
|
|
324
|
-
/>
|
|
273
|
+
// The right pane IS this panel, so its props are this component's own. A record rather
|
|
274
|
+
// than a literal: a hand-written list is where a second pane silently loses a feature.
|
|
275
|
+
const panePropsForRightPane = (forcedActiveFileId: number | string) => ({
|
|
276
|
+
openedFiles,
|
|
277
|
+
activeFileId,
|
|
278
|
+
onSelectFile,
|
|
279
|
+
onCloseFile,
|
|
280
|
+
onConvertDiffToEditor,
|
|
281
|
+
refreshKey,
|
|
282
|
+
onFileSaved,
|
|
283
|
+
onOpenPath,
|
|
284
|
+
rootPath,
|
|
285
|
+
repoPath,
|
|
286
|
+
forcedActiveFileId,
|
|
287
|
+
asSplitPane: true,
|
|
288
|
+
});
|
|
325
289
|
|
|
326
|
-
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
290
|
+
// The strip, as one value: it is the LEFT pane's alone, and `EditorPane` drops it in a
|
|
291
|
+
// split pane (the tab order belongs to one owner).
|
|
292
|
+
const tabs = (
|
|
293
|
+
<EditorTabs
|
|
294
|
+
openedFiles={openedFiles}
|
|
295
|
+
activeFileId={activeFileId}
|
|
296
|
+
onSelectFile={onSelectFile}
|
|
297
|
+
onCloseFile={closeGuard.requestClose}
|
|
298
|
+
missingIds={missingIds}
|
|
299
|
+
onCopyPath={onCopyPath}
|
|
300
|
+
onRevealInFiles={onRevealInFiles}
|
|
301
|
+
onReopenClosed={onReopenClosed}
|
|
302
|
+
reopenableCount={reopenableCount}
|
|
303
|
+
onSplitTo={splitState.splitTo}
|
|
304
|
+
onUnsplit={splitState.close}
|
|
305
|
+
splitRightFileId={splitState.rightFile?.id ?? null}
|
|
306
|
+
/>
|
|
307
|
+
);
|
|
308
|
+
|
|
309
|
+
const paneBody = (
|
|
310
|
+
<EditorPane
|
|
311
|
+
className={className}
|
|
312
|
+
isMaximized={isMaximized}
|
|
313
|
+
onKeyDownCapture={panelKeys.onKeyDownCapture}
|
|
314
|
+
asSplitPane={asSplitPane}
|
|
315
|
+
tabs={tabs}
|
|
316
|
+
activeFile={activeFile}
|
|
317
|
+
editor={editor}
|
|
318
|
+
externalChange={externalChange}
|
|
319
|
+
conflict={editor.conflict}
|
|
320
|
+
onReload={editor.resolveConflictByReload}
|
|
321
|
+
onKeepMine={keepMineAgainstDisk}
|
|
322
|
+
body={<EditorBody {...bodyProps} />}
|
|
323
|
+
saveAsOpen={saveAsOpen}
|
|
324
|
+
onSaveAsClose={() => setSaveAsOpen(false)}
|
|
325
|
+
onSavedAs={(path) => {
|
|
326
|
+
setSaveAsOpen(false);
|
|
327
|
+
// The new file gets its OWN tab and the original stays open, which is what makes
|
|
328
|
+
// Save As reversible by closing one tab.
|
|
329
|
+
onOpenPath?.(path);
|
|
330
|
+
}}
|
|
331
|
+
closeGuard={closeGuard}
|
|
332
|
+
/>
|
|
333
|
+
);
|
|
334
|
+
|
|
335
|
+
if (!splitState.rightFile) return paneBody;
|
|
336
|
+
|
|
337
|
+
return (
|
|
338
|
+
<SplitColumn
|
|
339
|
+
fraction={splitState.fraction}
|
|
340
|
+
onFraction={splitState.setFraction}
|
|
341
|
+
rightPaneName={splitState.rightFile.name}
|
|
342
|
+
onClosePane={splitState.close}
|
|
343
|
+
rightPane={<Editor {...panePropsForRightPane(splitState.rightFile.id)} />}
|
|
344
|
+
>
|
|
345
|
+
{paneBody}
|
|
346
|
+
</SplitColumn>
|
|
337
347
|
);
|
|
338
348
|
}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The editor panel's prop contract.
|
|
8
|
+
*
|
|
9
|
+
* Split out of `index.tsx` for the repository's per-file ceiling, and it belongs here
|
|
10
|
+
* for the same reason `code-surface/props.ts` does: the layout, the phone and every test
|
|
11
|
+
* that mounts a panel name these, and importing a prop type from the component module
|
|
12
|
+
* couples them to the mount.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import type { OpenedFile } from '@/shared/types/fs';
|
|
16
|
+
|
|
17
|
+
export interface EditorProps {
|
|
18
|
+
className?: string;
|
|
19
|
+
openedFiles: OpenedFile[];
|
|
20
|
+
/** Restore the most recently closed tab (the strip's menu and `⌘⇧T`). */
|
|
21
|
+
onReopenClosed?: () => boolean;
|
|
22
|
+
/** How many tabs can still be reopened. */
|
|
23
|
+
reopenableCount?: () => number;
|
|
24
|
+
/** Copy a tab's workspace-relative path. */
|
|
25
|
+
onCopyPath?: (tab: OpenedFile) => void;
|
|
26
|
+
/** Reveal a tab's file in the Files panel. */
|
|
27
|
+
onRevealInFiles?: (tab: OpenedFile) => void;
|
|
28
|
+
activeFileId: number | string | null;
|
|
29
|
+
onSelectFile: (id: number | string) => void;
|
|
30
|
+
onCloseFile: (id: number | string) => void;
|
|
31
|
+
/** Replace a diff tab with the plain editor tab for the same file. */
|
|
32
|
+
onConvertDiffToEditor: (id: number | string) => void;
|
|
33
|
+
refreshKey?: number;
|
|
34
|
+
onFileSaved?: () => void;
|
|
35
|
+
/**
|
|
36
|
+
* Open a workspace-relative path in a tab.
|
|
37
|
+
*
|
|
38
|
+
* The quick-open picker needs it: it answers paths, and `handleOpenFile` is the
|
|
39
|
+
* one place a path becomes a tab (with the id scheme every other opener shares).
|
|
40
|
+
*/
|
|
41
|
+
onOpenPath?: (path: string) => void;
|
|
42
|
+
/** The workspace root and nested repo, so the file index is read from the right tree. */
|
|
43
|
+
rootPath?: string | null;
|
|
44
|
+
repoPath?: string | null;
|
|
45
|
+
/**
|
|
46
|
+
* A `plugin:<id>` key while a plugin owns the column, or null.
|
|
47
|
+
*
|
|
48
|
+
* There is no tab for it: the plugin takes the WHOLE surface, so the host has
|
|
49
|
+
* no tab strip to draw and no file to show beside it. That is the difference
|
|
50
|
+
* between a `panel` and an editor tab — the column is a place a view can live,
|
|
51
|
+
* not a container the host fills with chrome.
|
|
52
|
+
*/
|
|
53
|
+
activeEditorPanelKey?: string | null;
|
|
54
|
+
/**
|
|
55
|
+
* Render as a SPLIT PANE: draw the given tab, and draw no tab strip.
|
|
56
|
+
*
|
|
57
|
+
* The right pane is this same panel, so a split cannot have a feature the unsplit editor
|
|
58
|
+
* lacks. It is told which tab to show rather than keeping its own `activeFileId`, because
|
|
59
|
+
* the strip stays in the left pane and stays the single owner of the tab order.
|
|
60
|
+
*/
|
|
61
|
+
forcedActiveFileId?: number | string | null;
|
|
62
|
+
/** A split pane never splits again: the column has two panes, not a tree. */
|
|
63
|
+
asSplitPane?: boolean;
|
|
64
|
+
}
|