@kabmo-labs/kabmo 0.8.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 +52 -0
- package/dist/client/index.html +1 -1
- package/dist/client/index.js +336 -336
- package/dist/client/static/js/index-18xe7655.css +1 -0
- package/dist/client/static/js/{index-qwpvd9fv.js → index-nxpe7835.js} +933 -898
- package/package.json +11 -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 +122 -0
- package/src/client/components/common/code-surface/documents.ts +286 -0
- package/src/client/components/common/code-surface/extensions.test.ts +115 -0
- package/src/client/components/common/code-surface/extensions.ts +295 -0
- 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/handle.ts +102 -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 +283 -314
- package/src/client/components/common/code-surface/keymap.test.ts +133 -0
- package/src/client/components/common/code-surface/keymap.ts +256 -0
- 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/marks.ts +74 -0
- package/src/client/components/common/code-surface/props.ts +87 -0
- package/src/client/components/common/code-surface/shiki.ts +234 -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/sync.test.ts +185 -0
- package/src/client/components/common/code-surface/sync.ts +58 -0
- package/src/client/components/common/code-surface/theme.test.ts +237 -0
- package/src/client/components/common/code-surface/theme.ts +224 -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/editor-view-buttons/index.test.tsx +148 -0
- package/src/client/components/common/editor-view-buttons/index.tsx +109 -0
- package/src/client/components/common/shell-update-button/Modal.tsx +163 -0
- package/src/client/components/common/shell-update-button/index.test.tsx +251 -0
- package/src/client/components/common/shell-update-button/index.tsx +125 -0
- package/src/client/components/common/toolbar-row/index.test.tsx +215 -0
- package/src/client/components/common/toolbar-row/index.tsx +260 -0
- package/src/client/components/layout/desktop-layout/WorkspacePanels.tsx +58 -78
- package/src/client/components/layout/desktop-layout/index.tsx +65 -67
- package/src/client/components/layout/desktop-layout/resizer/index.tsx +6 -3
- package/src/client/components/layout/session-sidebar/Footer.tsx +8 -15
- package/src/client/components/mobile/LayoutWrapper.tsx +1 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullDiff.tsx +3 -0
- package/src/client/components/mobile/mobile-right-sidebar/FullEditor.tsx +98 -71
- package/src/client/components/mobile/mobile-right-sidebar/Header.tsx +20 -1
- package/src/client/components/mobile/mobile-right-sidebar/OutlineButton.test.tsx +137 -0
- package/src/client/components/mobile/mobile-right-sidebar/OutlineButton.tsx +14 -3
- package/src/client/components/mobile/mobile-right-sidebar/editor-props.ts +25 -0
- package/src/client/components/mobile/mobile-session-sidebar/Footer.tsx +9 -21
- package/src/client/components/settings/Modal.tsx +8 -0
- package/src/client/components/settings/categories/AppearanceSettings.tsx +9 -0
- package/src/client/components/settings/categories/appearance-settings/EditorIndentSection.tsx +87 -0
- package/src/client/components/settings/categories/appearance-settings/EditorThemeSection.test.tsx +167 -0
- package/src/client/components/settings/categories/appearance-settings/EditorThemeSection.tsx +184 -0
- package/src/client/components/settings/categories/appearance-settings/EditorTypingSection.tsx +99 -0
- package/src/client/components/settings/categories/project-settings/WorktreeSettings.tsx +8 -2
- package/src/client/components/workspace/chat-timeline/EmptyWorkspacePrompt.tsx +16 -8
- package/src/client/components/workspace/chat-timeline/SystemNotice.tsx +9 -4
- package/src/client/components/workspace/chat-timeline/TaskResultContent.tsx +9 -7
- 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/target-picker/WorkspacePicker.test.tsx +132 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorkspacePicker.tsx +120 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.test.tsx +319 -0
- package/src/client/components/workspace/chat-timeline/target-picker/WorktreePicker.tsx +285 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/ask-panel/index.test.ts +2 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/hashline-patch/index.tsx +34 -29
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/AstEdit.tsx +11 -9
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Bash.tsx +10 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Edit.tsx +25 -8
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Eval.tsx +8 -11
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/FileMatches.test.ts +114 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/FileMatches.tsx +111 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/Read.tsx +7 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/panels/SearchTool.tsx +9 -59
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ArtifactBody.tsx +2 -7
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.test.ts +43 -30
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/DiffView.tsx +49 -32
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/ExcerptCode.tsx +8 -8
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/HighlightedCode.tsx +35 -0
- package/src/client/components/workspace/chat-timeline/tool-renderers/shared/JsonCodeBlock.tsx +4 -4
- package/src/client/components/workspace/diff-panel/MergeDiffView.tsx +179 -0
- package/src/client/components/workspace/diff-panel/ThemedMergeDiffView.tsx +24 -0
- package/src/client/components/workspace/diff-panel/Toolbar.tsx +224 -186
- package/src/client/components/workspace/diff-panel/ToolbarSegments.tsx +98 -0
- package/src/client/components/workspace/diff-panel/index.tsx +76 -145
- package/src/client/components/workspace/diff-panel/merge.ts +315 -0
- package/src/client/components/workspace/editor/Body.tsx +28 -7
- package/src/client/components/workspace/editor/CommandPalette.tsx +6 -6
- 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 +146 -63
- package/src/client/components/workspace/editor/FilePane.tsx +47 -7
- package/src/client/components/workspace/editor/FindWidget.test.ts +9 -5
- package/src/client/components/workspace/editor/FindWidget.tsx +36 -2
- 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 +110 -140
- package/src/client/components/workspace/editor/index.tsx +201 -193
- 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/OutlineSection.test.tsx +18 -0
- package/src/client/components/workspace/file-explorer/OutlineSection.tsx +10 -3
- 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 +7 -2
- package/src/client/components/workspace/worktree-modal/index.test.tsx +118 -0
- 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/chat/omp/reconnect.test.ts +338 -0
- package/src/client/hooks/chat/omp/reconnect.ts +187 -0
- package/src/client/hooks/chat/omp/run-liveness.test.ts +71 -0
- package/src/client/hooks/chat/omp/run-liveness.ts +65 -0
- package/src/client/hooks/chat/omp/session-list.activity.test.ts +114 -0
- package/src/client/hooks/chat/omp/session-list.test-util.ts +164 -0
- package/src/client/hooks/chat/omp/session-list.test.ts +30 -150
- package/src/client/hooks/chat/omp/session-list.tsx +69 -9
- package/src/client/hooks/chat/timeline/generating.ts +19 -2
- package/src/client/hooks/chat/timeline/index.ts +19 -24
- package/src/client/hooks/chat/timeline/lost-run.test.ts +329 -0
- package/src/client/hooks/chat/timeline/lost-run.ts +177 -0
- package/src/client/hooks/chat/timeline/session-load.test-util.ts +205 -0
- package/src/client/hooks/chat/timeline/session-load.test.ts +61 -162
- package/src/client/hooks/chat/timeline/session-load.ts +69 -37
- package/src/client/hooks/chat/timeline/session-switch.test.ts +65 -0
- package/src/client/hooks/chat/timeline/session-switch.ts +63 -0
- package/src/client/hooks/code/deferred-highlight.test.ts +182 -0
- package/src/client/hooks/code/deferred-highlight.ts +129 -0
- 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 +14 -1
- 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/theme.test.ts +206 -0
- package/src/client/hooks/editor/theme.ts +82 -0
- 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.test.ts +101 -0
- package/src/client/hooks/editor/use-editor-drop.ts +120 -77
- package/src/client/hooks/editor/use-editor-find.test.ts +2 -2
- package/src/client/hooks/editor/use-editor-find.ts +45 -10
- 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-outline-view.test.ts +182 -0
- package/src/client/hooks/editor/use-outline-view.ts +94 -7
- package/src/client/hooks/editor/use-scroll-restore.test.ts +55 -2
- package/src/client/hooks/editor/use-scroll-restore.ts +124 -4
- package/src/client/hooks/editor/use-search-reveal-jump.ts +57 -0
- package/src/client/hooks/editor/use-search-reveal.ts +1 -1
- 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/ui/settings-modal.ts +56 -0
- package/src/client/hooks/ui/updates/shell-download.test.ts +2 -0
- package/src/client/hooks/ui/updates/shell-download.ts +55 -14
- package/src/client/hooks/ui/updates/shell-offer.test.ts +26 -0
- package/src/client/hooks/ui/updates/shell-update.test.ts +140 -0
- package/src/client/hooks/ui/updates/shell-update.ts +119 -0
- package/src/client/hooks/workspace/diff-file.ts +29 -10
- package/src/client/hooks/workspace/diff-git-actions.ts +147 -0
- package/src/client/hooks/workspace/editor-view.ts +61 -0
- package/src/client/hooks/workspace/file-listing.ts +36 -24
- package/src/client/hooks/workspace/file-tabs.test.ts +152 -5
- package/src/client/hooks/workspace/file-tabs.ts +70 -11
- package/src/client/hooks/workspace/file-tree-edits.ts +103 -0
- package/src/client/hooks/workspace/navbar-session-actions.ts +72 -0
- package/src/client/hooks/workspace/worktree/index.ts +20 -5
- package/src/client/lib/desktop/bridge.ts +45 -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/lib/search-reveal.ts +1 -1
- package/src/client/main.tsx +13 -1
- package/src/client/tailwind.css +75 -8
- package/src/server/lib/auth/guard.test.ts +28 -0
- package/src/server/lib/auth/guard.ts +10 -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/worktree/create.ts +2 -3
- package/src/server/lib/fs/worktree/list.ts +13 -0
- package/src/server/lib/fs/worktree/remove.ts +3 -3
- package/src/server/lib/fs/write-conflict.test.ts +68 -0
- package/src/server/lib/fs/write-conflict.ts +84 -0
- package/src/server/lib/lifecycle/claim-port.test.ts +156 -0
- package/src/server/lib/lifecycle/port-guard.test.ts +20 -164
- package/src/server/lib/lifecycle/port-guard.ts +39 -7
- package/src/server/lib/lifecycle/probe-health.test.ts +166 -0
- package/src/server/lib/lifecycle/probe.test.ts +77 -164
- package/src/server/lib/lifecycle/probe.ts +121 -13
- package/src/server/lib/omp/rpc/frame-fold-signals.test.ts +112 -0
- package/src/server/lib/omp/rpc/frame-fold.ts +10 -5
- package/src/server/lib/omp/session/sidebar-activity.server.test.ts +162 -0
- package/src/server/lib/omp/session/sidebar-activity.server.ts +70 -0
- package/src/server/lib/omp/session/telemetry/compute.ts +13 -1
- package/src/server/lib/omp/session/telemetry.test.ts +33 -0
- package/src/server/lib/realtime/signals.server.ts +10 -0
- package/src/server/lib/realtime/topics/catalog.server.ts +4 -1
- package/src/server/lib/realtime/topics.server.ts +16 -0
- package/src/server/lib/updates/shell-assets.ts +94 -3
- package/src/server/lib/updates/shell-cache.ts +105 -0
- package/src/server/lib/updates/shell-pages.test.ts +33 -2
- package/src/server/lib/updates/shell-pages.ts +17 -5
- package/src/server/lib/updates/shell-release-desktop.test.ts +166 -0
- package/src/server/lib/updates/shell-release.test.ts +10 -27
- package/src/server/lib/updates/shell-release.ts +107 -111
- 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/git-merge.test.ts +11 -1
- package/src/server/routes/fs/read.test.ts +24 -7
- package/src/server/routes/fs/read.ts +6 -1
- package/src/server/routes/fs/scope.test.ts +15 -10
- package/src/server/routes/fs/scope.ts +3 -14
- package/src/server/routes/updates/android.ts +6 -1
- package/src/server/routes/updates/desktop.ts +29 -7
- package/src/server/routes/updates/ios.ts +5 -1
- package/src/server/routes/worktrees/list.ts +11 -1
- package/src/server/routes/worktrees/routes.test.ts +17 -0
- package/src/shared/lib/chat/timeline/omp-callbacks.test.ts +36 -0
- package/src/shared/lib/chat/timeline/omp-callbacks.ts +18 -0
- package/src/shared/lib/chat/timeline/run-signals.test.ts +2 -0
- package/src/shared/lib/code/editor/comment-syntax.test.ts +37 -0
- package/src/shared/lib/code/editor/comment-syntax.ts +55 -0
- package/src/shared/lib/code/editor/find-replace.test.ts +134 -0
- package/src/shared/lib/code/editor/{find.ts → find-replace.ts} +23 -107
- package/src/shared/lib/code/editor/{find.test.ts → find-scan.test.ts} +20 -74
- package/src/shared/lib/code/editor/find-scan.ts +198 -0
- 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 +43 -6
- package/src/shared/lib/code/editor/lines.test.ts +7 -55
- package/src/shared/lib/code/editor/lines.ts +8 -48
- package/src/shared/lib/code/editor/marks.test.ts +4 -5
- package/src/shared/lib/code/editor/marks.ts +13 -25
- 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/editor/theme-loader.ts +97 -0
- package/src/shared/lib/code/editor/themes.generated.ts +156 -0
- package/src/shared/lib/code/editor/themes.test.ts +165 -0
- package/src/shared/lib/code/editor/themes.ts +165 -0
- package/src/shared/lib/code/highlight-memo.test.ts +103 -0
- package/src/shared/lib/code/highlight-memo.ts +149 -0
- package/src/shared/lib/code/highlighter-warmup.ts +112 -0
- package/src/shared/lib/code/highlighter.ts +3 -1
- package/src/shared/lib/code/idle.ts +37 -0
- package/src/shared/lib/code/outline/rows.test.ts +96 -0
- package/src/shared/lib/code/outline/rows.ts +94 -0
- package/src/shared/lib/code/syntax-highlight.test.ts +2 -80
- package/src/shared/lib/code/syntax-highlight.ts +2 -3
- package/src/shared/lib/fs/file-kind-classify.test.ts +25 -11
- package/src/shared/lib/fs/file-kind.ts +47 -13
- 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/file-url.test.ts +52 -0
- package/src/shared/lib/fs/file-url.ts +37 -0
- 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/fs/patch-sides.test.ts +114 -0
- package/src/shared/lib/fs/patch-sides.ts +139 -0
- 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/protocol.ts +16 -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/ui/toolbar-overflow.test.ts +83 -0
- package/src/shared/lib/ui/toolbar-overflow.ts +86 -0
- package/src/shared/lib/updates/shell-arch.ts +54 -0
- package/src/shared/lib/updates/shell-ua.ts +4 -4
- package/src/shared/lib/workspace/editor-view-mode.test.ts +70 -0
- package/src/shared/lib/workspace/editor-view-mode.ts +48 -0
- package/src/shared/lib/workspace/panel-widths.test.ts +30 -0
- package/src/shared/lib/workspace/panel-widths.ts +25 -5
- package/src/shared/lib/workspace/session-state/cache.ts +159 -0
- package/src/shared/lib/workspace/session-state/harness.test-util.ts +55 -0
- package/src/shared/lib/workspace/session-state/merge.ts +100 -0
- package/src/shared/lib/workspace/session-state/store-load.test.ts +206 -0
- package/src/shared/lib/workspace/session-state/store.test.ts +17 -139
- package/src/shared/lib/workspace/session-state/store.ts +92 -130
- package/src/shared/lib/workspace/split-editor.test.ts +104 -0
- package/src/shared/lib/workspace/split-editor.ts +129 -0
- package/src/shared/lib/workspace/workspace-panel-widths.ts +124 -0
- package/src/shared/types/realtime.ts +29 -0
- package/src/shared/types/settings/state.ts +10 -0
- package/src/test-support/file-explorer-disk.test-util.ts +30 -3
- package/src/test-support/loopback.ts +183 -0
- package/src/test-support/pristine-globals.ts +7 -0
- package/dist/client/static/js/index-gtbpewr7.css +0 -1
- package/src/client/components/common/code-editor/handler.test.ts +0 -274
- package/src/client/components/common/code-editor/handler.ts +0 -175
- package/src/client/components/common/code-editor/index.tsx +0 -314
- package/src/client/components/common/code-surface/measure.ts +0 -148
- package/src/client/components/workspace/chat-timeline/target-picker/index.test.tsx +0 -227
- package/src/client/components/workspace/chat-timeline/target-picker/index.tsx +0 -260
- package/src/client/components/workspace/diff-panel/SplitView.tsx +0 -209
- package/src/client/components/workspace/diff-panel/UnifiedView.tsx +0 -150
- package/src/client/hooks/editor/scroll-container.test.ts +0 -102
- package/src/client/hooks/editor/scroll-container.ts +0 -26
- package/src/client/hooks/editor/use-code-window.ts +0 -100
- package/src/client/hooks/editor/use-editor-history.test.ts +0 -216
- package/src/client/hooks/editor/use-editor-history.ts +0 -134
- package/src/client/hooks/editor/use-occurrences.test.ts +0 -236
- package/src/client/hooks/editor/use-occurrences.ts +0 -98
- package/src/shared/lib/code/editor/commands.test.ts +0 -155
- package/src/shared/lib/code/editor/commands.ts +0 -260
- package/src/shared/lib/code/editor/edits.test.ts +0 -100
- package/src/shared/lib/code/editor/edits.ts +0 -122
- package/src/shared/lib/code/editor/history.test.ts +0 -118
- package/src/shared/lib/code/editor/history.ts +0 -101
- package/src/shared/lib/code/editor/layers.test.ts +0 -77
- package/src/shared/lib/code/editor/layers.ts +0 -67
- package/src/shared/lib/code/editor/line-edits.test.ts +0 -131
- package/src/shared/lib/code/editor/line-edits.ts +0 -159
- package/src/shared/lib/code/editor/occurrences.test.ts +0 -117
- package/src/shared/lib/code/editor/occurrences.ts +0 -111
- package/src/shared/lib/code/editor/reset-css.test.ts +0 -35
- package/src/shared/lib/code/editor/reset-css.ts +0 -32
- package/src/shared/lib/code/editor/text-commands.test.ts +0 -178
- package/src/shared/lib/code/editor/text-commands.ts +0 -154
- package/src/shared/lib/code/lazy-window.test.ts +0 -161
- package/src/shared/lib/code/lazy-window.ts +0 -156
- package/src/shared/lib/code/windowed-highlight.ts +0 -114
- package/src/shared/lib/fs/diff-parser.test.ts +0 -116
- package/src/shared/lib/fs/diff-parser.ts +0 -213
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Folding without a grammar.
|
|
8
|
+
*
|
|
9
|
+
* The code surface tokenizes with Shiki and has no lezer parser, so CM6's own
|
|
10
|
+
* syntax folding (`foldNodeProp`, the path `codeFolding` uses when a language
|
|
11
|
+
* is installed) has no tree to read. What it DOES have is `foldService`, a facet
|
|
12
|
+
* asked once per gutter line: "does this line open a range that continues past
|
|
13
|
+
* it?" Answering from INDENTATION is the standard fallback — it is vim's
|
|
14
|
+
* `foldmethod=indent` — and it is the only rule that works for all 59 languages
|
|
15
|
+
* this app can name, where a grammar would cover 19 of them.
|
|
16
|
+
*
|
|
17
|
+
* The rule is one sentence: a line folds up to the last following line that is
|
|
18
|
+
* indented deeper than it is. Blank lines never end a block (they belong to
|
|
19
|
+
* neither side), which is what keeps a fold intact through the blank line
|
|
20
|
+
* between two functions' bodies.
|
|
21
|
+
*
|
|
22
|
+
* Two consequences are deliberate and worth stating, because both look like
|
|
23
|
+
* bugs:
|
|
24
|
+
*
|
|
25
|
+
* - A one-line block (`if (a) { b(); }`) does not fold — nothing is deeper.
|
|
26
|
+
* - A multi-line EXPRESSION does fold (`const x =` / ` a &&` / ` b;`), because
|
|
27
|
+
* it is indented and that is what the rule measures. A grammar would call
|
|
28
|
+
* that "not a block"; indentation cannot tell, and refusing to fold it would
|
|
29
|
+
* require the parser this file exists to avoid.
|
|
30
|
+
*
|
|
31
|
+
* ## The cap is a cost bound, and it REFUSES rather than truncates
|
|
32
|
+
*
|
|
33
|
+
* The scan walks forward until the indentation dedents, so a file that is one
|
|
34
|
+
* huge block (`{` … 500 000 lines … `}` — a generated JSON, a data fixture)
|
|
35
|
+
* would be walked on every gutter line the reader scrolls past. Measured on a
|
|
36
|
+
* 500 000-line JSON: 74.6 ms per call, unbounded; with the cap, 0.50 ms. So past
|
|
37
|
+
* `MAX_FOLD_LINES` the answer is `null` — no marker, no fold — because a
|
|
38
|
+
* TRUNCATED fold would be a range that ends somewhere the reader did not choose.
|
|
39
|
+
* A 3 000-line function still folds under this cap; a block that large is not
|
|
40
|
+
* something a reader folds anyway.
|
|
41
|
+
*
|
|
42
|
+
* ## Measured against this repository's own files
|
|
43
|
+
*
|
|
44
|
+
* 288-line component → 26 foldable lines, 337-line component → 69, and the whole
|
|
45
|
+
* scan for a viewport's worth of lines costs 0.1 ms. Per-call cost on the
|
|
46
|
+
* 150 000-line file: 0.002 ms.
|
|
47
|
+
*/
|
|
48
|
+
|
|
49
|
+
import type { EditorState } from '@codemirror/state';
|
|
50
|
+
import { foldService } from '@codemirror/language';
|
|
51
|
+
|
|
52
|
+
/**
|
|
53
|
+
* How many lines a single fold may span before the answer becomes "not foldable".
|
|
54
|
+
*
|
|
55
|
+
* Chosen from the cost curve, not from taste: 5 000 lines is 0.5 ms in the worst
|
|
56
|
+
* case measured (a 500 000-line JSON where every line is inside one block), and
|
|
57
|
+
* it still folds a 3 000-line function.
|
|
58
|
+
*/
|
|
59
|
+
export const MAX_FOLD_LINES = 5_000;
|
|
60
|
+
|
|
61
|
+
/** The leading whitespace's width — tabs count as one, which is enough to compare. */
|
|
62
|
+
function indentWidth(text: string): number {
|
|
63
|
+
const firstNonSpace = text.length - text.trimStart().length;
|
|
64
|
+
return firstNonSpace;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* The foldable range starting on the line at `lineStart`, or null.
|
|
69
|
+
*
|
|
70
|
+
* Shaped exactly like CM6's `foldService` callback so it can be registered as
|
|
71
|
+
* one; exported separately because the rule is what the tests pin.
|
|
72
|
+
*/
|
|
73
|
+
export function indentFoldRange(
|
|
74
|
+
state: EditorState,
|
|
75
|
+
lineStart: number,
|
|
76
|
+
lineEnd: number,
|
|
77
|
+
): { from: number; to: number } | null {
|
|
78
|
+
const line = state.doc.lineAt(lineStart);
|
|
79
|
+
// A blank line opens nothing: its indent is the whole line.
|
|
80
|
+
if (!line.text.trim()) return null;
|
|
81
|
+
|
|
82
|
+
const baseIndent = indentWidth(line.text);
|
|
83
|
+
const lastLine = Math.min(state.doc.lines, line.number + MAX_FOLD_LINES);
|
|
84
|
+
|
|
85
|
+
let end = lineEnd;
|
|
86
|
+
let sawChild = false;
|
|
87
|
+
let stopped = false;
|
|
88
|
+
|
|
89
|
+
for (let number = line.number + 1; number <= lastLine; number++) {
|
|
90
|
+
const next = state.doc.line(number);
|
|
91
|
+
if (!next.text.trim()) continue;
|
|
92
|
+
if (indentWidth(next.text) <= baseIndent) {
|
|
93
|
+
stopped = true;
|
|
94
|
+
break;
|
|
95
|
+
}
|
|
96
|
+
sawChild = true;
|
|
97
|
+
end = next.to;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
// A block that ran into the cap is REFUSED rather than cut short: the range
|
|
101
|
+
// would end at an arbitrary line, and a fold the reader did not choose is
|
|
102
|
+
// worse than no fold. Running out of DOCUMENT is not the same thing — the
|
|
103
|
+
// loop reached the end because the block does.
|
|
104
|
+
if (!stopped && lastLine < state.doc.lines) return null;
|
|
105
|
+
|
|
106
|
+
return sawChild && end > lineEnd ? { from: lineEnd, to: end } : null;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
/**
|
|
110
|
+
* The service as an extension.
|
|
111
|
+
*
|
|
112
|
+
* `foldService` runs BEFORE the syntax-tree path in `foldable()`, so registering
|
|
113
|
+
* this alongside a grammar later would still let the grammar answer wherever
|
|
114
|
+
* this returns null — the two compose rather than compete.
|
|
115
|
+
*/
|
|
116
|
+
export const indentFoldService = foldService.of((state, lineStart, lineEnd) =>
|
|
117
|
+
indentFoldRange(state, lineStart, lineEnd),
|
|
118
|
+
);
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* The imperative surface handle, built from the mount's refs.
|
|
8
|
+
*
|
|
9
|
+
* Split out of `index.tsx` because the component is at the repository's line
|
|
10
|
+
* ceiling and this half is dispatch, not rendering: every method here is "look
|
|
11
|
+
* up the live view, then hand CodeMirror a transaction". Keeping it a factory
|
|
12
|
+
* over the refs (rather than a hook) is what makes the identity stable — the
|
|
13
|
+
* handle is built once for the component's life, so a consumer holding it never
|
|
14
|
+
* re-subscribes.
|
|
15
|
+
*
|
|
16
|
+
* Two rules live here and nowhere else, both measured:
|
|
17
|
+
*
|
|
18
|
+
* - **`applyDocument` is a USER edit.** It is deliberately not silenced as an
|
|
19
|
+
* external write: the find bar's replace has to reach `onValueChange` exactly
|
|
20
|
+
* like typing does, or the parent keeps the pre-replace buffer and the next
|
|
21
|
+
* render writes the OLD text back over it.
|
|
22
|
+
* - **A reveal cancels a pending scroll restore.** The restore's
|
|
23
|
+
* `ResizeObserver` can run BEFORE the scroll event a reveal's dispatch causes,
|
|
24
|
+
* so it would write the remembered offset back and the view would never move.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
import { EditorView } from '@codemirror/view';
|
|
28
|
+
import type { MutableRef } from '@/client/components/common/code-surface/sync';
|
|
29
|
+
import { cancelScrollRestore } from '@/client/hooks/editor/use-scroll-restore';
|
|
30
|
+
import { runSurfaceCommand } from '@/client/components/common/code-surface/keymap';
|
|
31
|
+
import type { EditorCommand } from '@/shared/lib/code/editor/keymap';
|
|
32
|
+
|
|
33
|
+
/** The imperative surface every consumer of the editor holds. */
|
|
34
|
+
export interface CodeSurfaceHandle {
|
|
35
|
+
/** Current selection offsets in the buffer, or null before the view mounts. */
|
|
36
|
+
getSelection(): { start: number; end: number } | null;
|
|
37
|
+
/** Select `[start, end)`; `focus` moves keyboard focus into the editor. */
|
|
38
|
+
select(start: number, end: number, focus?: boolean): void;
|
|
39
|
+
/** Replace the buffer as one undoable edit, caret at `[caretStart, caretEnd)`, focus unchanged. */
|
|
40
|
+
applyDocument(value: string, caretStart: number, caretEnd: number): void;
|
|
41
|
+
/** Run an editor command by name (the palette's path into the editor). */
|
|
42
|
+
runCommand(command: EditorCommand): void;
|
|
43
|
+
/**
|
|
44
|
+
* Bring the line holding `offset` into view WITHOUT moving the caret — what
|
|
45
|
+
* "step to the next match" needs: the user's focus stays in the find field
|
|
46
|
+
* while the match scrolls under it.
|
|
47
|
+
*/
|
|
48
|
+
revealOffset(offset: number): void;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
export interface SurfaceHandleRefs {
|
|
52
|
+
view: MutableRef<EditorView | null>;
|
|
53
|
+
/** The live `onCommand`, mirrored so the handle never captures a stale one. */
|
|
54
|
+
onCommand: MutableRef<((command: EditorCommand) => void) | undefined>;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** The handle a `forwardRef` caller receives. Built once per mount. */
|
|
58
|
+
export function createSurfaceHandle({ view: viewRef, onCommand: onCommandRef }: SurfaceHandleRefs): CodeSurfaceHandle {
|
|
59
|
+
return {
|
|
60
|
+
getSelection: () => {
|
|
61
|
+
const view = viewRef.current;
|
|
62
|
+
if (!view) return null;
|
|
63
|
+
const range = view.state.selection.main;
|
|
64
|
+
return { start: range.from, end: range.to };
|
|
65
|
+
},
|
|
66
|
+
select: (start, end, focus = true) => {
|
|
67
|
+
const view = viewRef.current;
|
|
68
|
+
if (!view) return;
|
|
69
|
+
view.dispatch({ selection: { anchor: start, head: end }, scrollIntoView: false });
|
|
70
|
+
// `focus()` is CM6's own `focusPreventScroll`, which is what stops the
|
|
71
|
+
// browser scrolling the caret into view a second time — the caller's
|
|
72
|
+
// `revealOffset` is the only thing that scrolls.
|
|
73
|
+
if (focus) view.focus();
|
|
74
|
+
},
|
|
75
|
+
applyDocument: (next, caretStart, caretEnd) => {
|
|
76
|
+
const view = viewRef.current;
|
|
77
|
+
if (!view) return;
|
|
78
|
+
// One transaction, so ⌘Z undoes the whole replacement: a replace-all that
|
|
79
|
+
// took one undo step per match is what the old surface had to hand-roll a
|
|
80
|
+
// history for.
|
|
81
|
+
view.dispatch({
|
|
82
|
+
changes: { from: 0, to: view.state.doc.length, insert: next },
|
|
83
|
+
selection: { anchor: caretStart, head: caretEnd },
|
|
84
|
+
});
|
|
85
|
+
},
|
|
86
|
+
runCommand: (command) => {
|
|
87
|
+
const view = viewRef.current;
|
|
88
|
+
if (!view) return;
|
|
89
|
+
runSurfaceCommand(command, view, onCommandRef.current);
|
|
90
|
+
},
|
|
91
|
+
revealOffset: (offset) => {
|
|
92
|
+
const view = viewRef.current;
|
|
93
|
+
if (!view) return;
|
|
94
|
+
const at = Math.max(0, Math.min(offset, view.state.doc.length));
|
|
95
|
+
cancelScrollRestore(view.scrollDOM);
|
|
96
|
+
// `y: 'nearest'` is the rule the old surface hand-rolled: a reveal only
|
|
97
|
+
// scrolls when the target is outside the visible band, so stepping
|
|
98
|
+
// through matches does not jump the whole view on every step.
|
|
99
|
+
view.dispatch({ effects: EditorView.scrollIntoView(at, { y: 'nearest', yMargin: 24 }) });
|
|
100
|
+
},
|
|
101
|
+
};
|
|
102
|
+
}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Indent guides, without a grammar.
|
|
8
|
+
*
|
|
9
|
+
* A vertical rule at every nesting level, drawn for the viewport only. This is the
|
|
10
|
+
* feature that makes 4-space YAML and 2-space TS readable side by side, and it is the
|
|
11
|
+
* one every editor has — but CM6 ships no grammar-free version, because its own
|
|
12
|
+
* indent guides come from a syntax tree.
|
|
13
|
+
*
|
|
14
|
+
* ## It is NOT the bracket pair guide
|
|
15
|
+
*
|
|
16
|
+
* `bracket-guide.ts` draws ONE line between a brace and its match, at the opening
|
|
17
|
+
* brace's own column. This draws one line PER LEVEL, at the indent columns. Two rules
|
|
18
|
+
* that looked alike would teach the reader that the marks mean the same thing, so
|
|
19
|
+
* this one is deliberately dimmer and sits at the column boundary rather than under a
|
|
20
|
+
* character.
|
|
21
|
+
*
|
|
22
|
+
* ## The measurement is the line's leading whitespace, which is all there is
|
|
23
|
+
*
|
|
24
|
+
* With no tree, the only fact available is how far a line is indented. Two limits
|
|
25
|
+
* follow, and both are stated rather than hidden:
|
|
26
|
+
*
|
|
27
|
+
* - A continuation line indented by ALIGNMENT (not nesting) gets a guide it should not
|
|
28
|
+
* have. Nothing textual can tell the two apart.
|
|
29
|
+
* - A line indented by an odd number of spaces gets guides at each whole `indentUnit`,
|
|
30
|
+
* so the last partial level draws nothing.
|
|
31
|
+
*
|
|
32
|
+
* ## The cost bound is the viewport
|
|
33
|
+
*
|
|
34
|
+
* Only rendered lines are walked (`view.viewport`), and a line longer than
|
|
35
|
+
* `MAX_GUIDE_COLUMNS` is skipped: a minified file is one 400 000-character line, and
|
|
36
|
+
* counting its indentation per frame is work for a rule nobody can see.
|
|
37
|
+
*/
|
|
38
|
+
|
|
39
|
+
import { Decoration, EditorView, ViewPlugin, type DecorationSet, type ViewUpdate } from '@codemirror/view';
|
|
40
|
+
|
|
41
|
+
import { guideColumn } from '@/shared/lib/code/editor/indent-guide-rule';
|
|
42
|
+
|
|
43
|
+
/** One guide rule: a 1px border at the level's column. */
|
|
44
|
+
const guideMark = (column: number): Decoration =>
|
|
45
|
+
Decoration.line({
|
|
46
|
+
attributes: { style: `--indent-guide-col: ${column}ch` },
|
|
47
|
+
class: 'cm-indent-guide',
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
/**
|
|
51
|
+
* The guide decorations for the lines currently rendered.
|
|
52
|
+
*
|
|
53
|
+
* `state.tabSize` and the indentation unit come from the state, so a 4-space setting
|
|
54
|
+
* moves the guides with the code — no second setting to keep in step.
|
|
55
|
+
*/
|
|
56
|
+
function buildGuides(view: EditorView): DecorationSet {
|
|
57
|
+
const unit = view.state.tabSize > 0 ? view.state.tabSize : 2;
|
|
58
|
+
const builder: Array<{ line: number; decoration: Decoration }> = [];
|
|
59
|
+
|
|
60
|
+
for (const { from, to } of view.visibleRanges) {
|
|
61
|
+
let position = from;
|
|
62
|
+
while (position <= to) {
|
|
63
|
+
const line = view.state.doc.lineAt(position);
|
|
64
|
+
// The RULE lives in `indent-guide-rule.ts` so it is testable without a view.
|
|
65
|
+
const column = guideColumn(line.text, unit);
|
|
66
|
+
if (column !== null) builder.push({ line: line.from, decoration: guideMark(column) });
|
|
67
|
+
if (line.to === position && line.to === view.state.doc.length) break;
|
|
68
|
+
position = line.to + 1;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// `Decoration.line` is a LINE decoration: one per line, at its own start, and the
|
|
73
|
+
// set must be sorted by position — which walking the document already gives.
|
|
74
|
+
return Decoration.set(
|
|
75
|
+
builder.map((entry) => entry.decoration.range(entry.line)),
|
|
76
|
+
true,
|
|
77
|
+
);
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/**
|
|
81
|
+
* The indent guides, as a view plugin.
|
|
82
|
+
*
|
|
83
|
+
* A plugin rather than a `StateField`: the guides are derived from what is RENDERED,
|
|
84
|
+
* so they must rebuild on scroll as well as on edit, and a field would have to store
|
|
85
|
+
* a decoration set the state does not own.
|
|
86
|
+
*/
|
|
87
|
+
export const indentGuides = ViewPlugin.fromClass(
|
|
88
|
+
class {
|
|
89
|
+
decorations: DecorationSet;
|
|
90
|
+
|
|
91
|
+
constructor(view: EditorView) {
|
|
92
|
+
this.decorations = buildGuides(view);
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
update(update: ViewUpdate) {
|
|
96
|
+
// A scroll changes the viewport, which changes the guides; an edit changes the
|
|
97
|
+
// text, which does too. Everything else (a selection move) cannot.
|
|
98
|
+
if (update.docChanged || update.viewportChanged) {
|
|
99
|
+
this.decorations = buildGuides(update.view);
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
},
|
|
103
|
+
{ decorations: (plugin) => plugin.decorations },
|
|
104
|
+
);
|
|
@@ -0,0 +1,239 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Auto-indent through the REAL surface stack.
|
|
8
|
+
*
|
|
9
|
+
* The rules are unit-tested in `indent-rules.test.ts`; what this file pins is the
|
|
10
|
+
* WIRING, because both halves of it fail silently:
|
|
11
|
+
*
|
|
12
|
+
* - the service must be installed AND `indentOnInput()` must be present —
|
|
13
|
+
* measured, either alone leaves Enter or the closer broken;
|
|
14
|
+
* - the service must return `undefined` (not `null`) where the parser answers, or
|
|
15
|
+
* it swallows the mode's answer (`js: 11 → null`);
|
|
16
|
+
* - the language data must carry a closer pattern only where a closer is a
|
|
17
|
+
* closer (YAML's `}` is content).
|
|
18
|
+
*
|
|
19
|
+
* A mode is installed through the same `languageCompartment` the surface uses, so
|
|
20
|
+
* these cases exercise the real path rather than a stand-in.
|
|
21
|
+
*/
|
|
22
|
+
|
|
23
|
+
import { describe, expect, test } from 'bun:test';
|
|
24
|
+
import { Compartment, EditorState, type Extension, type Transaction } from '@codemirror/state';
|
|
25
|
+
import { StreamLanguage } from '@codemirror/language';
|
|
26
|
+
import { insertNewlineAndIndent } from '@codemirror/commands';
|
|
27
|
+
import type { EditorView } from '@codemirror/view';
|
|
28
|
+
|
|
29
|
+
import { surfaceExtensions } from '@/client/components/common/code-surface/extensions';
|
|
30
|
+
import { STREAM_MODE_LOADERS, STREAM_MODE_EXPORTS } from '@/shared/lib/code/editor/stream-modes';
|
|
31
|
+
import { SHIKI_THEMES } from '@/shared/lib/code/shiki-themes';
|
|
32
|
+
|
|
33
|
+
/** The compartments the surface owns, so a mode can be installed the same way. */
|
|
34
|
+
interface SurfaceCompartments {
|
|
35
|
+
wordWrapCompartment: Compartment;
|
|
36
|
+
readOnlyCompartment: Compartment;
|
|
37
|
+
themeCompartment: Compartment;
|
|
38
|
+
languageCompartment: Compartment;
|
|
39
|
+
indentCompartment: Compartment;
|
|
40
|
+
typingCompartment: Compartment;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
interface Built {
|
|
44
|
+
extensions: Extension[];
|
|
45
|
+
compartments: SurfaceCompartments;
|
|
46
|
+
mode: unknown;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
async function build(language: string): Promise<Built> {
|
|
50
|
+
const compartments: SurfaceCompartments = {
|
|
51
|
+
wordWrapCompartment: new Compartment(),
|
|
52
|
+
readOnlyCompartment: new Compartment(),
|
|
53
|
+
themeCompartment: new Compartment(),
|
|
54
|
+
languageCompartment: new Compartment(),
|
|
55
|
+
indentCompartment: new Compartment(),
|
|
56
|
+
typingCompartment: new Compartment(),
|
|
57
|
+
};
|
|
58
|
+
const extensions: Extension[] = surfaceExtensions({
|
|
59
|
+
language,
|
|
60
|
+
...compartments,
|
|
61
|
+
wordWrap: true,
|
|
62
|
+
readOnly: false,
|
|
63
|
+
themes: SHIKI_THEMES,
|
|
64
|
+
indentUnitText: ' ',
|
|
65
|
+
typing: { autoCloseBrackets: false, autocomplete: false },
|
|
66
|
+
onDocChange: () => {},
|
|
67
|
+
onState: () => {},
|
|
68
|
+
});
|
|
69
|
+
const loader = STREAM_MODE_LOADERS[language];
|
|
70
|
+
const loaded = loader ? await loader() : null;
|
|
71
|
+
const mode = isModule(loaded) ? loaded[STREAM_MODE_EXPORTS[language]] : null;
|
|
72
|
+
return { extensions, compartments, mode };
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
/** A dynamic import's namespace: an object whose keys are the module's exports. */
|
|
76
|
+
function isModule(value: unknown): value is Record<string, unknown> {
|
|
77
|
+
return typeof value === 'object' && value !== null;
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** The surface's state for `doc`, with the mode installed the way the component does. */
|
|
81
|
+
function stateFor({ extensions, compartments, mode }: Built, doc: string): EditorState {
|
|
82
|
+
const base = EditorState.create({ doc, selection: { anchor: doc.length }, extensions });
|
|
83
|
+
if (!mode) return base;
|
|
84
|
+
return base.update({
|
|
85
|
+
effects: compartments.languageCompartment.reconfigure(StreamLanguage.define(mode as never)),
|
|
86
|
+
}).state;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
/**
|
|
90
|
+
* A minimal live view.
|
|
91
|
+
*
|
|
92
|
+
* `insertNewlineAndIndent` is a `StateCommand`: it reads `state` and calls
|
|
93
|
+
* `dispatch` with a transaction spec or a resolved transaction, both of which are
|
|
94
|
+
* real CM6 shapes. Only those two members are needed, and typing the whole
|
|
95
|
+
* `EditorView` would mean constructing a DOM.
|
|
96
|
+
*/
|
|
97
|
+
interface CommandView {
|
|
98
|
+
state: EditorState;
|
|
99
|
+
dispatch: (input: Transaction | readonly Transaction[] | { state: EditorState }) => void;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
function commandView(state: EditorState): CommandView {
|
|
103
|
+
const view: CommandView = {
|
|
104
|
+
state,
|
|
105
|
+
dispatch(input) {
|
|
106
|
+
if (Array.isArray(input)) {
|
|
107
|
+
for (const transaction of input) view.state = transaction.state;
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
if ('state' in input && input.state instanceof EditorState) {
|
|
111
|
+
view.state = input.state;
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
view.state = view.state.update(input as never).state;
|
|
115
|
+
},
|
|
116
|
+
};
|
|
117
|
+
return view;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
/** Press Enter at the end of `doc`. */
|
|
121
|
+
function enter(built: Built, doc: string): string {
|
|
122
|
+
const view = commandView(stateFor(built, doc));
|
|
123
|
+
insertNewlineAndIndent(view as unknown as EditorView);
|
|
124
|
+
return view.state.doc.toString();
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/** Type `insert` at the end of `doc` as a real keystroke. */
|
|
128
|
+
function type(built: Built, doc: string, insert: string): string {
|
|
129
|
+
return stateFor(built, doc).update({
|
|
130
|
+
changes: { from: doc.length, insert },
|
|
131
|
+
selection: { anchor: doc.length + insert.length },
|
|
132
|
+
userEvent: 'input.type',
|
|
133
|
+
}).state.doc.toString();
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
describe('Enter indents in the languages whose parser answers', () => {
|
|
137
|
+
const cases: Array<[string, string, string]> = [
|
|
138
|
+
['typescript', 'if (x) {', 'if (x) {\n '],
|
|
139
|
+
['javascript', 'if (x) {', 'if (x) {\n '],
|
|
140
|
+
['go', 'func f() {', 'func f() {\n '],
|
|
141
|
+
['rust', 'fn f() {', 'fn f() {\n '],
|
|
142
|
+
['css', 'a {', 'a {\n '],
|
|
143
|
+
['json', '{', '{\n '],
|
|
144
|
+
];
|
|
145
|
+
for (const [language, doc, expected] of cases) {
|
|
146
|
+
test(language, async () => {
|
|
147
|
+
expect(enter(await build(language), doc)).toBe(expected);
|
|
148
|
+
});
|
|
149
|
+
}
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
describe('Enter indents in the languages the parser cannot answer', () => {
|
|
153
|
+
const cases: Array<[string, string, string]> = [
|
|
154
|
+
['yaml', 'a:', 'a:\n '],
|
|
155
|
+
['toml', 'a = {', 'a = {\n '],
|
|
156
|
+
['hcl', 'resource "a" "b" {', 'resource "a" "b" {\n '],
|
|
157
|
+
['bash', 'if true; then', 'if true; then\n '],
|
|
158
|
+
['dockerfile', 'RUN apt-get install \\', 'RUN apt-get install \\\n '],
|
|
159
|
+
['graphql', 'query Q {', 'query Q {\n '],
|
|
160
|
+
['php', 'function f() {', 'function f() {\n '],
|
|
161
|
+
['zig', 'fn f() {', 'fn f() {\n '],
|
|
162
|
+
['html', '<div>', '<div>\n '],
|
|
163
|
+
];
|
|
164
|
+
for (const [language, doc, expected] of cases) {
|
|
165
|
+
test(language, async () => {
|
|
166
|
+
expect(enter(await build(language), doc)).toBe(expected);
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
describe('Enter leaves the flat languages alone', () => {
|
|
172
|
+
test('a markdown list item keeps its column', async () => {
|
|
173
|
+
expect(enter(await build('markdown'), '- item')).toBe('- item\n');
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
test('an already-indented markdown line keeps its indent', async () => {
|
|
177
|
+
expect(enter(await build('markdown'), '> quote\n text')).toBe('> quote\n text\n ');
|
|
178
|
+
});
|
|
179
|
+
|
|
180
|
+
test('a SQL clause gets no indent', async () => {
|
|
181
|
+
expect(enter(await build('sql'), 'SELECT * FROM t WHERE')).toBe('SELECT * FROM t WHERE\n');
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
test('a YAML list item keeps its column', async () => {
|
|
185
|
+
expect(enter(await build('yaml'), 'items:\n - one')).toBe('items:\n - one\n ');
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
|
|
189
|
+
describe('a typed closer dedents', () => {
|
|
190
|
+
const cases: Array<[string, string, string, string]> = [
|
|
191
|
+
['typescript', 'if (x) {\n ', '}', 'if (x) {\n}'],
|
|
192
|
+
// `go`'s own regexp demands exactly one space, so this dedent only exists
|
|
193
|
+
// because the surface supplies its own closer rule.
|
|
194
|
+
['go', 'func f() {\n ', '}', 'func f() {\n}'],
|
|
195
|
+
['toml', '[a]\n ', ']', '[a]\n]'],
|
|
196
|
+
['graphql', 'query Q {\n ', '}', 'query Q {\n}'],
|
|
197
|
+
['hcl', 'a {\n ', '}', 'a {\n}'],
|
|
198
|
+
['php', 'function f() {\n ', '}', 'function f() {\n}'],
|
|
199
|
+
['bash', 'if true; then\n ', 'fi', 'if true; then\nfi'],
|
|
200
|
+
['bash', 'for x in a; do\n ', 'done', 'for x in a; do\ndone'],
|
|
201
|
+
['html', '<div>\n ', '</div>', '<div>\n</div>'],
|
|
202
|
+
['tsx', 'const a = (\n ', ')', 'const a = (\n)'],
|
|
203
|
+
];
|
|
204
|
+
for (const [language, doc, closer, expected] of cases) {
|
|
205
|
+
test(`${language}: ${closer}`, async () => {
|
|
206
|
+
expect(type(await build(language), doc, closer)).toBe(expected);
|
|
207
|
+
});
|
|
208
|
+
}
|
|
209
|
+
});
|
|
210
|
+
|
|
211
|
+
describe('a typed closer is left alone where it is content', () => {
|
|
212
|
+
test('YAML', async () => {
|
|
213
|
+
expect(type(await build('yaml'), 'a:\n ', '}')).toBe('a:\n }');
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
test('markdown', async () => {
|
|
217
|
+
expect(type(await build('markdown'), '> q\n ', ']')).toBe('> q\n ]');
|
|
218
|
+
});
|
|
219
|
+
|
|
220
|
+
test('SQL', async () => {
|
|
221
|
+
expect(type(await build('sql'), 'SELECT\n ', ')')).toBe('SELECT\n )');
|
|
222
|
+
});
|
|
223
|
+
});
|
|
224
|
+
|
|
225
|
+
describe('the unit comes from the state, not from a module constant', () => {
|
|
226
|
+
test('a tab-size change still indents with the surface unit', async () => {
|
|
227
|
+
const built = await build('yaml');
|
|
228
|
+
const state = EditorState.create({
|
|
229
|
+
doc: 'a:',
|
|
230
|
+
selection: { anchor: 2 },
|
|
231
|
+
// The surface installs `indentUnit.of(' ')`; this asserts the service reads
|
|
232
|
+
// `ctx.unit` rather than a constant of its own.
|
|
233
|
+
extensions: [...built.extensions, EditorState.tabSize.of(4)],
|
|
234
|
+
});
|
|
235
|
+
const view = commandView(state);
|
|
236
|
+
insertNewlineAndIndent(view as unknown as EditorView);
|
|
237
|
+
expect(view.state.doc.toString()).toBe('a:\n ');
|
|
238
|
+
});
|
|
239
|
+
});
|
|
@@ -0,0 +1,124 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Auto-indent: the fallback for the questions a language's parser cannot answer,
|
|
8
|
+
* plus the `indentOnInput` wiring that makes a typed closer dedent.
|
|
9
|
+
*
|
|
10
|
+
* ## Two halves, and both are required
|
|
11
|
+
*
|
|
12
|
+
* Measured with the surface's own extension set (`indentUnit` + the stream mode):
|
|
13
|
+
*
|
|
14
|
+
* - `indentService` alone: Enter indents where the TABLE has an `opens` rule, and
|
|
15
|
+
* a typed closer does nothing — nothing re-runs the service on input.
|
|
16
|
+
* - `indentOnInput()` alone: a typed closer dedents only in the languages whose
|
|
17
|
+
* MODE ships a regexp that matches OUR indentation (27 do; `go`'s demands
|
|
18
|
+
* exactly one space and so never matches ` }`).
|
|
19
|
+
* - Neither: 26 languages indent nothing on Enter, and nothing dedents anywhere.
|
|
20
|
+
*
|
|
21
|
+
* ## The service must return `undefined`, never `null`
|
|
22
|
+
*
|
|
23
|
+
* `getIndentation` iterates the `indentService` facet and returns the first result
|
|
24
|
+
* that is not `undefined`; returning `null` SWALLOWS the answer and the parser is
|
|
25
|
+
* never consulted. Measured:
|
|
26
|
+
*
|
|
27
|
+
* ```
|
|
28
|
+
* js, service returns a number -> 0 (overrides the mode's 11)
|
|
29
|
+
* js, service returns undefined -> 11 (falls through to the mode)
|
|
30
|
+
* js, service returns null -> null (swallows the mode's answer)
|
|
31
|
+
* ```
|
|
32
|
+
*
|
|
33
|
+
* So the two questions are answered INDEPENDENTLY: a closer is dedented even in a
|
|
34
|
+
* language whose mode handles Enter (`go`), and Enter falls through to the mode
|
|
35
|
+
* wherever the table has no `opens` rule.
|
|
36
|
+
*
|
|
37
|
+
* ## The unit comes from the state, not from a constant
|
|
38
|
+
*
|
|
39
|
+
* `ctx.unit` is `getIndentUnit(state)`, which reads the `indentUnit` facet — so a
|
|
40
|
+
* tab-size setting propagates here with no second table and no reconfigure.
|
|
41
|
+
*/
|
|
42
|
+
|
|
43
|
+
import { EditorState, type Extension } from '@codemirror/state';
|
|
44
|
+
import { type IndentContext, indentOnInput, indentService } from '@codemirror/language';
|
|
45
|
+
|
|
46
|
+
import {
|
|
47
|
+
hasIndentRule,
|
|
48
|
+
indentAfter,
|
|
49
|
+
indentForCloser,
|
|
50
|
+
indentOnInputPattern,
|
|
51
|
+
} from '@/shared/lib/code/editor/indent-rules';
|
|
52
|
+
|
|
53
|
+
/**
|
|
54
|
+
* How many lines back a blank line is skipped when looking for the line that
|
|
55
|
+
* decides the indent.
|
|
56
|
+
*
|
|
57
|
+
* A cap, not a preference: 400 blank lines would otherwise be walked on every
|
|
58
|
+
* Enter. Past this the service declines and the parser answers.
|
|
59
|
+
*/
|
|
60
|
+
const MAX_BLANK_SKIP = 200;
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* The `indentService` for one language.
|
|
64
|
+
*
|
|
65
|
+
* Reads through `IndentContext`, never `state.doc`: while `insertNewlineAndIndent`
|
|
66
|
+
* runs, the context SIMULATES the line break, so `lineAt(pos, -1)` is the text
|
|
67
|
+
* before the break while `state.doc` still holds the caret on the line being
|
|
68
|
+
* broken. Reading the document there answers the wrong question.
|
|
69
|
+
*
|
|
70
|
+
* Also note `lineAt` returns `{ text, from }` — NOT a `Line`. A walk-back written
|
|
71
|
+
* against `line.number` exits after one step (`undefined > 1` is false) and
|
|
72
|
+
* silently stops on the first blank line.
|
|
73
|
+
*/
|
|
74
|
+
function serviceFor(language: string) {
|
|
75
|
+
return (context: IndentContext, pos: number): number | undefined => {
|
|
76
|
+
// Nothing to say: the parser (or nothing) owns both questions.
|
|
77
|
+
if (!hasIndentRule(language)) return undefined;
|
|
78
|
+
|
|
79
|
+
let line = context.lineAt(pos, -1);
|
|
80
|
+
// A blank line inside a block keeps the block's indent: the line that decides
|
|
81
|
+
// is the previous one with content.
|
|
82
|
+
for (let skipped = 0; skipped < MAX_BLANK_SKIP && !line.text.trim() && line.from > 0; skipped++) {
|
|
83
|
+
line = context.lineAt(Math.max(0, line.from - 1), -1);
|
|
84
|
+
}
|
|
85
|
+
if (!line.text.trim()) return undefined;
|
|
86
|
+
|
|
87
|
+
// A line that IS a closer is `indentOnInput`'s question: dedent it. Answered
|
|
88
|
+
// even where the mode handles Enter, which is what fixes `go`'s strict regexp.
|
|
89
|
+
const dedented = indentForCloser(language, line.text, context.unit);
|
|
90
|
+
if (dedented !== null) return dedented;
|
|
91
|
+
|
|
92
|
+
// Otherwise it is Enter's: what should follow this text? `undefined` when this
|
|
93
|
+
// language has no `opens` rule, so the mode keeps its own answer.
|
|
94
|
+
return indentAfter(language, line.text, context.unit) ?? undefined;
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* The language-data entries for this language.
|
|
100
|
+
*
|
|
101
|
+
* Empty for a language with no closer rule — `null` is the honest answer where a
|
|
102
|
+
* `}` is content (YAML, Markdown, SQL), and measured: the generic bracket pattern
|
|
103
|
+
* turned `a:\n }` into `a:\n}`.
|
|
104
|
+
*/
|
|
105
|
+
export function indentLanguageData(language: string): { indentOnInput: RegExp }[] {
|
|
106
|
+
const pattern = indentOnInputPattern(language);
|
|
107
|
+
return pattern ? [{ indentOnInput: pattern }] : [];
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
/**
|
|
111
|
+
* The input reindent plus the fallback service.
|
|
112
|
+
*
|
|
113
|
+
* `indentOnInput()` is installed for EVERY language, including the ones with no
|
|
114
|
+
* table row: it is what reaches the MODE's own `indentOnInput` regexp, which 27 of
|
|
115
|
+
* the 48 modes ship.
|
|
116
|
+
*/
|
|
117
|
+
export function indentExtensions(language: string): Extension[] {
|
|
118
|
+
return [indentOnInput(), indentService.of(serviceFor(language))];
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
/** The language-data provider, ready to append to the surface's table. */
|
|
122
|
+
export function indentDataExtension(language: string): Extension {
|
|
123
|
+
return EditorState.languageData.of(() => indentLanguageData(language));
|
|
124
|
+
}
|