Git_Mirror/Terminal.Gui
1
0
Fork 0
mirror of https://github.com/gui-cs/Terminal.Gui.git synced 2025-12-31 10:17:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v2_develop' into v2_view2_experiment

Browse Source
This commit is contained in:
Tigger Kindel
2023-03-22 13:03:23 -06:00
parent 38fd0a61ae 13ec890d11
commit d7c655397e
2 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Terminal.Gui/Views/TextView.cs
View File

@@ -387,7 +387,7 @@ namespace Terminal.Gui {
pos = new Point (col, i);
col += (textToReplace.Length - matchText.Length);
}
if (col + 1 > txt.Length) {
if (col < 0 || col + 1 > txt.Length) {
break;
}
col = txt.IndexOf (matchText, col + 1);
@@ -2336,7 +2336,7 @@ namespace Terminal.Gui {
row = wrapManager.GetModelLineFromWrappedLines (currentRow);
col = wrapManager.GetModelColFromWrappedLines (currentRow, currentColumn);
}
UnwrappedCursorPosition?.Invoke (this, new PointEventArgs(new Point ((int)col, (int)row)));
UnwrappedCursorPosition?.Invoke (this, new PointEventArgs (new Point ((int)col, (int)row)));
}
ustring GetSelectedRegion ()

44
UnitTests/Views/TextViewTests.cs
View File

@@ -949,7 +949,7 @@ namespace Terminal.Gui.ViewTests {
Assert.Equal (0, _textView.CursorPosition.X);
Assert.Equal (0, _textView.CursorPosition.Y);
Assert.Equal ("This is the second line.", _textView.Text.ToString ());
Assert.Equal ($"This is the first line.{Environment.NewLine}", Clipboard.Contents.ToString());
Assert.Equal ($"This is the first line.{Environment.NewLine}", Clipboard.Contents.ToString ());
break;
case 2:
_textView.ProcessKey (new KeyEvent (Key.K | Key.CtrlMask, new KeyModifiers ()));
@@ -985,7 +985,7 @@ namespace Terminal.Gui.ViewTests {
_textView.ProcessKey (new KeyEvent (Key.K | Key.AltMask, new KeyModifiers ()));
Assert.Equal (0, _textView.CursorPosition.X);
Assert.Equal (1, _textView.CursorPosition.Y);
Assert.Equal ($"This is the first line.{Environment.NewLine}", _textView.Text.ToString());
Assert.Equal ($"This is the first line.{Environment.NewLine}", _textView.Text.ToString ());
Assert.Equal ($"This is the second line.", Clipboard.Contents.ToString ());
break;
case 1:
@@ -1380,7 +1380,7 @@ namespace Terminal.Gui.ViewTests {
[TextViewTestsAutoInitShutdown]
public void TextChanged_Event ()
{
_textView.TextChanged += (s,e) => {
_textView.TextChanged += (s, e) => {
if (_textView.Text == "changing") {
Assert.Equal ("changing", _textView.Text);
_textView.Text = "changed";
@@ -1396,7 +1396,7 @@ namespace Terminal.Gui.ViewTests {
public void TextChanged_Event_NoFires_OnTyping ()
{
var eventcount = 0;
_textView.TextChanged += (s,e) => {
_textView.TextChanged += (s, e) => {
eventcount++;
};
@@ -6001,7 +6001,7 @@ line.
Height = Dim.Fill (),
Text = "This is the first line.\nThis is the second line.\n"
};
tv.UnwrappedCursorPosition += (s,e) => {
tv.UnwrappedCursorPosition += (s, e) => {
cp = e.Point;
};
Application.Top.Add (tv);
@@ -6477,7 +6477,7 @@ This is the second line.
Height = 10,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
};
Assert.Equal (0, eventcount);
@@ -6498,7 +6498,7 @@ This is the second line.
};
tv.CursorPosition = new Point (0, 0);
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6536,7 +6536,7 @@ This is the second line.
Width = 50,
Height = 10,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
Assert.Equal (expectedRow, e.Row);
Assert.Equal (expectedCol, e.Col);
@@ -6565,7 +6565,7 @@ This is the second line.
// row/col = 0 when you set Text
Text = "abc",
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
Assert.Equal (expectedRow, e.Row);
Assert.Equal (expectedCol, e.Col);
@@ -6597,7 +6597,7 @@ This is the second line.
Width = 50,
Height = 10,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
Assert.Equal (expectedRow, e.Row);
Assert.Equal (expectedCol, e.Col);
@@ -6622,7 +6622,7 @@ This is the second line.
{
var eventcount = 0;
_textView.ContentsChanged += (s,e) => {
_textView.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6649,7 +6649,7 @@ This is the second line.
{
var eventcount = 0;
_textView.ContentsChanged += (s,e) => {
_textView.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6715,7 +6715,7 @@ This is the second line.
var eventcount = 0;
var expectedEventCount = 0;
_textView.ContentsChanged += (s,e) => {
_textView.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6759,7 +6759,7 @@ This is the second line.
Height = 10,
Text = text,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6784,7 +6784,7 @@ This is the second line.
Width = 50,
Height = 10,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6804,7 +6804,7 @@ This is the second line.
Width = 50,
Height = 10,
};
tv.ContentsChanged += (s,e) => {
tv.ContentsChanged += (s, e) => {
eventcount++;
};
@@ -6815,5 +6815,17 @@ This is the second line.
Assert.Equal (1, eventcount);
Assert.Equal ($"This is the first line.{Environment.NewLine}This is the second line.{Environment.NewLine}", tv.Text);
}
[Fact]
public void ReplaceAllText_Does_Not_Throw_Exception ()
{
var textToFind = "hello! hello!";
var textToReplace = "hello!";
var tv = new TextView () { Width = 20, Height = 3, Text = textToFind };
var exception = Record.Exception (() => tv.ReplaceAllText (textToFind, false, false, textToReplace));
Assert.Null (exception);
Assert.Equal (textToReplace, tv.Text);
}
}
}