Skip to content

simplify caret handling around templates #12

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
FlyingWaffleDev merged 1 commit into from
Sep 4, 2026
Merged

simplify caret handling around templates #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 9 additions & 15 deletions Models/TemplateTextElementGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,33 +537,27 @@ private void UpdateAnchorMovementTypes()
return;
}

template.Anchor.MovementType = caret.VisualColumn >= template.Anchor.Column
? AnchorMovementType.BeforeInsertion
: AnchorMovementType.AfterInsertion;
template.Anchor.MovementType = AnchorMovementType.AfterInsertion;
}

private void OnCaretPositionChanged(object? sender, EventArgs e) =>
UpdateAnchorMovementTypes();

private void OnEditorKeyDown(object? sender, KeyEventArgs e)
{
if (!_editor.TextArea.Selection.IsEmpty)
if (e.Key is not (Key.Back or Key.Delete) || !_editor.TextArea.Selection.IsEmpty)
{
return;
}

var caret = _editor.TextArea.Caret;
foreach (var template in _templates.Where(item =>
item.Anchor.Offset == caret.Offset || item.Anchor.Offset + item.Length == caret.Offset))
var caretOffset = _editor.TextArea.Caret.Offset;
var wouldSplitTemplate = _templates.Any(template =>
caretOffset == (e.Key == Key.Back
? template.Anchor.Offset + template.Length
: template.Anchor.Offset));
if (wouldSplitTemplate)
{
var visuallyBefore = caret.VisualColumn < template.Anchor.Column;
var visuallyAfter = caret.VisualColumn > template.Anchor.Column;
if ((e.Key == Key.Back && !visuallyBefore) ||
(e.Key == Key.Delete && !visuallyAfter))
{
e.Handled = true;
return;
}
e.Handled = true;
}
}

Expand Down
53 changes: 47 additions & 6 deletions Tests/Behavior/Editor/TemplateTextElementGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,13 @@ public void RemovingAnEarlierChoicePreservesSelectionThroughUndoAndRedo()
AssertTemplateState(editor, generator, viewModel, ["Two", "Three"], 1);
}

[AvaloniaFact]
public void DeleteAndBackspaceDoNotSplitATemplate()
[AvaloniaTheory]
[InlineData(1)]
[InlineData(2)]
[InlineData(6)]
public void DeleteAndBackspaceDoNotSplitATemplate(int choiceLength)
{
var choice = new string('C', choiceLength);
var editor = new TextEditor
{
Text = "BeforeAfter",
Expand All @@ -172,7 +176,7 @@ public void DeleteAndBackspaceDoNotSplitATemplate()
};
var generator = AttachGenerator(editor);
var offset = "Before".Length;
generator.AddTemplate(offset, ["Choice"], 0);
generator.AddTemplate(offset, [choice], 0);
var window = new Window { Content = editor };
window.Show();
window.UpdateLayout();
Expand All @@ -182,11 +186,48 @@ public void DeleteAndBackspaceDoNotSplitATemplate()
Assert.True(editor.TextArea.Focus());
editor.CaretOffset = offset;
Press(window, Key.Delete);
editor.CaretOffset = offset + "Choice".Length;
editor.CaretOffset = offset + choice.Length;
Press(window, Key.Back);

Assert.Equal("BeforeChoiceAfter", editor.Text);
Assert.Equal(["Choice"], generator.ExportDocument().Content[1].Options);
Assert.Equal($"Before{choice}After", editor.Text);
Assert.Equal([choice], generator.ExportDocument().Content[1].Options);
}
finally
{
window.Close();
}
}

[AvaloniaTheory]
[InlineData(1)]
[InlineData(2)]
[InlineData(6)]
public void DeleteAndBackspaceStillEditTheTextAroundATemplate(int choiceLength)
{
var choice = new string('C', choiceLength);
var editor = new TextEditor
{
Text = "BeforeAfter",
Width = 600,
Height = 400
};
var generator = AttachGenerator(editor);
var offset = "Before".Length;
generator.AddTemplate(offset, [choice], 0);
var window = new Window { Content = editor };
window.Show();
window.UpdateLayout();

try
{
Assert.True(editor.TextArea.Focus());
editor.CaretOffset = offset + choice.Length;
Press(window, Key.Delete);
editor.CaretOffset = offset;
Press(window, Key.Back);

Assert.Equal($"Befor{choice}fter", editor.Text);
Assert.Equal([choice], generator.ExportDocument().Content[1].Options);
}
finally
{
Expand Down