Skip to content

Make line commands aware of folded blocks #2508

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bajrangCoder merged 2 commits into from
Jul 22, 2026
+580 −11
Merged

Make line commands aware of folded blocks #2508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c715f7
Make line commands aware of folded blocks
bajrangCoder Jul 20, 2026
ade9d92
Merge main and address fold-aware copy review
bajrangCoder Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions src/cm/commandRegistry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import fsOperation from "fileSystem";
import * as cmCommands from "@codemirror/commands";
import {
copyLineDown,
copyLineUp,
cursorCharLeft,
cursorCharRight,
cursorDocEnd,
Expand All @@ -20,7 +18,6 @@ import {
deleteCharForward,
deleteGroupBackward,
deleteGroupForward,
deleteLine,
deleteLineBoundaryForward,
deleteToLineEnd,
deleteToLineStart,
Expand All @@ -31,8 +28,6 @@ import {
insertNewlineAndIndent,
lineComment,
lineUncomment,
moveLineDown,
moveLineUp,
redo,
selectAll,
selectCharLeft,
Expand Down Expand Up @@ -79,6 +74,13 @@ import {
} from "@codemirror/lsp-client";
import { Compartment, EditorSelection } from "@codemirror/state";
import { keymap } from "@codemirror/view";
import {
copyLineDownFoldAware,
copyLineUpFoldAware,
deleteLineFoldAware,
moveLineDownFoldAware,
moveLineUpFoldAware,
} from "cm/foldAwareLineCommands";
import {
renameSymbol as acodeRenameSymbol,
clearDiagnosticsEffect,
Expand Down Expand Up @@ -727,7 +729,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return copyLineDown(resolvedView);
return copyLineDownFoldAware(resolvedView);
},
});
addCommand({
Expand All @@ -738,7 +740,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return copyLineDown(resolvedView);
return copyLineDownFoldAware(resolvedView);
},
});
addCommand({
Expand All @@ -749,7 +751,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return copyLineUp(resolvedView);
return copyLineUpFoldAware(resolvedView);
},
});
addCommand({
Expand All @@ -760,7 +762,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return moveLineDown(resolvedView);
return moveLineDownFoldAware(resolvedView);
},
});
addCommand({
Expand All @@ -771,7 +773,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return moveLineUp(resolvedView);
return moveLineUpFoldAware(resolvedView);
},
});
addCommand({
Expand All @@ -782,7 +784,7 @@ function registerCoreCommands() {
run(view) {
const resolvedView = resolveView(view);
if (!resolvedView) return false;
return deleteLine(resolvedView);
return deleteLineFoldAware(resolvedView);
},
});
addCommand({
Expand Down
Loading