Skip to content

Undo indent dedent #197

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
Ttibsi merged 5 commits into from
May 24, 2026
Merged

Undo indent dedent #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
39ffe90
indent/dedent undo, indent tests
Ttibsi May 16, 2026
c6ac8b0
unit tests
Ttibsi May 16, 2026
e10e428
prep integration tests
Ttibsi May 16, 2026
dce78fb
integration test code
Ttibsi May 16, 2026
20aa63a
changelog
Ttibsi May 16, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* `>` now intends the current line.
* `<` now dedents current line
* `<` and `>` now are part of the undo/redo system
* Implement `;!` to execute a shell command from the command bar
* Disabled continuous deployment in GHA. See `.github/workflows/build_artifact.yml`
for details
Expand Down
3 changes: 3 additions & 0 deletions src/action.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ template <typename T, typename U>
auto logger = spdlog::get("basic_logger");
if (logger != nullptr) { logger->info("Action called: IndentLine"); }
v->get_active_model()->indent_curr_line();

v->get_active_model()->undo_stack.push_back(
Change(ActionType::IndentLine, v->get_active_model()->current_line, ' '));
} break;

case ActionType::JumpEndOfWord: {
Expand Down
2 changes: 1 addition & 1 deletion src/controller.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@ void Controller::start_action_engine() {
parse_action<void, None>(&view, Action<void> {ActionType::DedentLine});
view.draw_line(Draw_Line_dir::None);

// Increment line
// Indent line
} else if (k.value() == rawterm::Key('>')) {
if (is_readonly_model()) { continue; }
parse_action<void, None>(&view, Action<void> {ActionType::IndentLine});
Expand Down
16 changes: 16 additions & 0 deletions src/model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,14 @@ void Model::toggle_case() {
}
} break;

case ActionType::IndentLine: {
dedent_curr_line();
} break;

case ActionType::DedentLine: {
indent_curr_line();
} break;

default:
break;
};
Expand Down Expand Up @@ -410,6 +418,14 @@ void Model::toggle_case() {
delete_current_word({cur_change.text.value(), current_char, current_line});
} break;

case ActionType::IndentLine: {
indent_curr_line();
} break;

case ActionType::DedentLine: {
dedent_curr_line();
} break;

default:
break;
};
Expand Down
29 changes: 29 additions & 0 deletions tests/integration/normal_mode_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,35 @@ def test_undo_redo_delete_word(r: TmuxRunner):
assert word not in r.lines()[0]


@setup("tests/fixture/test_file_1.txt")
def test_undo_redo_indentline(r: TmuxRunner):
r.press('>')
assert r.lines()[0].startswith(" 1\u2502 ")

# undo
r.press("u")
assert r.lines()[0].startswith(" 1\u2502This")

# redo
r.press("R")
assert r.lines()[0].startswith(" 1\u2502 ")


@setup("tests/fixture/test_file_1.txt")
def test_undo_redo_dedentline(r: TmuxRunner):
r.press('j')
r.press('<')
assert r.lines()[1].startswith(" 2\u2502here")

# undo
r.press("u")
assert r.lines()[1].startswith(" 2\u2502 ")

# redo
r.press("R")
assert r.lines()[1].startswith(" 2\u2502here")


@setup("tests/fixture/test_file_1.txt")
def test_upper_j_key(r: TmuxRunner):
r.press("J")
Expand Down
90 changes: 90 additions & 0 deletions tests/model_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,43 @@ TEST_CASE("undo", "[model]") {
REQUIRE(m.undo(24));
REQUIRE(m.buf.at(1) == "line two");
}

SECTION("IndentLine") {
m.undo_stack.push_back(Change(ActionType::IndentLine, 0, 0));

m.indent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');

REQUIRE(m.undo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == 'l');
REQUIRE(m.buf.at(m.current_line).at(1) == 'i');
REQUIRE(m.buf.at(m.current_line).at(2) == 'n');
REQUIRE(m.buf.at(m.current_line).at(3) == 'e');
}

SECTION("DedentLine") {
m.indent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');

m.undo_stack.push_back(Change(ActionType::DedentLine, 0, 0));
m.dedent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == 'l');
REQUIRE(m.buf.at(m.current_line).at(1) == 'i');
REQUIRE(m.buf.at(m.current_line).at(2) == 'n');
REQUIRE(m.buf.at(m.current_line).at(3) == 'e');

REQUIRE(m.undo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');
}
}

TEST_CASE("get_current_char", "[model]") {
Expand Down Expand Up @@ -564,6 +601,59 @@ TEST_CASE("redo", "[model]") {
REQUIRE(m.redo(24));
REQUIRE(m.buf.at(1) == " two");
}

SECTION("IndentLine") {
m.current_line = 0;
m.current_char = 0;
m.undo_stack.push_back(Change(ActionType::IndentLine, 0, 0));

m.indent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');

REQUIRE(m.undo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == 'l');
REQUIRE(m.buf.at(m.current_line).at(1) == 'i');
REQUIRE(m.buf.at(m.current_line).at(2) == 'n');
REQUIRE(m.buf.at(m.current_line).at(3) == 'e');

REQUIRE(m.redo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');
}

SECTION("DedentLine") {
m.current_line = 0;
m.current_char = 0;
m.indent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');

m.undo_stack.push_back(Change(ActionType::DedentLine, 0, 0));
m.dedent_curr_line();
REQUIRE(m.buf.at(m.current_line).at(0) == 'l');
REQUIRE(m.buf.at(m.current_line).at(1) == 'i');
REQUIRE(m.buf.at(m.current_line).at(2) == 'n');
REQUIRE(m.buf.at(m.current_line).at(3) == 'e');

REQUIRE(m.undo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == ' ');
REQUIRE(m.buf.at(m.current_line).at(1) == ' ');
REQUIRE(m.buf.at(m.current_line).at(2) == ' ');
REQUIRE(m.buf.at(m.current_line).at(3) == ' ');

REQUIRE(m.redo(24));
REQUIRE(m.buf.at(m.current_line).at(0) == 'l');
REQUIRE(m.buf.at(m.current_line).at(1) == 'i');
REQUIRE(m.buf.at(m.current_line).at(2) == 'n');
REQUIRE(m.buf.at(m.current_line).at(3) == 'e');
}
}

TEST_CASE("move_line_down", "[model]") {
Expand Down
Loading